--- trunk/src/mdParser/MDTreeParser.g 2008/07/04 20:54:29 1275 +++ trunk/src/mdParser/MDTreeParser.g 2009/09/07 16:31:51 1360 @@ -15,7 +15,7 @@ options options { - k = 3; + k = 1; importVocab = MD; } { @@ -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);}