--- trunk/src/mdParser/MDTreeParser.g 2008/07/14 12:35:58 1277 +++ trunk/src/mdParser/MDTreeParser.g 2009/11/25 20:02:06 1390 @@ -4,7 +4,7 @@ using namespace std; #include "io/Globals.hpp" #include "utils/StringUtils.hpp" using namespace std; -using namespace oopse; +using namespace OpenMD; } options { @@ -38,6 +38,7 @@ statement : assignment | componentblock | moleculeblock | zconstraintblock + | restraintblock ; @@ -67,6 +68,11 @@ zconstraintblock : #(ZCONSTRAINT {ZConsStamp* currZCo zconstraintblock : #(ZCONSTRAINT {ZConsStamp* currZConsStamp = new ZConsStamp(); blockStack.push(currZConsStamp);} (assignment)* ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addZConsStamp(currZConsStamp);} + ; + +restraintblock : #(RESTRAINT {RestraintStamp* currRestraintStamp = new RestraintStamp(); blockStack.push(currRestraintStamp);} + (assignment)* + ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRestraintStamp(currRestraintStamp);} ; moleculeblock : #(MOLECULE {MoleculeStamp* currMoleculeStamp = new MoleculeStamp(); blockStack.push(currMoleculeStamp);}