--- trunk/src/mdParser/MDTreeParser.hpp 2009/09/07 16:31:51 1360 +++ trunk/src/mdParser/MDTreeParser.hpp 2012/08/22 02:28:28 1782 @@ -3,7 +3,7 @@ #include #include "MDTreeParserTokenTypes.hpp" -/* $ANTLR 2.7.7 (20090623): "MDTreeParser.g" -> "MDTreeParser.hpp"$ */ +/* $ANTLR 2.7.7 (20120725): "MDTreeParser.g" -> "MDTreeParser.hpp"$ */ #include #line 2 "MDTreeParser.g" @@ -12,7 +12,7 @@ using namespace std; #include "io/Globals.hpp" #include "utils/StringUtils.hpp" using namespace std; -using namespace oopse; +using namespace OpenMD; #line 18 "MDTreeParser.hpp" class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMESPACE(antlr)TreeParser, public MDTreeParserTokenTypes @@ -54,11 +54,15 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES public: void moleculeblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void zconstraintblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void restraintblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + public: void flucqblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + public: void rnemdblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + public: void minimizerblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void constant(ANTLR_USE_NAMESPACE(antlr)RefAST _t, ANTLR_USE_NAMESPACE(antlr)RefAST id ); 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: 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); @@ -78,7 +82,6 @@ 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); - protected: RealType doubleNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: ANTLR_USE_NAMESPACE(antlr)RefAST getAST() { @@ -91,10 +94,10 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES private: static const char* tokenNames[]; #ifndef NO_STATIC_CONSTS - static const int NUM_TOKENS = 54; + static const int NUM_TOKENS = 57; #else enum { - NUM_TOKENS = 54 + NUM_TOKENS = 57 }; #endif