Skip to content
Snippets Groups Projects
Commit b636aaac authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.4' into v2.5

parents e8a39033 361e216b
No related branches found
No related tags found
No related merge requests found
......@@ -214,3 +214,12 @@ For developers:
- All fixed done in version 2.3.8
- CPPCHECK updated to 1.85
## Version 2.4.5 (to be released)
For users:
- Fixed an inconsistency in parsing of braces.
It is now possible to pass individual options
including spaces (e.g. with `FILE={/path with space/file}`). Notice
that this invalidates syntax such as `ATOMS={1}{2}{3}{4}`. See more
at \issue{434}.
......@@ -145,7 +145,7 @@ vector<string> Tools::getWords(const string & line,const char* separators,int *
if(parenthesisLevel==0) for(unsigned j=0; j<sep.length(); j++) if(line[i]==sep[j]) found=true;
// If at parenthesis level zero (outer)
if(!(parenthesisLevel==0 && (found||onParenthesis))) word.push_back(line[i]);
if(onParenthesis) word.push_back(' ');
//if(onParenthesis) word.push_back(' ');
if(line[i]==openpar) parenthesisLevel++;
if(found && word.length()>0) {
if(!parlevel) plumed_massert(parenthesisLevel==0,"Unmatching parenthesis in '" + line + "'");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment