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 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC vs.
branches/development/src/mdParser/MDParser.g (file contents), Revision 1731 by gezelter, Thu May 31 12:25:30 2012 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 40 | Line 41 | tokens
41    CENTER      = "center";
42    POSITION    = "position";
43    ORIENTATION = "orientation";
44 +  FLUCQ       = "flucQ";
45 +  RNEMD       = "RNEMD";
46    ENDBLOCK;
47   }
48  
# Line 48 | Line 51 | statement : assignment
51          ;
52  
53   statement : assignment
54 <          | componentblock
55 <          | moleculeblock
56 <          | zconstraintblock
57 <          ;
58 <            
54 >    | componentblock
55 >    | moleculeblock
56 >    | zconstraintblock
57 >    | restraintblock
58 >    | flucqblock
59 >    | rnemdblock
60 >    ;
61 >
62   assignment  : ID ASSIGNEQUAL^ constant SEMICOLON!
63              ;
64              
# Line 67 | Line 73 | zconstraintblock  : ZCONSTRAINT^ LCURLY! (assignment)*
73      
74   zconstraintblock  : ZCONSTRAINT^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
75                    ;
76 +
77 + restraintblock  : RESTRAINT^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
78 +                  ;
79 +
80 + flucqblock  : FLUCQ^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
81 +    ;
82 +
83 + rnemdblock  : RNEMD^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
84 +    ;
85    
86   moleculeblock : MOLECULE^ LCURLY! (moleculestatement)*  RCURLY {#RCURLY->setType(ENDBLOCK);}
87                ;
# Line 76 | Line 91 | moleculestatement : assignment
91                    | bondblock
92                    | bendblock
93                    | torsionblock
94 +                  | inversionblock
95                    | rigidbodyblock
96                    | cutoffgroupblock
97                    | fragmentblock
# Line 266 | Line 282 | LineDirective
282    }
283      ("line")?  // this would be for if the directive started "#line"
284      (Space)+
285 <    n:Decimal { setLine(oopse::lexi_cast<int>(n->getText()) - 1); }
285 >    n:Decimal { setLine(OpenMD::lexi_cast<int>(n->getText()) - 1); }
286      (Space)+
287      (sl:StringLiteral) {std::string filename = sl->getText().substr(1,sl->getText().length()-2); observer->notify(filename);}
288      ((Space)+ Decimal)* // To support cpp flags (GNU)

Comparing:
trunk/src/mdParser/MDParser.g (property svn:keywords), Revision 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC vs.
branches/development/src/mdParser/MDParser.g (property svn:keywords), Revision 1731 by gezelter, Thu May 31 12:25:30 2012 UTC

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

Diff Legend

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