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

Comparing trunk/src/mdParser/MDTreeParser.hpp (file contents):
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

# Line 56 | Line 56 | class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
56          public: void constant(ANTLR_USE_NAMESPACE(antlr)RefAST _t,
57                  ANTLR_USE_NAMESPACE(antlr)RefAST id
58          );
59 –        public: void signedIntOrFloat(ANTLR_USE_NAMESPACE(antlr)RefAST _t,
60 –                ANTLR_USE_NAMESPACE(antlr)RefAST id
61 –        );
59          protected: int  intConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
60 <        protected: double  floatConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
60 >        protected: RealType  floatConst(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
61          public: void moleculestatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
62          public: void atomblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
63          public: void bondblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
# Line 70 | Line 67 | class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
67          public: void cutoffgroupblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
68          public: void fragmentblock(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
69          public: void atomstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
70 <        public: vector<double>  signedNumberTuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
70 >        public: vector<RealType>  doubleNumberTuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
71          public: void bondstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
72          public: vector<int>  inttuple(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
73          public: void bendstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
# Line 78 | Line 75 | class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
75          public: void rigidbodystatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
76          public: void cutoffgroupstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
77          public: void fragmentstatement(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
78 <        protected: double  signedNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
78 >        protected: RealType  doubleNumber(ANTLR_USE_NAMESPACE(antlr)RefAST _t);
79   public:
80          ANTLR_USE_NAMESPACE(antlr)RefAST getAST()
81          {
# Line 91 | Line 88 | class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
88   private:
89          static const char* tokenNames[];
90   #ifndef NO_STATIC_CONSTS
91 <        static const int NUM_TOKENS = 56;
91 >        static const int NUM_TOKENS = 51;
92   #else
93          enum {
94 <                NUM_TOKENS = 56
94 >                NUM_TOKENS = 51
95          };
96   #endif
97          
# Line 102 | Line 99 | class CUSTOM_API MDTreeParser : public ANTLR_USE_NAMES
99          static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_0;
100          static const unsigned long _tokenSet_1_data_[];
101          static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_1;
105 –        static const unsigned long _tokenSet_2_data_[];
106 –        static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_2;
102   };
103  
104   #endif /*INC_MDTreeParser_hpp_*/

Diff Legend

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