ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/mdParser/MDTreeParser.cpp
(Generate patch)

Comparing trunk/src/mdParser/MDTreeParser.cpp (file contents):
Revision 962 by tim, Fri Dec 16 02:57:00 2005 UTC vs.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

# Line 251 | Line 251 | void MDTreeParser::constant(ANTLR_USE_NAMESPACE(antlr)
251   #line 47 "MDTreeParser.g"
252          
253          int ival;
254 <        double dval;
254 >        RealType dval;
255          
256   #line 257 "MDTreeParser.cpp"
257          
# Line 363 | Line 363 | int  MDTreeParser::intConst(ANTLR_USE_NAMESPACE(antlr)
363          return ival;
364   }
365  
366 < double  MDTreeParser::floatConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
366 > RealType  MDTreeParser::floatConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
367   #line 256 "MDTreeParser.g"
368 <        double dval;
368 >        RealType dval;
369   #line 370 "MDTreeParser.cpp"
370          ANTLR_USE_NAMESPACE(antlr)RefAST floatConst_AST_in = (_t == ASTNULL) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t;
371          ANTLR_USE_NAMESPACE(antlr)RefAST d1 = ANTLR_USE_NAMESPACE(antlr)nullAST;
# Line 381 | Line 381 | double  MDTreeParser::floatConst(ANTLR_USE_NAMESPACE(a
381                          match(_t,NUM_FLOAT);
382                          _t = _t->getNextSibling();
383   #line 257 "MDTreeParser.g"
384 <                        dval = lexi_cast<double>(d1->getText());
384 >                        dval = lexi_cast<RealType>(d1->getText());
385   #line 386 "MDTreeParser.cpp"
386                          break;
387                  }
# Line 391 | Line 391 | double  MDTreeParser::floatConst(ANTLR_USE_NAMESPACE(a
391                          match(_t,NUM_DOUBLE);
392                          _t = _t->getNextSibling();
393   #line 258 "MDTreeParser.g"
394 <                        dval = lexi_cast<double>(d2->getText());
394 >                        dval = lexi_cast<RealType>(d2->getText());
395   #line 396 "MDTreeParser.cpp"
396                          break;
397                  }
# Line 837 | Line 837 | void MDTreeParser::atomstatement(ANTLR_USE_NAMESPACE(a
837          ANTLR_USE_NAMESPACE(antlr)RefAST atomstatement_AST_in = (_t == ASTNULL) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t;
838   #line 101 "MDTreeParser.g"
839          
840 <        vector<double> dvec;
840 >        vector<RealType> dvec;
841          AtomStamp* currAtomStamp =  static_cast<AtomStamp*>(blockStack.top());
842          
843          
# Line 897 | Line 897 | void MDTreeParser::atomstatement(ANTLR_USE_NAMESPACE(a
897          _retTree = _t;
898   }
899  
900 < vector<double>  MDTreeParser::doubleNumberTuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
900 > vector<RealType>  MDTreeParser::doubleNumberTuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
901   #line 227 "MDTreeParser.g"
902 <        vector<double> dvec;
902 >        vector<RealType> dvec;
903   #line 904 "MDTreeParser.cpp"
904          ANTLR_USE_NAMESPACE(antlr)RefAST doubleNumberTuple_AST_in = (_t == ASTNULL) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t;
905   #line 227 "MDTreeParser.g"
906          
907 <        double dval;
907 >        RealType dval;
908          
909   #line 910 "MDTreeParser.cpp"
910          
# Line 1236 | Line 1236 | void MDTreeParser::fragmentstatement(ANTLR_USE_NAMESPA
1236          _retTree = _t;
1237   }
1238  
1239 < double  MDTreeParser::doubleNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
1239 > RealType  MDTreeParser::doubleNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t) {
1240   #line 248 "MDTreeParser.g"
1241 <        double dval;
1241 >        RealType dval;
1242   #line 1243 "MDTreeParser.cpp"
1243          ANTLR_USE_NAMESPACE(antlr)RefAST doubleNumber_AST_in = (_t == ASTNULL) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t;
1244          ANTLR_USE_NAMESPACE(antlr)RefAST ic = ANTLR_USE_NAMESPACE(antlr)nullAST;
# Line 1255 | Line 1255 | double  MDTreeParser::doubleNumber(ANTLR_USE_NAMESPACE
1255                          intConst(_t);
1256                          _t = _retTree;
1257   #line 250 "MDTreeParser.g"
1258 <                        dval = lexi_cast<double>(ic->getText());
1258 >                        dval = lexi_cast<RealType>(ic->getText());
1259   #line 1260 "MDTreeParser.cpp"
1260                          break;
1261                  }
# Line 1266 | Line 1266 | double  MDTreeParser::doubleNumber(ANTLR_USE_NAMESPACE
1266                          floatConst(_t);
1267                          _t = _retTree;
1268   #line 251 "MDTreeParser.g"
1269 <                        dval = lexi_cast<double>(fc->getText());
1269 >                        dval = lexi_cast<RealType>(fc->getText());
1270   #line 1271 "MDTreeParser.cpp"
1271                          break;
1272                  }

Diff Legend

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