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 814 by tim, Fri Dec 16 02:57:00 2005 UTC vs.
branches/development/src/mdParser/MDTreeParser.g (file contents), Revision 1731 by gezelter, Thu May 31 12:25:30 2012 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 35 | Line 35 | statement : assignment
35          ;
36  
37   statement : assignment
38 <          | componentblock
39 <          | moleculeblock
40 <          | zconstraintblock
41 <          ;
38 >    | componentblock
39 >    | moleculeblock
40 >    | zconstraintblock
41 >    | restraintblock
42 >    | flucqblock
43 >    | rnemdblock
44 >    ;
45  
43
46   assignment  : #(ASSIGNEQUAL id:ID constant[#id]) //{blockStack.top()->assign(#ID->getText(),);}
47              ;
48              
49   constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]
50   {
51    int ival;
52 <  double dval;
52 >  RealType dval;
53   }    
54              : ival=intConst {blockStack.top()->assign(id->getText(), ival);}
55              | dval=floatConst {blockStack.top()->assign(id->getText(), dval);}
# Line 68 | Line 70 | zconstraintblock  : #(ZCONSTRAINT {ZConsStamp* currZCo
70                          (assignment)*
71                           ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addZConsStamp(currZConsStamp);}
72                    ;
73 +
74 + restraintblock  : #(RESTRAINT {RestraintStamp* currRestraintStamp = new RestraintStamp(); blockStack.push(currRestraintStamp);}
75 +                        (assignment)*
76 +                         ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRestraintStamp(currRestraintStamp);}
77 +                  ;
78    
79 + flucqblock  : #(FLUCQ  {FluctuatingChargeParameters* flucQpars = new FluctuatingChargeParameters(); blockStack.push(flucQpars);}
80 +                      (assignment)*
81 +                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addFluctuatingChargeParameters(flucQpars);}
82 +                ;
83 +
84 + rnemdblock  : #(RNEMD  {RNEMDParameters* rnemdPars = new RNEMDParameters(); blockStack.push(rnemdPars);}
85 +                      (assignment)*
86 +                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRNEMDParameters(rnemdPars);}
87 +                ;
88 +
89 +
90   moleculeblock : #(MOLECULE {MoleculeStamp* currMoleculeStamp = new MoleculeStamp(); blockStack.push(currMoleculeStamp);}
91                      (moleculestatement)*
92                       ENDBLOCK ) {blockStack.top()->validate(); blockStack.pop(); currConf->addMoleculeStamp(currMoleculeStamp);}
# Line 79 | Line 97 | moleculestatement : assignment
97                    | bondblock
98                    | bendblock
99                    | torsionblock
100 +                  | inversionblock
101                    | rigidbodyblock
102                    | cutoffgroupblock
103                    | fragmentblock
# Line 100 | Line 119 | atomstatement
119  
120   atomstatement
121   {
122 < vector<double> dvec;
122 > vector<RealType> dvec;
123   AtomStamp* currAtomStamp =  static_cast<AtomStamp*>(blockStack.top());
124  
125   }
# Line 164 | Line 183 | torsionstatement
183   }  
184                : assignment
185                | #(MEMBERS ivec=inttuple) {currTorsionStamp->setMembers(ivec);}
186 +              ;
187 +
188 + inversionblock  : #(INVERSION {InversionStamp* currInversionStamp = new InversionStamp(); blockStack.push(currInversionStamp);}
189 +                   (inversionstatement)*
190 +                    ENDBLOCK )  {
191 +                                  blockStack.top()->validate();
192 +                                  blockStack.pop();
193 +                                  MoleculeStamp* currMoleculeStamp = static_cast<MoleculeStamp*>(blockStack.top());
194 +                                  currMoleculeStamp->addInversionStamp(currInversionStamp);
195 +                                }
196 +          ;
197 +
198 + inversionstatement
199 + {
200 +  int icent;
201 +  InversionStamp* currInversionStamp = static_cast<InversionStamp*>(blockStack.top());
202 + }  
203 +              : assignment
204 +              | #(CENTER icent=intConst) {currInversionStamp->setCenter(icent);}
205                ;
206  
207   rigidbodyblock
# Line 224 | Line 262 | fragmentstatement : assignment
262  
263  
264                
265 < doubleNumberTuple   returns [vector<double> dvec]
265 > doubleNumberTuple   returns [vector<RealType> dvec]
266   {
267 <  double dval;
267 >  RealType dval;
268   }
269                : (dval=doubleNumber {dvec.push_back(dval);})+  
270                ;
# Line 245 | Line 283 | protected
283          ;
284  
285   protected
286 < doubleNumber  returns [double dval]
286 > doubleNumber  returns [RealType dval]
287                :
288 <                ic:intConst {dval = lexi_cast<double>(ic->getText());}
289 <                | fc:floatConst {dval = lexi_cast<double>(fc->getText());}
288 >                ic:intConst {dval = lexi_cast<RealType>(ic->getText());}
289 >                | fc:floatConst {dval = lexi_cast<RealType>(fc->getText());}
290                                
291                ;
292                
293   protected
294 < floatConst returns [double dval]
295 <        : d1:NUM_FLOAT {dval = lexi_cast<double>(d1->getText());}  
296 <        | d2:NUM_DOUBLE {dval = lexi_cast<double>(d2->getText());}
294 > floatConst returns [RealType dval]
295 >        : d1:NUM_FLOAT {dval = lexi_cast<RealType>(d1->getText());}  
296 >        | d2:NUM_DOUBLE {dval = lexi_cast<RealType>(d2->getText());}
297          ;
298          

Comparing:
trunk/src/mdParser/MDTreeParser.g (property svn:keywords), Revision 814 by tim, Fri Dec 16 02:57:00 2005 UTC vs.
branches/development/src/mdParser/MDTreeParser.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