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 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
branches/development/src/mdParser/MDTreeParser.g (file contents), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 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 38 | Line 38 | statement : assignment
38            | componentblock
39            | moleculeblock
40            | zconstraintblock
41 +          | restraintblock
42            ;
43  
44  
# Line 67 | Line 68 | zconstraintblock  : #(ZCONSTRAINT {ZConsStamp* currZCo
68   zconstraintblock  : #(ZCONSTRAINT {ZConsStamp* currZConsStamp = new ZConsStamp(); blockStack.push(currZConsStamp);}
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);}

Comparing:
trunk/src/mdParser/MDTreeParser.g (property svn:keywords), Revision 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
branches/development/src/mdParser/MDTreeParser.g (property svn:keywords), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines