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.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

# Line 47 | Line 47 | constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]
47   constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]
48   {
49    int ival;
50 <  double dval;
50 >  RealType dval;
51   }    
52              : ival=intConst {blockStack.top()->assign(id->getText(), ival);}
53              | dval=floatConst {blockStack.top()->assign(id->getText(), dval);}
# Line 100 | Line 100 | atomstatement
100  
101   atomstatement
102   {
103 < vector<double> dvec;
103 > vector<RealType> dvec;
104   AtomStamp* currAtomStamp =  static_cast<AtomStamp*>(blockStack.top());
105  
106   }
# Line 224 | Line 224 | fragmentstatement : assignment
224  
225  
226                
227 < doubleNumberTuple   returns [vector<double> dvec]
227 > doubleNumberTuple   returns [vector<RealType> dvec]
228   {
229 <  double dval;
229 >  RealType dval;
230   }
231                : (dval=doubleNumber {dvec.push_back(dval);})+  
232                ;
# Line 245 | Line 245 | protected
245          ;
246  
247   protected
248 < doubleNumber  returns [double dval]
248 > doubleNumber  returns [RealType dval]
249                :
250 <                ic:intConst {dval = lexi_cast<double>(ic->getText());}
251 <                | fc:floatConst {dval = lexi_cast<double>(fc->getText());}
250 >                ic:intConst {dval = lexi_cast<RealType>(ic->getText());}
251 >                | fc:floatConst {dval = lexi_cast<RealType>(fc->getText());}
252                                
253                ;
254                
255   protected
256 < floatConst returns [double dval]
257 <        : d1:NUM_FLOAT {dval = lexi_cast<double>(d1->getText());}  
258 <        | d2:NUM_DOUBLE {dval = lexi_cast<double>(d2->getText());}
256 > floatConst returns [RealType dval]
257 >        : d1:NUM_FLOAT {dval = lexi_cast<RealType>(d1->getText());}  
258 >        | d2:NUM_DOUBLE {dval = lexi_cast<RealType>(d2->getText());}
259          ;
260          

Diff Legend

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