--- trunk/src/mdParser/MDTreeParser.g 2006/05/17 19:54:27 962 +++ trunk/src/mdParser/MDTreeParser.g 2006/05/17 21:51:42 963 @@ -47,7 +47,7 @@ constant [ANTLR_USE_NAMESPACE(antlr)RefAST id] constant [ANTLR_USE_NAMESPACE(antlr)RefAST id] { int ival; - double dval; + RealType dval; } : ival=intConst {blockStack.top()->assign(id->getText(), ival);} | dval=floatConst {blockStack.top()->assign(id->getText(), dval);} @@ -100,7 +100,7 @@ atomstatement atomstatement { -vector dvec; +vector dvec; AtomStamp* currAtomStamp = static_cast(blockStack.top()); } @@ -224,9 +224,9 @@ fragmentstatement : assignment -doubleNumberTuple returns [vector dvec] +doubleNumberTuple returns [vector dvec] { - double dval; + RealType dval; } : (dval=doubleNumber {dvec.push_back(dval);})+ ; @@ -245,16 +245,16 @@ protected ; protected -doubleNumber returns [double dval] +doubleNumber returns [RealType dval] : - ic:intConst {dval = lexi_cast(ic->getText());} - | fc:floatConst {dval = lexi_cast(fc->getText());} + ic:intConst {dval = lexi_cast(ic->getText());} + | fc:floatConst {dval = lexi_cast(fc->getText());} ; protected -floatConst returns [double dval] - : d1:NUM_FLOAT {dval = lexi_cast(d1->getText());} - | d2:NUM_DOUBLE {dval = lexi_cast(d2->getText());} +floatConst returns [RealType dval] + : d1:NUM_FLOAT {dval = lexi_cast(d1->getText());} + | d2:NUM_DOUBLE {dval = lexi_cast(d2->getText());} ;