| 102 |
|
const static int endofline = 9; |
| 103 |
|
const static int endofstatement = 10; |
| 104 |
|
|
| 105 |
< |
const static int command = (1 << 8); |
| 106 |
< |
const static int expressionCommand = (1 << 9); // expression command |
| 107 |
< |
const static int expression = (1 << 10); /// expression term |
| 105 |
> |
const static int command = (1 << 11); |
| 106 |
> |
const static int expressionCommand = (1 << 12); // expression command |
| 107 |
> |
const static int expression = (1 << 13); /// expression term |
| 108 |
|
|
| 109 |
|
// generally, the minus sign is used to denote atom ranges |
| 110 |
|
// this property is used for the few commands which allow negative integers |
| 111 |
< |
const static int negnums = (1 << 11); |
| 111 |
> |
const static int negnums = (1 << 14); |
| 112 |
|
|
| 113 |
|
//expression involves coordinates which will change every frame, such as withins |
| 114 |
< |
const static int dynamic = (1 << 12); |
| 114 |
> |
const static int dynamic = (1 << 15); |
| 115 |
|
|
| 116 |
|
// every property is also valid in an expression context |
| 117 |
< |
const static int atomproperty = (1 << 12) | expression | negnums; |
| 117 |
> |
const static int atomproperty = (1 << 16) | expression | negnums; |
| 118 |
|
// every predefined is also valid in an expression context |
| 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 |
< |
const static int index = (1 << 16) | expression; |
| 119 |
> |
const static int comparator = (1 << 17) | expression; |
| 120 |
> |
const static int predefinedset = (1 << 18) | expression; |
| 121 |
> |
const static int embeddedExpression= (1 << 19); // embedded expression |
| 122 |
> |
const static int index = (1 << 20) | expression; |
| 123 |
|
// rasmol commands |
| 124 |
|
const static int define = command | expressionCommand |1; |
| 125 |
|
const static int select = command |expressionCommand |2 ; |
| 153 |
|
const static int x = atomproperty | dynamic | 2; |
| 154 |
|
const static int y = atomproperty | dynamic | 3; |
| 155 |
|
const static int z = atomproperty | dynamic | 4; |
| 156 |
+ |
const static int r = atomproperty | dynamic | 5; |
| 157 |
|
|
| 158 |
< |
const static int opGT = comparator | 0; |
| 159 |
< |
const static int opGE = comparator | 1; |
| 160 |
< |
const static int opLE = comparator | 2; |
| 161 |
< |
const static int opLT = comparator | 3; |
| 162 |
< |
const static int opEQ = comparator | 4; |
| 163 |
< |
const static int opNE = comparator | 5; |
| 158 |
> |
const static int opGT = comparator | dynamic | 0; |
| 159 |
> |
const static int opGE = comparator | dynamic | 1; |
| 160 |
> |
const static int opLE = comparator | dynamic | 2; |
| 161 |
> |
const static int opLT = comparator | dynamic | 3; |
| 162 |
> |
const static int opEQ = comparator | dynamic | 4; |
| 163 |
> |
const static int opNE = comparator | dynamic | 5; |
| 164 |
|
|
| 165 |
|
static Token tokenExpressionBegin; |
| 166 |
|
static Token tokenExpressionEnd; |
