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

Comparing trunk/src/mdParser/MDParser.g (file contents):
Revision 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC

# Line 28 | Line 28 | tokens
28    COMPONENT   = "component";
29    MOLECULE    = "molecule";
30    ZCONSTRAINT = "zconstraint";
31 +  RESTRAINT   = "restraint";
32    ATOM        = "atom";
33    BOND        = "bond";
34    BEND        = "bend";
# Line 51 | Line 52 | statement : assignment
52            | componentblock
53            | moleculeblock
54            | zconstraintblock
55 +          | restraintblock
56            ;
57              
58   assignment  : ID ASSIGNEQUAL^ constant SEMICOLON!
# Line 67 | Line 69 | zconstraintblock  : ZCONSTRAINT^ LCURLY! (assignment)*
69      
70   zconstraintblock  : ZCONSTRAINT^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
71                    ;
72 +
73 + restraintblock  : RESTRAINT^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
74 +                  ;
75    
76   moleculeblock : MOLECULE^ LCURLY! (moleculestatement)*  RCURLY {#RCURLY->setType(ENDBLOCK);}
77                ;
# Line 267 | Line 272 | LineDirective
272    }
273      ("line")?  // this would be for if the directive started "#line"
274      (Space)+
275 <    n:Decimal { setLine(oopse::lexi_cast<int>(n->getText()) - 1); }
275 >    n:Decimal { setLine(OpenMD::lexi_cast<int>(n->getText()) - 1); }
276      (Space)+
277      (sl:StringLiteral) {std::string filename = sl->getText().substr(1,sl->getText().length()-2); observer->notify(filename);}
278      ((Space)+ Decimal)* // To support cpp flags (GNU)

Comparing trunk/src/mdParser/MDParser.g (property svn:keywords):
Revision 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines