Commit a2195d7e authored by Mark OLESEN's avatar Mark OLESEN
Browse files

ENH: allow '/' in ${...} blocks for future entry scoping (issue #429)

- Eg, "${scope/name}" to be supported with this.
parent b3ac6c3f
......@@ -604,13 +604,14 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
// Read, counting brackets
buf[nChar++] = c;
// Also allow '/' between ${...} blocks for slash-scoping of entries
while
(
get(c)
&& (
c == token::BEGIN_BLOCK
|| c == token::END_BLOCK
|| word::valid(c)
|| word::valid(c) || c == '/'
)
)
{
......@@ -620,7 +621,7 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
buf[errLen] = '\0';
FatalIOErrorInFunction(*this)
<< "word '" << buf << "...'\n"
<< "variable '" << buf << "...'\n"
<< " is too long (max. " << maxLen << " characters)"
<< exit(FatalIOError);
......@@ -656,7 +657,7 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
buf[errLen] = '\0';
FatalIOErrorInFunction(*this)
<< "word '" << buf << "...'\n"
<< "variable '" << buf << "...'\n"
<< " is too long (max. " << maxLen << " characters)"
<< exit(FatalIOError);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment