--- trunk/src/mdParser/MDTreeParser.hpp 2013/07/16 17:16:45 1902 +++ trunk/src/mdParser/MDTreeParser.hpp 2014/12/02 22:11:04 2046 @@ -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" @@ -19,15 +19,15 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES { #line 21 "MDTreeParser.g" - public: + public: Globals* walkTree(ANTLR_USE_NAMESPACE(antlr)RefAST tree) { - currConf = new Globals; - blockStack.push(currConf); - mdfile(tree); - return currConf; + currConf = new Globals; + blockStack.push(currConf); + mdfile(tree); + return currConf; } - private: + private: Globals* currConf; stack blockStack; #line 22 "MDTreeParser.hpp" @@ -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,9 @@ 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); + protected: RealType doubleNumber(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 +83,7 @@ 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); 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 = 78; #else enum { - NUM_TOKENS = 58 + NUM_TOKENS = 78 }; #endif @@ -105,6 +107,16 @@ 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; + static const unsigned long _tokenSet_3_data_[]; + static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_3; + static const unsigned long _tokenSet_4_data_[]; + static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4; + static const unsigned long _tokenSet_5_data_[]; + static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_5; + static const unsigned long _tokenSet_6_data_[]; + static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_6; }; #endif /*INC_MDTreeParser_hpp_*/