| 36 |  | * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). | 
| 37 |  | * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). | 
| 38 |  | * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). | 
| 39 | < | * [4]  Vardeman & Gezelter, in progress (2009). | 
| 39 | > | * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010). | 
| 40 | > | * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). | 
| 41 |  | */ | 
| 42 |  |  | 
| 43 |  | #ifndef SELECTION_TOKEN_HPP | 
| 103 |  | const static int endofline         = 9; | 
| 104 |  | const static int endofstatement    = 10; | 
| 105 |  |  | 
| 106 | < | const static int command           = (1 <<  8); | 
| 107 | < | const static int expressionCommand = (1 <<  9); // expression command | 
| 108 | < | const static int expression        = (1 << 10); /// expression term | 
| 106 | > | const static int command           = (1 <<  11); | 
| 107 | > | const static int expressionCommand = (1 <<  12); // expression command | 
| 108 | > | const static int expression        = (1 << 13); /// expression term | 
| 109 |  |  | 
| 110 |  | // generally, the minus sign is used to denote atom ranges | 
| 111 |  | // this property is used for the few commands which allow negative integers | 
| 112 | < | const static int negnums      = (1 << 11); | 
| 112 | > | const static int negnums      = (1 << 14); | 
| 113 |  |  | 
| 114 |  | //expression involves coordinates which will change every frame, such as withins | 
| 115 | < | const static int dynamic        = (1 << 12); | 
| 115 | > | const static int dynamic        = (1 << 15); | 
| 116 |  |  | 
| 117 |  | // every property is also valid in an expression context | 
| 118 | < | const static int atomproperty      = (1 << 12) | expression | negnums; | 
| 118 | > | const static int atomproperty      = (1 << 16) | expression | negnums; | 
| 119 |  | // every predefined is also valid in an expression context | 
| 120 | < | const static int comparator        = (1 << 13) | expression; | 
| 121 | < | const static int predefinedset     = (1 << 14) | expression; | 
| 122 | < | const  static int embeddedExpression= (1 << 15); // embedded expression | 
| 123 | < | const static int index = (1 << 16) | expression; | 
| 120 | > | const static int comparator        = (1 << 17) | expression; | 
| 121 | > | const static int predefinedset     = (1 << 18) | expression; | 
| 122 | > | const  static int embeddedExpression= (1 << 19); // embedded expression | 
| 123 | > | const static int index = (1 << 20) | expression; | 
| 124 |  | // rasmol commands | 
| 125 |  | const static int define       = command | expressionCommand |1; | 
| 126 |  | const static int select       = command |expressionCommand |2 ; | 
| 131 |  | // atom expression operators | 
| 132 |  | const static int leftparen    = expression |  0; | 
| 133 |  | const static int rightparen   = expression |  1; | 
| 134 | < | const static int to           = expression | 2; | 
| 134 | > | const static int to           = expression |  2; | 
| 135 |  | const static int opAnd        = expression |  3; | 
| 136 |  | const static int opOr         = expression |  4; | 
| 137 |  | const static int opNot        = expression |  5; | 
| 141 |  | const static int all          = expression | 9 ; | 
| 142 |  | const static int none         = expression | 10; | 
| 143 |  | const static int name         = expression | 11; | 
| 144 | + | const static int hull         = expression | dynamic | 12; | 
| 145 | + |  | 
| 146 |  | // miguel 2005 01 01 | 
| 147 |  | // these are used to demark the beginning and end of expressions | 
| 148 |  | // they do not exist in the source code, but are emitted by the | 
| 155 |  | const static int x            = atomproperty | dynamic | 2; | 
| 156 |  | const static int y            = atomproperty | dynamic | 3; | 
| 157 |  | const static int z            = atomproperty | dynamic | 4; | 
| 158 | + | const static int r            = atomproperty | dynamic | 5; | 
| 159 |  |  | 
| 160 | < | const static int opGT         = comparator |  0; | 
| 161 | < | const static int opGE         = comparator |  1; | 
| 162 | < | const static int opLE         = comparator |  2; | 
| 163 | < | const static int opLT         = comparator |  3; | 
| 164 | < | const static int opEQ         = comparator |  4; | 
| 165 | < | const static int opNE         = comparator |  5; | 
| 160 | > | const static int opGT         = comparator |  dynamic | 0; | 
| 161 | > | const static int opGE         = comparator |  dynamic | 1; | 
| 162 | > | const static int opLE         = comparator |  dynamic | 2; | 
| 163 | > | const static int opLT         = comparator |  dynamic | 3; | 
| 164 | > | const static int opEQ         = comparator |  dynamic | 4; | 
| 165 | > | const static int opNE         = comparator |  dynamic | 5; | 
| 166 |  |  | 
| 167 |  | static Token tokenExpressionBegin; | 
| 168 |  | static Token tokenExpressionEnd; |