mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
reworked IOstreams
- Istream and Ostream now retain backslashes when reading/writing strings.
The previous implementation simply discarded them, except when used to
escape a double-quote or a newline. It is now vitally important to retain
them, eg for quoting regular expression meta-characters.
The backslash continues to be used as an escape character for double-quote
and newline, but otherwise get passed through "as-is" without any other
special meaning (ie, they are *NOT* C-style strings). This helps avoid
'backslash hell'!
For example,
string: "match real dots \.+, question mark \? or any char .*"
C-style: "match real dots \\.+, question mark \\? or any char .*"
- combined subfiles in db/IOstreams, some had more copyright info than code
- OPstreamI.H contained only private methods, moved into OPstream.C
Are these really correct?
IOstreams/Istream.H:# include "HashTable.C"
token/token.H:#define NoHashTableC
This commit is contained in:
@ -50,12 +50,13 @@ void Foam::token::parseError(const char* expected) const
|
||||
Foam::token::compound::~compound()
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::autoPtr<Foam::token::compound> Foam::token::compound::New
|
||||
(
|
||||
const Foam::word& compoundType,
|
||||
Foam::Istream& is
|
||||
const word& compoundType,
|
||||
Istream& is
|
||||
)
|
||||
{
|
||||
IstreamConstructorTable::iterator cstrIter =
|
||||
@ -63,10 +64,9 @@ Foam::autoPtr<Foam::token::compound> Foam::token::compound::New
|
||||
|
||||
if (cstrIter == IstreamConstructorTablePtr_->end())
|
||||
{
|
||||
FatalErrorIn("token::compound::New(Istream&)")
|
||||
<< "Unknown compound type " << compoundType
|
||||
<< endl << endl
|
||||
<< "Valid compound types are :" << endl
|
||||
FatalErrorIn("token::compound::New(const word&, Istream&)")
|
||||
<< "Unknown compound type " << compoundType << nl << nl
|
||||
<< "Valid compound types:" << endl
|
||||
<< IstreamConstructorTablePtr_->toc()
|
||||
<< abort(FatalError);
|
||||
}
|
||||
@ -77,7 +77,7 @@ Foam::autoPtr<Foam::token::compound> Foam::token::compound::New
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
bool Foam::token::compound::isCompound(const Foam::word& name)
|
||||
bool Foam::token::compound::isCompound(const word& name)
|
||||
{
|
||||
return
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user