dictionary cosmetics

- partial revert for commit d21869b580
  * only add extra newlines for a top-level dictionary that is output as such

- make "#inputMode merge" the default instead of "#inputMode error"
  * this corresponds to a very common usage case
This commit is contained in:
Mark Olesen
2009-03-18 13:15:17 +01:00
parent 36613fa5af
commit 0bada1e31b
10 changed files with 69 additions and 150 deletions

View File

@ -103,14 +103,13 @@ bool Foam::functionEntry::execute
is.fatalCheck
(
"functionEntry::execute"
"(const word& functionName, const dictionary& parentDict, "
"primitiveEntry&, Istream&)"
"(const word&, const dictionary&, primitiveEntry&, Istream&)"
);
if (!executeprimitiveEntryIstreamMemberFunctionTablePtr_)
{
cerr<<"functionEntry::execute"
<< "(const word&, dictionary&, primitiveEntry&, Istream&)"
<< "(const word&, const dictionary&, primitiveEntry&, Istream&)"
<< " not yet initialized, function = "
<< functionName.c_str() << std::endl;
@ -126,8 +125,7 @@ bool Foam::functionEntry::execute
FatalErrorIn
(
"functionEntry::execute"
"(const word& functionName, const dictionary& parentDict, "
"primitiveEntry&, Istream&)"
"(const word&, const dictionary&, primitiveEntry&, Istream&)"
) << "Unknown functionEntry " << functionName
<< endl << endl
<< "Valid functionEntries are :" << endl