ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/selection/Token.hpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/selection/Token.hpp (file contents):
Revision 2116 by tim, Fri Mar 11 15:00:20 2005 UTC vs.
Revision 2160 by tim, Mon Apr 11 20:16:50 2005 UTC

# Line 70 | Line 70 | class Token {
70              *this = token;
71          }
72          
73 <        Token(int tok, int intValue, const boost::any& value) {
74 <            this->tok = tok;
75 <            this->intValue = intValue;
76 <            this->value = value;
73 >        Token(int MyTok, int myIntValue, const boost::any& myValue) {
74 >            this->tok = MyTok;
75 >            this->intValue = myIntValue;
76 >            this->value = myValue;
77          }
78  
79 <        Token(int tok, int intValue) {
80 <        this->tok = tok;
81 <        this->intValue = intValue;
79 >        Token(int myTok, int myIntValue) {
80 >        this->tok = myTok;
81 >        this->intValue = myIntValue;
82          }
83  
84 <        Token(int tok) {
85 <            this->tok = tok;
84 >        Token(int myTok) {
85 >            this->tok = myTok;
86          }
87  
88 <        Token(int tok,  const boost::any& value) {
89 <            this->tok = tok;
90 <            this->value = value;
88 >        Token(int myTok,  const boost::any& myValue) {
89 >            this->tok = myTok;
90 >            this->value = myValue;
91          }
92          
93          const static int nada              =  0;
# Line 130 | Line 130 | class Token {
130          // atom expression operators
131          const static int leftparen    = expression |  0;
132          const static int rightparen   = expression |  1;
133 <        const static int hyphen       = expression |  2;
133 >        const static int to                = expression | 2;
134          const static int opAnd        = expression |  3;
135          const static int opOr         = expression |  4;
136          const static int opNot        = expression |  5;
# Line 139 | Line 139 | class Token {
139          const static int dot          = expression | 8;
140          const static int all          = expression | 9 ;
141          const static int none      = expression | 10;
142 <        const static int name            =  expression |11;
143 <        const static int to                = expression | 12;
142 >        const static int name      = expression | 11;
143          // miguel 2005 01 01
144          // these are used to demark the beginning and end of expressions
145          // they do not exist in the source code, but are emitted by the

Diff Legend

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