ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/mdParser/MDTreeParser.g
(Generate patch)

Comparing trunk/src/mdParser/MDTreeParser.g (file contents):
Revision 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 4 | Line 4 | using namespace std;
4   #include "io/Globals.hpp"
5   #include "utils/StringUtils.hpp"
6   using namespace std;
7 < using namespace oopse;
7 > using namespace OpenMD;
8   }
9   options
10    {
# Line 15 | Line 15 | options
15  
16   options
17   {
18 <        k = 3;
18 >        k = 1;
19          importVocab = MD;
20   }
21   {
# Line 38 | Line 38 | statement : assignment
38            | componentblock
39            | moleculeblock
40            | zconstraintblock
41 +          | restraintblock
42            ;
43  
44  
# Line 68 | Line 69 | zconstraintblock  : #(ZCONSTRAINT {ZConsStamp* currZCo
69                          (assignment)*
70                           ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addZConsStamp(currZConsStamp);}
71                    ;
72 +
73 + restraintblock  : #(RESTRAINT {RestraintStamp* currRestraintStamp = new RestraintStamp(); blockStack.push(currRestraintStamp);}
74 +                        (assignment)*
75 +                         ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRestraintStamp(currRestraintStamp);}
76 +                  ;
77    
78   moleculeblock : #(MOLECULE {MoleculeStamp* currMoleculeStamp = new MoleculeStamp(); blockStack.push(currMoleculeStamp);}
79                      (moleculestatement)*

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines