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 848 by gezelter, Wed Jan 11 23:06:08 2006 UTC vs.
branches/development/src/mdParser/MDParser.g (file contents), Revision 1746 by gezelter, Wed Jun 6 02:18:54 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";
35    TORSION     = "torsion";
36 +  INVERSION   = "inversion";
37    RIGIDBODY   = "rigidBody";
38    CUTOFFGROUP = "cutoffGroup";
39    FRAGMENT    = "fragment";
40    MEMBERS     = "members";
41 +  CENTER      = "center";
42    POSITION    = "position";
43    ORIENTATION = "orientation";
44 +  FLUCQ       = "flucQ";
45 +  RNEMD       = "RNEMD";
46 +  MINIMIZER   = "minimizer";
47    ENDBLOCK;
48   }
49  
# Line 46 | Line 52 | statement : assignment
52          ;
53  
54   statement : assignment
55 <          | componentblock
56 <          | moleculeblock
57 <          | zconstraintblock
58 <          ;
59 <            
55 >    | componentblock
56 >    | moleculeblock
57 >    | zconstraintblock
58 >    | restraintblock
59 >    | flucqblock
60 >    | rnemdblock
61 >    | minimizerblock
62 >    ;
63 >
64   assignment  : ID ASSIGNEQUAL^ constant SEMICOLON!
65              ;
66              
# Line 64 | Line 74 | zconstraintblock  : ZCONSTRAINT^ LCURLY! (assignment)*
74                  ;
75      
76   zconstraintblock  : ZCONSTRAINT^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
77 +                  ;
78 +
79 + restraintblock  : RESTRAINT^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
80                    ;
81 +
82 + flucqblock  : FLUCQ^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
83 +    ;
84 +
85 + rnemdblock  : RNEMD^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
86 +    ;
87 +
88 + minimizerblock  : MINIMIZER^ LCURLY! (assignment)* RCURLY {#RCURLY->setType(ENDBLOCK);}
89 +    ;
90    
91   moleculeblock : MOLECULE^ LCURLY! (moleculestatement)*  RCURLY {#RCURLY->setType(ENDBLOCK);}
92                ;
# Line 74 | Line 96 | moleculestatement : assignment
96                    | bondblock
97                    | bendblock
98                    | torsionblock
99 +                  | inversionblock
100                    | rigidbodyblock
101                    | cutoffgroupblock
102                    | fragmentblock
# Line 107 | Line 130 | torsionstatement  : assignment
130  
131   torsionstatement  : assignment
132                | MEMBERS^ LPAREN! inttuple RPAREN! SEMICOLON!
133 +              ;
134 +
135 + inversionblock  : INVERSION^ (LBRACKET! intConst! RBRACKET!)?  LCURLY!(inversionstatement)* RCURLY {#RCURLY->setType(ENDBLOCK);}
136 +          ;
137 +
138 + inversionstatement  : assignment
139 +              | CENTER^ LPAREN! intConst RPAREN! SEMICOLON!
140                ;
141  
142   rigidbodyblock  : RIGIDBODY^  LBRACKET! intConst RBRACKET! LCURLY!(rigidbodystatement)* RCURLY {#RCURLY->setType(ENDBLOCK);}
# Line 257 | Line 287 | LineDirective
287    }
288      ("line")?  // this would be for if the directive started "#line"
289      (Space)+
290 <    n:Decimal { setLine(oopse::lexi_cast<int>(n->getText()) - 1); }
290 >    n:Decimal { setLine(OpenMD::lexi_cast<int>(n->getText()) - 1); }
291      (Space)+
292      (sl:StringLiteral) {std::string filename = sl->getText().substr(1,sl->getText().length()-2); observer->notify(filename);}
293      ((Space)+ Decimal)* // To support cpp flags (GNU)

Comparing:
trunk/src/mdParser/MDParser.g (property svn:keywords), Revision 848 by gezelter, Wed Jan 11 23:06:08 2006 UTC vs.
branches/development/src/mdParser/MDParser.g (property svn:keywords), Revision 1746 by gezelter, Wed Jun 6 02:18:54 2012 UTC

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

Diff Legend

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