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 1776 by gezelter, Thu Aug 9 15:52:59 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 >    | minimizerblock
45 >    ;
46  
43 –
47   assignment  : #(ASSIGNEQUAL id:ID constant[#id]) //{blockStack.top()->assign(#ID->getText(),);}
48              ;
49              
50 < constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]    
48 <            : signedIntOrFloat[#id]
49 <            | str1:ID {blockStack.top()->assign(id->getText(), str1->getText());}
50 <            | str2:StringLiteral { std::string s =  str2->getText();
51 <                                   s = s.substr(1, s.length()-2);
52 <                                   blockStack.top()->assign(id->getText(),s);
53 <                                 }
54 <            ;
55 <            
56 < signedIntOrFloat [ANTLR_USE_NAMESPACE(antlr)RefAST id]  
50 > constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]
51   {
52 <  int ival;
53 <  double dval;
54 < }
55 <              : #(MINUS (icMinus:intConst {ival = lexi_cast<int>(icMinus->getText()); ival = -ival; blockStack.top()->assign(id->getText(), ival);}
56 <                | fcMinus:floatConst) {dval = lexi_cast<double>(fcMinus->getText());dval = -dval;  blockStack.top()->assign(id->getText(), dval);}
57 <                )
58 <              | (ic:intConst {ival = lexi_cast<int>(ic->getText()); blockStack.top()->assign(id->getText(), ival);}
59 <                | fc:floatConst {dval = lexi_cast<double>(fc->getText());  blockStack.top()->assign(id->getText(), dval);}
60 <                )              
61 <              ;
52 >    int ival;
53 >    RealType dval, x, y, z;
54 >    Vector3d dvec;
55 > }    
56 >    : ival=intConst {blockStack.top()->assign(id->getText(), ival);}
57 >    | dval=floatConst {blockStack.top()->assign(id->getText(), dval);}
58 >    | #(LPAREN x=doubleNumber COMMA y=doubleNumber COMMA z=doubleNumber RPAREN)
59 >        {   dvec.x() = x;
60 >            dvec.y() = y;
61 >            dvec.z() = z;
62 >            blockStack.top()->assign(id->getText(), dvec);
63 >        }
64 >    | str1:ID {blockStack.top()->assign(id->getText(), str1->getText());}
65 >    | str2:StringLiteral {std::string s =  str2->getText();
66 >            s = s.substr(1, s.length()-2);
67 >            blockStack.top()->assign(id->getText(),s);
68 >        }
69 >    ;
70 >            
71  
72   componentblock  : #(COMPONENT  {Component* currComponet = new Component(); blockStack.push(currComponet);}
73                        (assignment)*
# Line 75 | Line 78 | zconstraintblock  : #(ZCONSTRAINT {ZConsStamp* currZCo
78                          (assignment)*
79                           ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addZConsStamp(currZConsStamp);}
80                    ;
81 +
82 + restraintblock  : #(RESTRAINT {RestraintStamp* currRestraintStamp = new RestraintStamp(); blockStack.push(currRestraintStamp);}
83 +                        (assignment)*
84 +                         ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRestraintStamp(currRestraintStamp);}
85 +                  ;
86    
87 + flucqblock  : #(FLUCQ  {FluctuatingChargeParameters* flucQpars = new FluctuatingChargeParameters(); blockStack.push(flucQpars);}
88 +                      (assignment)*
89 +                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addFluctuatingChargeParameters(flucQpars);}
90 +                ;
91 +
92 + rnemdblock  : #(RNEMD  {RNEMDParameters* rnemdPars = new RNEMDParameters(); blockStack.push(rnemdPars);}
93 +                      (assignment)*
94 +                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRNEMDParameters(rnemdPars);}
95 +                ;
96 +
97 + minimizerblock  : #(MINIMIZER  {MinimizerParameters* minimizerPars = new MinimizerParameters(); blockStack.push(minimizerPars);}
98 +                      (assignment)*
99 +                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addMinimizerParameters(minimizerPars);}
100 +                ;
101 +
102 +
103   moleculeblock : #(MOLECULE {MoleculeStamp* currMoleculeStamp = new MoleculeStamp(); blockStack.push(currMoleculeStamp);}
104                      (moleculestatement)*
105                       ENDBLOCK ) {blockStack.top()->validate(); blockStack.pop(); currConf->addMoleculeStamp(currMoleculeStamp);}
# Line 86 | Line 110 | moleculestatement : assignment
110                    | bondblock
111                    | bendblock
112                    | torsionblock
113 +                  | inversionblock
114                    | rigidbodyblock
115                    | cutoffgroupblock
116                    | fragmentblock
# Line 107 | Line 132 | atomstatement
132  
133   atomstatement
134   {
135 < vector<double> dvec;
135 > vector<RealType> dvec;
136   AtomStamp* currAtomStamp =  static_cast<AtomStamp*>(blockStack.top());
137  
138   }
139                : assignment
140 <              | #(POSITION dvec=signedNumberTuple) {currAtomStamp->setPosition(dvec);}
141 <              | #(ORIENTATION dvec=signedNumberTuple) {currAtomStamp->setOrientation(dvec);}
140 >              | #(POSITION dvec=doubleNumberTuple) {currAtomStamp->setPosition(dvec);}
141 >              | #(ORIENTATION dvec=doubleNumberTuple) {currAtomStamp->setOrientation(dvec);}
142                ;
143  
144                        
# Line 173 | Line 198 | torsionstatement
198                | #(MEMBERS ivec=inttuple) {currTorsionStamp->setMembers(ivec);}
199                ;
200  
201 + inversionblock  : #(INVERSION {InversionStamp* currInversionStamp = new InversionStamp(); blockStack.push(currInversionStamp);}
202 +                   (inversionstatement)*
203 +                    ENDBLOCK )  {
204 +                                  blockStack.top()->validate();
205 +                                  blockStack.pop();
206 +                                  MoleculeStamp* currMoleculeStamp = static_cast<MoleculeStamp*>(blockStack.top());
207 +                                  currMoleculeStamp->addInversionStamp(currInversionStamp);
208 +                                }
209 +          ;
210 +
211 + inversionstatement
212 + {
213 +  int icent;
214 +  InversionStamp* currInversionStamp = static_cast<InversionStamp*>(blockStack.top());
215 + }  
216 +              : assignment
217 +              | #(CENTER icent=intConst) {currInversionStamp->setCenter(icent);}
218 +              ;
219 +
220   rigidbodyblock
221   {
222   int index;
# Line 227 | Line 271 | fragmentstatement : assignment
271                ;
272  
273   fragmentstatement : assignment
274 <              ;
274 >    ;
275  
276  
277                
278 < signedNumberTuple   returns [vector<double> dvec]
278 > doubleNumberTuple returns [vector<RealType> dvec]
279   {
280 <  double dval;
281 < }
282 <              : (dval=signedNumber {dvec.push_back(dval);})+  
283 <              ;
284 <                          
285 < inttuple  returns [vector<int> ivec]
280 >    RealType dval;
281 > }  
282 >    : (dval=doubleNumber {dvec.push_back(dval);})+  
283 >    ;
284 >
285 >
286 > inttuple returns [vector<int> ivec]
287   {
288 <  int ival;
288 >    int ival;
289   }
290 <              : (ival=intConst {ivec.push_back(ival);})+
291 <              ;
290 >    : (ival=intConst {ivec.push_back(ival);})+
291 >    ;
292  
293   protected
294   intConst returns [int ival]
295 <        : oival:OCTALINT {ival = lexi_cast<int>(oival->getText());}
296 <        | dival:DECIMALINT {ival = lexi_cast<int>(dival->getText());}
297 <        | hival:HEXADECIMALINT {ival = lexi_cast<int>(hival->getText());}
253 <        ;
295 >    : i1:NUM_INT {ival = lexi_cast<int>(i1->getText());}
296 >    | i2:NUM_LONG {ival = lexi_cast<int>(i2->getText());}
297 >    ;
298  
299   protected
300 < signedNumber  returns [double dval]
301 <              : #(MINUS (icMinus:intConst {dval = lexi_cast<double>(icMinus->getText()); dval = -dval;}
302 <                | fcMinus:floatConst) {dval = lexi_cast<double>(fcMinus->getText());dval = -dval;}
303 <                )
260 <              | (ic:intConst {dval = lexi_cast<double>(ic->getText());}
261 <                | fc:floatConst {dval = lexi_cast<double>(fc->getText());}
262 <                )              
263 <              ;
300 > doubleNumber returns [RealType dval]
301 >    : ic:intConst {dval = lexi_cast<RealType>(ic->getText());}
302 >    | fc:floatConst {dval = lexi_cast<RealType>(fc->getText());}        
303 >    ;
304                
305   protected
306 < floatConst returns [double dval]
307 <        : d1:FLOATONE {dval = lexi_cast<double>(d1->getText());}  
308 <        | d2:FLOATTWO {dval = lexi_cast<double>(d2->getText());}
309 <        ;
310 <        
306 > floatConst returns [RealType dval]
307 >    : d1:NUM_FLOAT {dval = lexi_cast<RealType>(d1->getText());}  
308 >    | d2:NUM_DOUBLE {dval = lexi_cast<RealType>(d2->getText());}
309 >    ;
310 >  

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 1776 by gezelter, Thu Aug 9 15:52:59 2012 UTC

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

Diff Legend

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