--- trunk/src/mdParser/MDTreeParser.hpp 2013/07/16 17:16:45 1902 +++ trunk/src/mdParser/MDTreeParser.hpp 2014/11/13 17:49:44 2040 @@ -3,7 +3,7 @@ #include #include "MDTreeParserTokenTypes.hpp" -/* $ANTLR 2.7.7 (20121118): "MDTreeParser.g" -> "MDTreeParser.hpp"$ */ +/* $ANTLR 2.7.7 (20141024): "MDTreeParser.g" -> "MDTreeParser.hpp"$ */ #include #line 2 "MDTreeParser.g" @@ -62,7 +62,7 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES ); protected: int intConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t); protected: RealType floatConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t); - protected: RealType doubleNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + public: vector doubleNumberTuple(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); @@ -72,8 +72,8 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES 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 constraintblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void atomstatement(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); @@ -82,6 +82,8 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES 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); + public: void constraintstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + protected: RealType doubleNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: ANTLR_USE_NAMESPACE(antlr)RefAST getAST() { @@ -94,10 +96,10 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES private: static const char* tokenNames[]; #ifndef NO_STATIC_CONSTS - static const int NUM_TOKENS = 58; + static const int NUM_TOKENS = 60; #else enum { - NUM_TOKENS = 58 + NUM_TOKENS = 60 }; #endif