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 810 by tim, Wed Dec 14 18:02:28 2005 UTC vs.
branches/development/src/mdParser/MDTreeParser.g (file contents), Revision 1746 by gezelter, Wed Jun 6 02:18:54 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]    
51 <            : signedIntOrFloat[#id]
50 > constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]
51 > {
52 >  int ival;
53 >  RealType dval;
54 > }    
55 >            : ival=intConst {blockStack.top()->assign(id->getText(), ival);}
56 >            | dval=floatConst {blockStack.top()->assign(id->getText(), dval);}
57              | str1:ID {blockStack.top()->assign(id->getText(), str1->getText());}
58              | str2:StringLiteral { std::string s =  str2->getText();
59                                     s = s.substr(1, s.length()-2);
# Line 53 | Line 61 | constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]    
61                                   }
62              ;
63              
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 –              ;
64  
65   componentblock  : #(COMPONENT  {Component* currComponet = new Component(); blockStack.push(currComponet);}
66                        (assignment)*
# Line 75 | Line 71 | zconstraintblock  : #(ZCONSTRAINT {ZConsStamp* currZCo
71                          (assignment)*
72                           ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addZConsStamp(currZConsStamp);}
73                    ;
74 +
75 + restraintblock  : #(RESTRAINT {RestraintStamp* currRestraintStamp = new RestraintStamp(); blockStack.push(currRestraintStamp);}
76 +                        (assignment)*
77 +                         ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRestraintStamp(currRestraintStamp);}
78 +                  ;
79    
80 + flucqblock  : #(FLUCQ  {FluctuatingChargeParameters* flucQpars = new FluctuatingChargeParameters(); blockStack.push(flucQpars);}
81 +                      (assignment)*
82 +                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addFluctuatingChargeParameters(flucQpars);}
83 +                ;
84 +
85 + rnemdblock  : #(RNEMD  {RNEMDParameters* rnemdPars = new RNEMDParameters(); blockStack.push(rnemdPars);}
86 +                      (assignment)*
87 +                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRNEMDParameters(rnemdPars);}
88 +                ;
89 +
90 + minimizerblock  : #(MINIMIZER  {MinimizerParameters* minimizerPars = new MinimizerParameters(); blockStack.push(minimizerPars);}
91 +                      (assignment)*
92 +                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addMinimizerParameters(minimizerPars);}
93 +                ;
94 +
95 +
96   moleculeblock : #(MOLECULE {MoleculeStamp* currMoleculeStamp = new MoleculeStamp(); blockStack.push(currMoleculeStamp);}
97                      (moleculestatement)*
98                       ENDBLOCK ) {blockStack.top()->validate(); blockStack.pop(); currConf->addMoleculeStamp(currMoleculeStamp);}
# Line 86 | Line 103 | moleculestatement : assignment
103                    | bondblock
104                    | bendblock
105                    | torsionblock
106 +                  | inversionblock
107                    | rigidbodyblock
108                    | cutoffgroupblock
109                    | fragmentblock
# Line 107 | Line 125 | atomstatement
125  
126   atomstatement
127   {
128 < vector<double> dvec;
128 > vector<RealType> dvec;
129   AtomStamp* currAtomStamp =  static_cast<AtomStamp*>(blockStack.top());
130  
131   }
132                : assignment
133 <              | #(POSITION dvec=signedNumberTuple) {currAtomStamp->setPosition(dvec);}
134 <              | #(ORIENTATION dvec=signedNumberTuple) {currAtomStamp->setOrientation(dvec);}
133 >              | #(POSITION dvec=doubleNumberTuple) {currAtomStamp->setPosition(dvec);}
134 >              | #(ORIENTATION dvec=doubleNumberTuple) {currAtomStamp->setOrientation(dvec);}
135                ;
136  
137                        
# Line 173 | Line 191 | torsionstatement
191                | #(MEMBERS ivec=inttuple) {currTorsionStamp->setMembers(ivec);}
192                ;
193  
194 + inversionblock  : #(INVERSION {InversionStamp* currInversionStamp = new InversionStamp(); blockStack.push(currInversionStamp);}
195 +                   (inversionstatement)*
196 +                    ENDBLOCK )  {
197 +                                  blockStack.top()->validate();
198 +                                  blockStack.pop();
199 +                                  MoleculeStamp* currMoleculeStamp = static_cast<MoleculeStamp*>(blockStack.top());
200 +                                  currMoleculeStamp->addInversionStamp(currInversionStamp);
201 +                                }
202 +          ;
203 +
204 + inversionstatement
205 + {
206 +  int icent;
207 +  InversionStamp* currInversionStamp = static_cast<InversionStamp*>(blockStack.top());
208 + }  
209 +              : assignment
210 +              | #(CENTER icent=intConst) {currInversionStamp->setCenter(icent);}
211 +              ;
212 +
213   rigidbodyblock
214   {
215   int index;
# Line 231 | Line 268 | fragmentstatement : assignment
268  
269  
270                
271 < signedNumberTuple   returns [vector<double> dvec]
271 > doubleNumberTuple   returns [vector<RealType> dvec]
272   {
273 <  double dval;
273 >  RealType dval;
274   }
275 <              : (dval=signedNumber {dvec.push_back(dval);})+  
275 >              : (dval=doubleNumber {dvec.push_back(dval);})+  
276                ;
277                            
278   inttuple  returns [vector<int> ivec]
# Line 247 | Line 284 | intConst returns [int ival]
284  
285   protected
286   intConst returns [int ival]
287 <        : oival:OCTALINT {ival = lexi_cast<int>(oival->getText());}
288 <        | dival:DECIMALINT {ival = lexi_cast<int>(dival->getText());}
252 <        | hival:HEXADECIMALINT {ival = lexi_cast<int>(hival->getText());}
287 >        : i1:NUM_INT {ival = lexi_cast<int>(i1->getText());}
288 >        | i2:NUM_LONG {ival = lexi_cast<int>(i2->getText());}
289          ;
290  
291   protected
292 < signedNumber  returns [double dval]
292 > doubleNumber  returns [RealType dval]
293                :
294 <                ic:intConst {dval = lexi_cast<double>(ic->getText());}
295 <                | fc:floatConst {dval = lexi_cast<double>(fc->getText());}
294 >                ic:intConst {dval = lexi_cast<RealType>(ic->getText());}
295 >                | fc:floatConst {dval = lexi_cast<RealType>(fc->getText());}
296                                
297                ;
298                
299   protected
300 < floatConst returns [double dval]
301 <        : d1:FLOATONE {dval = lexi_cast<double>(d1->getText());}  
302 <        | d2:FLOATTWO {dval = lexi_cast<double>(d2->getText());}
300 > floatConst returns [RealType dval]
301 >        : d1:NUM_FLOAT {dval = lexi_cast<RealType>(d1->getText());}  
302 >        | d2:NUM_DOUBLE {dval = lexi_cast<RealType>(d2->getText());}
303          ;
304          

Comparing:
trunk/src/mdParser/MDTreeParser.g (property svn:keywords), Revision 810 by tim, Wed Dec 14 18:02:28 2005 UTC vs.
branches/development/src/mdParser/MDTreeParser.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