ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/mdParser/MDTreeParser.g
(Generate patch)

Comparing:
trunk/src/mdParser/MDTreeParser.g (file contents), Revision 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC vs.
branches/development/src/mdParser/MDTreeParser.g (file contents), Revision 1731 by gezelter, Thu May 31 12:25:30 2012 UTC

# Line 4 | Line 4 | using namespace std;
4   #include "io/Globals.hpp"
5   #include "utils/StringUtils.hpp"
6   using namespace std;
7 < using namespace oopse;
7 > using namespace OpenMD;
8   }
9   options
10    {
# Line 15 | Line 15 | options
15  
16   options
17   {
18 <        k = 3;
18 >        k = 1;
19          importVocab = MD;
20   }
21   {
# Line 35 | Line 35 | statement : assignment
35          ;
36  
37   statement : assignment
38 <          | componentblock
39 <          | moleculeblock
40 <          | zconstraintblock
41 <          ;
42 <
38 >    | componentblock
39 >    | moleculeblock
40 >    | zconstraintblock
41 >    | restraintblock
42 >    | flucqblock
43 >    | rnemdblock
44 >    ;
45  
46   assignment  : #(ASSIGNEQUAL id:ID constant[#id]) //{blockStack.top()->assign(#ID->getText(),);}
47              ;
# Line 68 | Line 70 | zconstraintblock  : #(ZCONSTRAINT {ZConsStamp* currZCo
70                          (assignment)*
71                           ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addZConsStamp(currZConsStamp);}
72                    ;
73 +
74 + restraintblock  : #(RESTRAINT {RestraintStamp* currRestraintStamp = new RestraintStamp(); blockStack.push(currRestraintStamp);}
75 +                        (assignment)*
76 +                         ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRestraintStamp(currRestraintStamp);}
77 +                  ;
78    
79 + flucqblock  : #(FLUCQ  {FluctuatingChargeParameters* flucQpars = new FluctuatingChargeParameters(); blockStack.push(flucQpars);}
80 +                      (assignment)*
81 +                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addFluctuatingChargeParameters(flucQpars);}
82 +                ;
83 +
84 + rnemdblock  : #(RNEMD  {RNEMDParameters* rnemdPars = new RNEMDParameters(); blockStack.push(rnemdPars);}
85 +                      (assignment)*
86 +                       ENDBLOCK ) {blockStack.top()->validate();blockStack.pop(); currConf->addRNEMDParameters(rnemdPars);}
87 +                ;
88 +
89 +
90   moleculeblock : #(MOLECULE {MoleculeStamp* currMoleculeStamp = new MoleculeStamp(); blockStack.push(currMoleculeStamp);}
91                      (moleculestatement)*
92                       ENDBLOCK ) {blockStack.top()->validate(); blockStack.pop(); currConf->addMoleculeStamp(currMoleculeStamp);}

Comparing:
trunk/src/mdParser/MDTreeParser.g (property svn:keywords), Revision 1275 by cli2, Fri Jul 4 20:54:29 2008 UTC vs.
branches/development/src/mdParser/MDTreeParser.g (property svn:keywords), Revision 1731 by gezelter, Thu May 31 12:25:30 2012 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines