--- trunk/src/mdParser/MDParser.hpp 2005/12/02 15:38:03 770 +++ branches/development/src/mdParser/MDParser.hpp 2010/07/09 23:08:25 1465 @@ -2,7 +2,7 @@ #define INC_MDParser_hpp_ #include -/* $ANTLR 2.7.5 (20050406): "MDParser.g" -> "MDParser.hpp"$ */ +/* $ANTLR 2.7.7 (20090623): "MDParser.g" -> "MDParser.hpp"$ */ #include #include #include "MDTokenTypes.hpp" @@ -18,9 +18,7 @@ class CUSTOM_API MDParser : public ANTLR_USE_NAMESPACE #line 19 "MDParser.hpp" class CUSTOM_API MDParser : public ANTLR_USE_NAMESPACE(antlr)LLkParser, public MDTokenTypes { -#line 44 "MDParser.g" - - // Suppport C++-style single-line comments? +#line 1 "MDParser.g" #line 23 "MDParser.hpp" public: void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory ); @@ -52,27 +50,30 @@ class CUSTOM_API MDParser : public ANTLR_USE_NAMESPACE public: void componentblock(); public: void moleculeblock(); public: void zconstraintblock(); + public: void restraintblock(); public: void constant(); - protected: void signedNumber(); + protected: void intConst(); + protected: void floatConst(); public: void moleculestatement(); public: void atomblock(); public: void bondblock(); public: void bendblock(); public: void torsionblock(); + public: void inversionblock(); public: void rigidbodyblock(); public: void cutoffgroupblock(); public: void fragmentblock(); - protected: void intConst(); public: void atomstatement(); - public: void signedNumberTuple(); + public: void doubleNumberTuple(); public: void bondstatement(); public: void inttuple(); public: void bendstatement(); public: void torsionstatement(); + public: void inversionstatement(); public: void rigidbodystatement(); public: void cutoffgroupstatement(); public: void fragmentstatement(); - protected: void floatConst(); + protected: void doubleNumber(); public: ANTLR_USE_NAMESPACE(antlr)RefAST getAST() { @@ -84,10 +85,10 @@ class CUSTOM_API MDParser : public ANTLR_USE_NAMESPACE private: static const char* tokenNames[]; #ifndef NO_STATIC_CONSTS - static const int NUM_TOKENS = 56; + static const int NUM_TOKENS = 54; #else enum { - NUM_TOKENS = 56 + NUM_TOKENS = 54 }; #endif @@ -119,6 +120,10 @@ class CUSTOM_API MDParser : public ANTLR_USE_NAMESPACE static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_12; static const unsigned long _tokenSet_13_data_[]; static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_13; + static const unsigned long _tokenSet_14_data_[]; + static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_14; + static const unsigned long _tokenSet_15_data_[]; + static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_15; }; #endif /*INC_MDParser_hpp_*/