--- trunk/src/mdParser/MDTreeParser.hpp 2005/12/02 15:38:03 770 +++ trunk/src/mdParser/MDTreeParser.hpp 2008/07/14 12:35:58 1277 @@ -3,7 +3,7 @@ #include #include "MDTreeParserTokenTypes.hpp" -/* $ANTLR 2.7.5 (20050406): "MDTreeParser.g" -> "MDTreeParser.hpp"$ */ +/* $ANTLR 2.7.7 (20080702): "MDTreeParser.g" -> "MDTreeParser.hpp"$ */ #include #line 2 "MDTreeParser.g" @@ -56,29 +56,28 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES public: void constant(ANTLR_USE_NAMESPACE(antlr)RefAST _t, ANTLR_USE_NAMESPACE(antlr)RefAST id ); - public: void signedIntOrFloat(ANTLR_USE_NAMESPACE(antlr)RefAST _t, - ANTLR_USE_NAMESPACE(antlr)RefAST id - ); protected: int intConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t); - protected: double floatConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + protected: RealType floatConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void moleculestatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void atomblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void bondblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void bendblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void torsionblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + public: void inversionblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void rigidbodyblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void cutoffgroupblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void fragmentblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void atomstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t); - public: vector signedNumberTuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + public: vector doubleNumberTuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void bondstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: vector inttuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void bendstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void torsionstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + public: void inversionstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void rigidbodystatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void cutoffgroupstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void fragmentstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t); - protected: double signedNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + protected: RealType doubleNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: ANTLR_USE_NAMESPACE(antlr)RefAST getAST() { @@ -91,10 +90,10 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES private: static const char* tokenNames[]; #ifndef NO_STATIC_CONSTS - static const int NUM_TOKENS = 56; + static const int NUM_TOKENS = 53; #else enum { - NUM_TOKENS = 56 + NUM_TOKENS = 53 }; #endif @@ -102,8 +101,6 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_0; static const unsigned long _tokenSet_1_data_[]; static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_1; - static const unsigned long _tokenSet_2_data_[]; - static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_2; }; #endif /*INC_MDTreeParser_hpp_*/