diff options
author | David Walter Seikel | 2012-01-08 20:22:30 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-08 20:22:30 +1000 |
commit | aee5a20afb25260a8997d16f82cce0e71a41ebe1 (patch) | |
tree | ff9fbc9a4243dd44f9a3ac4e69215dfc0083aa8b /LuaSL/src/LuaSL_LSL_tree.c | |
parent | Apparently order of these ALSO sets precedence. shrugs (diff) | |
download | SledjHamr-aee5a20afb25260a8997d16f82cce0e71a41ebe1.zip SledjHamr-aee5a20afb25260a8997d16f82cce0e71a41ebe1.tar.gz SledjHamr-aee5a20afb25260a8997d16f82cce0e71a41ebe1.tar.bz2 SledjHamr-aee5a20afb25260a8997d16f82cce0e71a41ebe1.tar.xz |
Bite the bullet and get rid of my dreams to use enums, yacc insists on #defines.
Diffstat (limited to 'LuaSL/src/LuaSL_LSL_tree.c')
-rw-r--r-- | LuaSL/src/LuaSL_LSL_tree.c | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/LuaSL/src/LuaSL_LSL_tree.c b/LuaSL/src/LuaSL_LSL_tree.c index cc9007c..11a481d 100644 --- a/LuaSL/src/LuaSL_LSL_tree.c +++ b/LuaSL/src/LuaSL_LSL_tree.c | |||
@@ -272,44 +272,38 @@ static void evaluateOperationToken(LSL_Leaf *content, LSL_Value *left, LSL_Value | |||
272 | 272 | ||
273 | switch (content->operationValue) | 273 | switch (content->operationValue) |
274 | { | 274 | { |
275 | #ifdef LUASL_USE_ENUM | 275 | // case LSL_COMMA : |
276 | case LSL_COMMA : | 276 | // case LSL_INCREMENT_PRE : |
277 | case LSL_INCREMENT_PRE : | 277 | // case LSL_INCREMENT_POST : |
278 | case LSL_INCREMENT_POST : | 278 | // case LSL_DECREMENT_PRE : |
279 | case LSL_DECREMENT_PRE : | 279 | // case LSL_DECREMENT_POST : |
280 | case LSL_DECREMENT_POST : | 280 | // case LSL_DOT : |
281 | case LSL_DOT : | 281 | // case LSL_ASSIGNMENT_PLAIN : |
282 | case LSL_ASSIGNMENT_PLAIN : | 282 | // case LSL_ASSIGNMENT_DIVIDE : |
283 | case LSL_ASSIGNMENT_DIVIDE : | 283 | // case LSL_ASSIGNMENT_MODULO : |
284 | case LSL_ASSIGNMENT_MODULO : | 284 | // case LSL_ASSIGNMENT_MULTIPLY : |
285 | case LSL_ASSIGNMENT_MULTIPLY : | 285 | // case LSL_ASSIGNMENT_SUBTRACT : |
286 | case LSL_ASSIGNMENT_SUBTRACT : | 286 | // case LSL_ASSIGNMENT_ADD : |
287 | case LSL_ASSIGNMENT_ADD : | 287 | // case LSL_ASSIGNMENT_CONCATENATE : |
288 | case LSL_ASSIGNMENT_CONCATENATE : | 288 | // case LSL_PARENTHESIS_OPEN : |
289 | case LSL_PARENTHESIS_OPEN : | 289 | // case LSL_PARENTHESIS_CLOSE : |
290 | case LSL_PARENTHESIS_CLOSE : | 290 | // case LSL_BRACKET_OPEN : |
291 | case LSL_BRACKET_OPEN : | 291 | // case LSL_BRACKET_CLOSE : |
292 | case LSL_BRACKET_CLOSE : | 292 | // case LSL_ANGLE_OPEN : |
293 | case LSL_ANGLE_OPEN : | 293 | // case LSL_ANGLE_CLOSE : |
294 | case LSL_ANGLE_CLOSE : | 294 | // case LSL_TYPECAST : |
295 | case LSL_TYPECAST : | 295 | // break; |
296 | break; | ||
297 | #endif | ||
298 | case LSL_BIT_NOT : left->content.integerValue = ~ right->content.integerValue; break; | 296 | case LSL_BIT_NOT : left->content.integerValue = ~ right->content.integerValue; break; |
299 | case LSL_BOOL_NOT : left->content.integerValue = ! right->content.integerValue; break; | 297 | case LSL_BOOL_NOT : left->content.integerValue = ! right->content.integerValue; break; |
300 | case LSL_NEGATION : left->content.integerValue = 0 - right->content.integerValue; break; | 298 | case LSL_NEGATION : left->content.integerValue = 0 - right->content.integerValue; break; |
301 | case LSL_DIVIDE : left->content.integerValue = left->content.integerValue / right->content.integerValue; break; | 299 | case LSL_DIVIDE : left->content.integerValue = left->content.integerValue / right->content.integerValue; break; |
302 | case LSL_MODULO : left->content.integerValue = left->content.integerValue % right->content.integerValue; break; | 300 | case LSL_MODULO : left->content.integerValue = left->content.integerValue % right->content.integerValue; break; |
303 | case LSL_MULTIPLY : left->content.integerValue = left->content.integerValue * right->content.integerValue; break; | 301 | case LSL_MULTIPLY : left->content.integerValue = left->content.integerValue * right->content.integerValue; break; |
304 | #ifdef LUASL_USE_ENUM | 302 | // case LSL_DOT_PRODUCT : break; |
305 | case LSL_DOT_PRODUCT : break; | 303 | // case LSL_CROSS_PRODUCT : break; |
306 | case LSL_CROSS_PRODUCT : break; | ||
307 | #endif | ||
308 | case LSL_SUBTRACT : left->content.integerValue = left->content.integerValue - right->content.integerValue; break; | 304 | case LSL_SUBTRACT : left->content.integerValue = left->content.integerValue - right->content.integerValue; break; |
309 | case LSL_ADD : left->content.integerValue = left->content.integerValue + right->content.integerValue; break; | 305 | case LSL_ADD : left->content.integerValue = left->content.integerValue + right->content.integerValue; break; |
310 | #ifdef LUASL_USE_ENUM | 306 | // case LSL_CONCATENATE : break; |
311 | case LSL_CONCATENATE : break; | ||
312 | #endif | ||
313 | case LSL_LEFT_SHIFT : left->content.integerValue = left->content.integerValue << right->content.integerValue; break; | 307 | case LSL_LEFT_SHIFT : left->content.integerValue = left->content.integerValue << right->content.integerValue; break; |
314 | case LSL_RIGHT_SHIFT : left->content.integerValue = left->content.integerValue >> right->content.integerValue; break; | 308 | case LSL_RIGHT_SHIFT : left->content.integerValue = left->content.integerValue >> right->content.integerValue; break; |
315 | case LSL_LESS_THAN : left->content.integerValue = left->content.integerValue < right->content.integerValue; break; | 309 | case LSL_LESS_THAN : left->content.integerValue = left->content.integerValue < right->content.integerValue; break; |