--- trunk/src/mdParser/MDTreeParser.hpp	2006/05/17 21:51:42	963
+++ trunk/src/mdParser/MDTreeParser.hpp	2014/12/02 22:11:04	2046
@@ -3,7 +3,7 @@
 
 #include <antlr/config.hpp>
 #include "MDTreeParserTokenTypes.hpp"
-/* $ANTLR 2.7.5 (20050406): "MDTreeParser.g" -> "MDTreeParser.hpp"$ */
+/* $ANTLR 2.7.7 (20141024): "MDTreeParser.g" -> "MDTreeParser.hpp"$ */
 #include <antlr/TreeParser.hpp>
 
 #line 2 "MDTreeParser.g"
@@ -12,22 +12,22 @@ 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
 {
 #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<DataHolder*> blockStack;    
 #line 22 "MDTreeParser.hpp"
@@ -53,29 +53,37 @@ class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
 	public: void componentblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	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);
+	public: vector<RealType>  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);
 	public: void bendblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void torsionblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
+	public: void inversionblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	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<RealType>  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<int>  inttuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void bendstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	public: void torsionstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
+	public: void inversionstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 	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: void constraintstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
 public:
 	ANTLR_USE_NAMESPACE(antlr)RefAST getAST()
 	{
@@ -88,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 = 51;
+	static const int NUM_TOKENS = 78;
 #else
 	enum {
-		NUM_TOKENS = 51
+		NUM_TOKENS = 78
 	};
 #endif
 	
@@ -99,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_*/