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 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 15 | Line 15 | options
15  
16   options
17   {
18 <        k = 3;
18 >        k = 1;
19          importVocab = MD;
20   }
21   {
# Line 38 | Line 38 | statement : assignment
38            | componentblock
39            | moleculeblock
40            | zconstraintblock
41 +          | restraintblock
42            ;
43  
44  
# Line 47 | Line 48 | constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]
48   constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]
49   {
50    int ival;
51 <  double dval;
51 >  RealType dval;
52   }    
53              : ival=intConst {blockStack.top()->assign(id->getText(), ival);}
54              | dval=floatConst {blockStack.top()->assign(id->getText(), dval);}
# Line 68 | Line 69 | zconstraintblock  : #(ZCONSTRAINT {ZConsStamp* currZCo
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);}
79                      (moleculestatement)*
# Line 79 | Line 85 | moleculestatement : assignment
85                    | bondblock
86                    | bendblock
87                    | torsionblock
88 +                  | inversionblock
89                    | rigidbodyblock
90                    | cutoffgroupblock
91                    | fragmentblock
# Line 100 | Line 107 | atomstatement
107  
108   atomstatement
109   {
110 < vector<double> dvec;
110 > vector<RealType> dvec;
111   AtomStamp* currAtomStamp =  static_cast<AtomStamp*>(blockStack.top());
112  
113   }
# Line 164 | Line 171 | torsionstatement
171   }  
172                : assignment
173                | #(MEMBERS ivec=inttuple) {currTorsionStamp->setMembers(ivec);}
174 +              ;
175 +
176 + inversionblock  : #(INVERSION {InversionStamp* currInversionStamp = new InversionStamp(); blockStack.push(currInversionStamp);}
177 +                   (inversionstatement)*
178 +                    ENDBLOCK )  {
179 +                                  blockStack.top()->validate();
180 +                                  blockStack.pop();
181 +                                  MoleculeStamp* currMoleculeStamp = static_cast<MoleculeStamp*>(blockStack.top());
182 +                                  currMoleculeStamp->addInversionStamp(currInversionStamp);
183 +                                }
184 +          ;
185 +
186 + inversionstatement
187 + {
188 +  int icent;
189 +  InversionStamp* currInversionStamp = static_cast<InversionStamp*>(blockStack.top());
190 + }  
191 +              : assignment
192 +              | #(CENTER icent=intConst) {currInversionStamp->setCenter(icent);}
193                ;
194  
195   rigidbodyblock
# Line 224 | Line 250 | fragmentstatement : assignment
250  
251  
252                
253 < doubleNumberTuple   returns [vector<double> dvec]
253 > doubleNumberTuple   returns [vector<RealType> dvec]
254   {
255 <  double dval;
255 >  RealType dval;
256   }
257                : (dval=doubleNumber {dvec.push_back(dval);})+  
258                ;
# Line 245 | Line 271 | protected
271          ;
272  
273   protected
274 < doubleNumber  returns [double dval]
274 > doubleNumber  returns [RealType dval]
275                :
276 <                ic:intConst {dval = lexi_cast<double>(ic->getText());}
277 <                | fc:floatConst {dval = lexi_cast<double>(fc->getText());}
276 >                ic:intConst {dval = lexi_cast<RealType>(ic->getText());}
277 >                | fc:floatConst {dval = lexi_cast<RealType>(fc->getText());}
278                                
279                ;
280                
281   protected
282 < floatConst returns [double dval]
283 <        : d1:NUM_FLOAT {dval = lexi_cast<double>(d1->getText());}  
284 <        | d2:NUM_DOUBLE {dval = lexi_cast<double>(d2->getText());}
282 > floatConst returns [RealType dval]
283 >        : d1:NUM_FLOAT {dval = lexi_cast<RealType>(d1->getText());}  
284 >        | d2:NUM_DOUBLE {dval = lexi_cast<RealType>(d2->getText());}
285          ;
286          

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 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