--- trunk/src/mdParser/MDTreeParser.g	2005/12/16 02:57:00	814
+++ branches/development/src/mdParser/MDTreeParser.g	2012/05/31 12:25:30	1731
@@ -4,7 +4,7 @@ using namespace std;
 #include "io/Globals.hpp"
 #include "utils/StringUtils.hpp"
 using namespace std;
-using namespace oopse;
+using namespace OpenMD;
 }
 options
   {
@@ -15,7 +15,7 @@ options
 
 options
 {
-        k = 3;
+        k = 1;
         importVocab = MD;
 }
 {
@@ -35,19 +35,21 @@ statement : assignment
         ;
 
 statement : assignment
-          | componentblock
-          | moleculeblock
-          | zconstraintblock
-          ;
+    | componentblock
+    | moleculeblock
+    | zconstraintblock
+    | restraintblock
+    | flucqblock
+    | rnemdblock
+    ;
 
-
 assignment  : #(ASSIGNEQUAL id:ID constant[#id]) //{blockStack.top()->assign(#ID->getText(),);}
             ;
             
 constant [ANTLR_USE_NAMESPACE(antlr)RefAST id]
 {
   int ival;
-  double dval;
+  RealType dval;
 }    
             : ival=intConst {blockStack.top()->assign(id->getText(), ival);}
             | dval=floatConst {blockStack.top()->assign(id->getText(), dval);}
@@ -68,7 +70,23 @@ zconstraintblock  : #(ZCONSTRAINT {ZConsStamp* currZCo
                         (assignment)* 
                          ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addZConsStamp(currZConsStamp);}
                   ;
+
+restraintblock  : #(RESTRAINT {RestraintStamp* currRestraintStamp = new RestraintStamp(); blockStack.push(currRestraintStamp);}
+                        (assignment)* 
+                         ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRestraintStamp(currRestraintStamp);}
+                  ;
   
+flucqblock  : #(FLUCQ  {FluctuatingChargeParameters* flucQpars = new FluctuatingChargeParameters(); blockStack.push(flucQpars);}
+                      (assignment)* 
+                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addFluctuatingChargeParameters(flucQpars);}
+                ;
+
+rnemdblock  : #(RNEMD  {RNEMDParameters* rnemdPars = new RNEMDParameters(); blockStack.push(rnemdPars);}
+                      (assignment)* 
+                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRNEMDParameters(rnemdPars);}
+                ;
+
+
 moleculeblock : #(MOLECULE {MoleculeStamp* currMoleculeStamp = new MoleculeStamp(); blockStack.push(currMoleculeStamp);}
                     (moleculestatement)* 
                      ENDBLOCK ) {blockStack.top()->validate(); blockStack.pop(); currConf->addMoleculeStamp(currMoleculeStamp);}
@@ -79,6 +97,7 @@ moleculestatement : assignment
                   | bondblock
                   | bendblock
                   | torsionblock
+                  | inversionblock
                   | rigidbodyblock
                   | cutoffgroupblock
                   | fragmentblock
@@ -100,7 +119,7 @@ atomstatement 
 
 atomstatement 
 {
-vector<double> dvec;
+vector<RealType> dvec;
 AtomStamp* currAtomStamp =  static_cast<AtomStamp*>(blockStack.top());
 
 }
@@ -164,6 +183,25 @@ torsionstatement
 }  
               : assignment
               | #(MEMBERS ivec=inttuple) {currTorsionStamp->setMembers(ivec);}
+              ;
+
+inversionblock  : #(INVERSION {InversionStamp* currInversionStamp = new InversionStamp(); blockStack.push(currInversionStamp);}
+                   (inversionstatement)*
+                    ENDBLOCK )  {
+                                  blockStack.top()->validate();
+                                  blockStack.pop(); 
+                                  MoleculeStamp* currMoleculeStamp = static_cast<MoleculeStamp*>(blockStack.top());
+                                  currMoleculeStamp->addInversionStamp(currInversionStamp); 
+                                }
+          ;
+
+inversionstatement
+{
+  int icent;
+  InversionStamp* currInversionStamp = static_cast<InversionStamp*>(blockStack.top());
+}  
+              : assignment
+              | #(CENTER icent=intConst) {currInversionStamp->setCenter(icent);}
               ;
 
 rigidbodyblock
@@ -224,9 +262,9 @@ fragmentstatement : assignment
 
 
               
-doubleNumberTuple   returns [vector<double> dvec]
+doubleNumberTuple   returns [vector<RealType> dvec]
 {
-  double dval;
+  RealType dval;
 }
               : (dval=doubleNumber {dvec.push_back(dval);})+  
               ;
@@ -245,16 +283,16 @@ protected
         ;
 
 protected
-doubleNumber  returns [double dval]
+doubleNumber  returns [RealType dval]
               : 
-                ic:intConst {dval = lexi_cast<double>(ic->getText());}
-                | fc:floatConst {dval = lexi_cast<double>(fc->getText());} 
+                ic:intConst {dval = lexi_cast<RealType>(ic->getText());}
+                | fc:floatConst {dval = lexi_cast<RealType>(fc->getText());} 
                                
               ;
               
 protected
-floatConst returns [double dval]
-        : d1:NUM_FLOAT {dval = lexi_cast<double>(d1->getText());}  
-        | d2:NUM_DOUBLE {dval = lexi_cast<double>(d2->getText());} 
+floatConst returns [RealType dval]
+        : d1:NUM_FLOAT {dval = lexi_cast<RealType>(d1->getText());}  
+        | d2:NUM_DOUBLE {dval = lexi_cast<RealType>(d2->getText());} 
         ;