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

Comparing trunk/src/mdParser/MDTreeParser.hpp (file contents):
Revision 2040 by gezelter, Thu Nov 13 17:49:44 2014 UTC vs.
Revision 2046 by gezelter, Tue Dec 2 22:11:04 2014 UTC

# Line 19 | Line 19 | class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
19   {
20   #line 21 "MDTreeParser.g"
21  
22 <  public:
22 >    public:
23      Globals* walkTree(ANTLR_USE_NAMESPACE(antlr)RefAST tree)
24      {
25 <      currConf = new Globals;
26 <      blockStack.push(currConf);
27 <      mdfile(tree);
28 <      return currConf;
25 >        currConf = new Globals;
26 >        blockStack.push(currConf);
27 >        mdfile(tree);
28 >        return currConf;
29      }
30 <  private:
30 >    private:
31      Globals* currConf;
32      stack<DataHolder*> blockStack;    
33   #line 22 "MDTreeParser.hpp"
# Line 74 | Line 74 | class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
74          public: void fragmentblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
75          public: void constraintblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
76          public: void atomstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
77 +        protected: RealType  doubleNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
78          public: void bondstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
79          public: vector<int>  inttuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
80          public: void bendstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
# Line 83 | Line 84 | class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
84          public: void cutoffgroupstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
85          public: void fragmentstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
86          public: void constraintstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
86 –        protected: RealType  doubleNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
87   public:
88          ANTLR_USE_NAMESPACE(antlr)RefAST getAST()
89          {
# Line 96 | Line 96 | class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
96   private:
97          static const char* tokenNames[];
98   #ifndef NO_STATIC_CONSTS
99 <        static const int NUM_TOKENS = 60;
99 >        static const int NUM_TOKENS = 78;
100   #else
101          enum {
102 <                NUM_TOKENS = 60
102 >                NUM_TOKENS = 78
103          };
104   #endif
105          
# Line 107 | Line 107 | class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
107          static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_0;
108          static const unsigned long _tokenSet_1_data_[];
109          static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_1;
110 +        static const unsigned long _tokenSet_2_data_[];
111 +        static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_2;
112 +        static const unsigned long _tokenSet_3_data_[];
113 +        static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_3;
114 +        static const unsigned long _tokenSet_4_data_[];
115 +        static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4;
116 +        static const unsigned long _tokenSet_5_data_[];
117 +        static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_5;
118 +        static const unsigned long _tokenSet_6_data_[];
119 +        static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_6;
120   };
121  
122   #endif /*INC_MDTreeParser_hpp_*/

Diff Legend

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