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 770 by tim, Fri Dec 2 15:38:03 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 <            : signedIntOrFloat[#id]
49 > constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]
50 > {
51 >  int ival;
52 >  RealType dval;
53 > }    
54 >            : ival=intConst {blockStack.top()->assign(id->getText(), ival);}
55 >            | dval=floatConst {blockStack.top()->assign(id->getText(), dval);}
56              | str1:ID {blockStack.top()->assign(id->getText(), str1->getText());}
57              | str2:StringLiteral { std::string s =  str2->getText();
58                                     s = s.substr(1, s.length()-2);
# Line 53 | Line 60 | constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]    
60                                   }
61              ;
62              
56 – signedIntOrFloat [ANTLR_USE_NAMESPACE(antlr)RefAST id]  
57 – {
58 –  int ival;
59 –  double dval;
60 – }
61 –              : #(MINUS (icMinus:intConst {ival = lexi_cast<int>(icMinus->getText()); ival = -ival; blockStack.top()->assign(id->getText(), ival);}
62 –                | fcMinus:floatConst) {dval = lexi_cast<double>(fcMinus->getText());dval = -dval;  blockStack.top()->assign(id->getText(), dval);}
63 –                )
64 –              | (ic:intConst {ival = lexi_cast<int>(ic->getText()); blockStack.top()->assign(id->getText(), ival);}
65 –                | fc:floatConst {dval = lexi_cast<double>(fc->getText());  blockStack.top()->assign(id->getText(), dval);}
66 –                )              
67 –              ;
63  
64   componentblock  : #(COMPONENT  {Component* currComponet = new Component(); blockStack.push(currComponet);}
65                        (assignment)*
# Line 75 | 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 86 | Line 97 | moleculestatement : assignment
97                    | bondblock
98                    | bendblock
99                    | torsionblock
100 +                  | inversionblock
101                    | rigidbodyblock
102                    | cutoffgroupblock
103                    | fragmentblock
# Line 107 | 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   }
126                : assignment
127 <              | #(POSITION dvec=signedNumberTuple) {currAtomStamp->setPosition(dvec);}
128 <              | #(ORIENTATION dvec=signedNumberTuple) {currAtomStamp->setOrientation(dvec);}
127 >              | #(POSITION dvec=doubleNumberTuple) {currAtomStamp->setPosition(dvec);}
128 >              | #(ORIENTATION dvec=doubleNumberTuple) {currAtomStamp->setOrientation(dvec);}
129                ;
130  
131                        
# Line 173 | Line 185 | torsionstatement
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
208   {
209   int index;
# Line 231 | Line 262 | fragmentstatement : assignment
262  
263  
264                
265 < signedNumberTuple   returns [vector<double> dvec]
265 > doubleNumberTuple   returns [vector<RealType> dvec]
266   {
267 <  double dval;
267 >  RealType dval;
268   }
269 <              : (dval=signedNumber {dvec.push_back(dval);})+  
269 >              : (dval=doubleNumber {dvec.push_back(dval);})+  
270                ;
271                            
272   inttuple  returns [vector<int> ivec]
# Line 247 | Line 278 | intConst returns [int ival]
278  
279   protected
280   intConst returns [int ival]
281 <        : oival:OCTALINT {ival = lexi_cast<int>(oival->getText());}
282 <        | dival:DECIMALINT {ival = lexi_cast<int>(dival->getText());}
252 <        | hival:HEXADECIMALINT {ival = lexi_cast<int>(hival->getText());}
281 >        : i1:NUM_INT {ival = lexi_cast<int>(i1->getText());}
282 >        | i2:NUM_LONG {ival = lexi_cast<int>(i2->getText());}
283          ;
284  
285   protected
286 < signedNumber  returns [double dval]
287 <              : #(MINUS (icMinus:intConst {dval = lexi_cast<double>(icMinus->getText()); dval = -dval;}
288 <                | fcMinus:floatConst) {dval = lexi_cast<double>(fcMinus->getText());dval = -dval;}
289 <                )
290 <              | (ic:intConst {dval = lexi_cast<double>(ic->getText());}
261 <                | fc:floatConst {dval = lexi_cast<double>(fc->getText());}
262 <                )              
286 > doubleNumber  returns [RealType dval]
287 >              :
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:FLOATONE {dval = lexi_cast<double>(d1->getText());}  
296 <        | d2:FLOATTWO {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 <        
298 >        

Comparing:
trunk/src/mdParser/MDTreeParser.g (property svn:keywords), Revision 770 by tim, Fri Dec 2 15:38:03 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