| 103 |
|
const static int endofline = 9; |
| 104 |
|
const static int endofstatement = 10; |
| 105 |
|
|
| 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 |
| 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 |
| 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 << 14); |
| 112 |
> |
const static int negnums = (1 << 11); |
| 113 |
|
|
| 114 |
|
//expression involves coordinates which will change every frame, such as withins |
| 115 |
< |
const static int dynamic = (1 << 15); |
| 115 |
> |
const static int dynamic = (1 << 12); |
| 116 |
|
|
| 117 |
|
// every property is also valid in an expression context |
| 118 |
< |
const static int atomproperty = (1 << 16) | expression | negnums; |
| 118 |
> |
const static int atomproperty = (1 << 12) | expression | negnums; |
| 119 |
|
// every predefined is also valid in an expression context |
| 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; |
| 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; |
| 124 |
|
// rasmol commands |
| 125 |
|
const static int define = command | expressionCommand | 1; |
| 126 |
|
const static int select = command | expressionCommand | 2 ; |
