--- trunk/src/mdParser/MDTreeParser.hpp	2005/12/02 15:38:03	770
+++ trunk/src/mdParser/MDTreeParser.hpp	2006/05/17 21:51:42	963
@@ -56,11 +56,8 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
 	public: void constant(ANTLR_USE_NAMESPACE(antlr)RefAST _t,
 		ANTLR_USE_NAMESPACE(antlr)RefAST id
 	);
-	public: void signedIntOrFloat(ANTLR_USE_NAMESPACE(antlr)RefAST _t,
-		ANTLR_USE_NAMESPACE(antlr)RefAST id
-	);
 	protected: int  intConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
-	protected: double  floatConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
+	protected: RealType  floatConst(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);
@@ -70,7 +67,7 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
 	public: void cutoffgroupblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void fragmentblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void atomstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
-	public: vector<double>  signedNumberTuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
+	public: vector<RealType>  doubleNumberTuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void bondstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: vector<int>  inttuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void bendstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
@@ -78,7 +75,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);
-	protected: double  signedNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
+	protected: RealType  doubleNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 public:
 	ANTLR_USE_NAMESPACE(antlr)RefAST getAST()
 	{
@@ -91,10 +88,10 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
 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
 	
@@ -102,8 +99,6 @@ 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;
 };
 
 #endif /*INC_MDTreeParser_hpp_*/