--- trunk/src/mdParser/MDParser.hpp 2005/12/02 15:38:03 770 +++ trunk/src/mdParser/MDParser.hpp 2005/12/16 02:57:00 814 @@ -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 ); @@ -53,7 +51,8 @@ class CUSTOM_API MDParser : public ANTLR_USE_NAMESPACE public: void moleculeblock(); public: void zconstraintblock(); public: void constant(); - protected: void signedNumber(); + protected: void intConst(); + protected: void floatConst(); public: void moleculestatement(); public: void atomblock(); public: void bondblock(); @@ -62,9 +61,8 @@ class CUSTOM_API MDParser : public ANTLR_USE_NAMESPACE 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(); @@ -72,7 +70,7 @@ class CUSTOM_API MDParser : public ANTLR_USE_NAMESPACE public: void rigidbodystatement(); public: void cutoffgroupstatement(); public: void fragmentstatement(); - protected: void floatConst(); + protected: void doubleNumber(); public: ANTLR_USE_NAMESPACE(antlr)RefAST getAST() { @@ -84,10 +82,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 = 51; #else enum { - NUM_TOKENS = 56 + NUM_TOKENS = 51 }; #endif @@ -119,6 +117,8 @@ 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; }; #endif /*INC_MDParser_hpp_*/