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

Comparing trunk/src/selection/Token.hpp (file contents):
Revision 288 by tim, Fri Feb 4 22:39:26 2005 UTC vs.
Revision 452 by tim, Tue Apr 5 23:09:48 2005 UTC

# Line 119 | Line 119 | class Token {
119          const static int comparator        = (1 << 13) | expression;
120          const static int predefinedset     = (1 << 14) | expression;
121          const  static int embeddedExpression= (1 << 15); // embedded expression
122 <        
122 >        const static int index = (1 << 16) | expression;
123          // rasmol commands
124          const static int define       = command | expressionCommand |1;
125          const static int select       = command |expressionCommand |2 ;
# 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 <
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
# Line 150 | Line 149 | class Token {
149  
150          const static int mass         = atomproperty | 0;
151          const static int charge       = atomproperty | 1;
153 –        const static int dipole       = atomproperty | 2;
152          
153          const static int opGT         = comparator |  0;
154          const static int opGE         = comparator |  1;

Diff Legend

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