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

Comparing trunk/src/selection/SelectionToken.hpp (file contents):
Revision 1359 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC

# Line 130 | Line 130 | namespace oopse {
130      // atom expression operators
131      const static int leftparen    = expression |  0;
132      const static int rightparen   = expression |  1;
133 <    const static int to                = 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 138 | Line 138 | namespace oopse {
138      const static int asterisk     = expression |  7;
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;
141 >    const static int none         = expression | 10;
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 149 | Line 149 | namespace oopse {
149  
150      const static int mass         = atomproperty | 0;
151      const static int charge       = atomproperty | 1;
152 +    const static int x            = atomproperty | dynamic | 2;
153 +    const static int y            = atomproperty | dynamic | 3;
154 +    const static int z            = atomproperty | dynamic | 4;
155          
156      const static int opGT         = comparator |  0;
157      const static int opGE         = comparator |  1;

Diff Legend

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