diff options
author | David Walter Seikel | 2012-01-12 23:49:29 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-12 23:49:29 +1000 |
commit | 9256c5252ed5e7bc8ce32128083c6f5eb548de02 (patch) | |
tree | 8ef49b4e4c9def0266ef69995a55d303a8afc2c6 /LuaSL/src/LuaSL_lemon_yaccer.y | |
parent | Move and comment the lemon syntax error stuff. (diff) | |
download | SledjHamr-9256c5252ed5e7bc8ce32128083c6f5eb548de02.zip SledjHamr-9256c5252ed5e7bc8ce32128083c6f5eb548de02.tar.gz SledjHamr-9256c5252ed5e7bc8ce32128083c6f5eb548de02.tar.bz2 SledjHamr-9256c5252ed5e7bc8ce32128083c6f5eb548de02.tar.xz |
Change the order of conditionals, with more comments. Resort the upper tag types.
Diffstat (limited to 'LuaSL/src/LuaSL_lemon_yaccer.y')
-rw-r--r-- | LuaSL/src/LuaSL_lemon_yaccer.y | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/src/LuaSL_lemon_yaccer.y index 731a52d..bd0aa52 100644 --- a/LuaSL/src/LuaSL_lemon_yaccer.y +++ b/LuaSL/src/LuaSL_lemon_yaccer.y | |||
@@ -13,10 +13,9 @@ | |||
13 | 13 | ||
14 | program ::= script LSL_SCRIPT(A). { A->left = param->ast; param->ast = A; } // Lemon does not like the start symbol to be on the RHS, so give it a dummy one. | 14 | program ::= script LSL_SCRIPT(A). { A->left = param->ast; param->ast = A; } // Lemon does not like the start symbol to be on the RHS, so give it a dummy one. |
15 | 15 | ||
16 | 16 | %right LSL_BOOL_AND. | |
17 | %left LSL_BOOL_AND. | ||
18 | expr(A) ::= expr(B) LSL_BOOL_AND(C) expr(D). { A = addOperation(B, C, D); } | 17 | expr(A) ::= expr(B) LSL_BOOL_AND(C) expr(D). { A = addOperation(B, C, D); } |
19 | %left LSL_BOOL_OR. | 18 | %right LSL_BOOL_OR. |
20 | expr(A) ::= expr(B) LSL_BOOL_OR(C) expr(D). { A = addOperation(B, C, D); } | 19 | expr(A) ::= expr(B) LSL_BOOL_OR(C) expr(D). { A = addOperation(B, C, D); } |
21 | 20 | ||
22 | %left LSL_BIT_AND LSL_BIT_XOR LSL_BIT_OR. | 21 | %left LSL_BIT_AND LSL_BIT_XOR LSL_BIT_OR. |
@@ -24,10 +23,10 @@ expr(A) ::= expr(B) LSL_BIT_OR(C) expr(D). { A = addOperation(B, C, D); } | |||
24 | expr(A) ::= expr(B) LSL_BIT_XOR(C) expr(D). { A = addOperation(B, C, D); } | 23 | expr(A) ::= expr(B) LSL_BIT_XOR(C) expr(D). { A = addOperation(B, C, D); } |
25 | expr(A) ::= expr(B) LSL_BIT_AND(C) expr(D). { A = addOperation(B, C, D); } | 24 | expr(A) ::= expr(B) LSL_BIT_AND(C) expr(D). { A = addOperation(B, C, D); } |
26 | 25 | ||
27 | %left LSL_EQUAL LSL_NOT_EQUAL. | 26 | %right LSL_EQUAL LSL_NOT_EQUAL. |
28 | expr(A) ::= expr(B) LSL_NOT_EQUAL(C) expr(D). { A = addOperation(B, C, D); } | 27 | expr(A) ::= expr(B) LSL_NOT_EQUAL(C) expr(D). { A = addOperation(B, C, D); } |
29 | expr(A) ::= expr(B) LSL_EQUAL(C) expr(D). { A = addOperation(B, C, D); } | 28 | expr(A) ::= expr(B) LSL_EQUAL(C) expr(D). { A = addOperation(B, C, D); } |
30 | %left LSL_LESS_THAN LSL_GREATER_THAN LSL_LESS_EQUAL LSL_GREATER_EQUAL. | 29 | %right LSL_LESS_THAN LSL_GREATER_THAN LSL_LESS_EQUAL LSL_GREATER_EQUAL. |
31 | expr(A) ::= expr(B) LSL_GREATER_EQUAL(C) expr(D). { A = addOperation(B, C, D); } | 30 | expr(A) ::= expr(B) LSL_GREATER_EQUAL(C) expr(D). { A = addOperation(B, C, D); } |
32 | expr(A) ::= expr(B) LSL_LESS_EQUAL(C) expr(D). { A = addOperation(B, C, D); } | 31 | expr(A) ::= expr(B) LSL_LESS_EQUAL(C) expr(D). { A = addOperation(B, C, D); } |
33 | expr(A) ::= expr(B) LSL_GREATER_THAN(C) expr(D). { A = addOperation(B, C, D); } | 32 | expr(A) ::= expr(B) LSL_GREATER_THAN(C) expr(D). { A = addOperation(B, C, D); } |
@@ -75,10 +74,12 @@ expr(A) ::= LSL_INTEGER(B). { A = B; } | |||
75 | %nonassoc LSL_STATEMENT. | 74 | %nonassoc LSL_STATEMENT. |
76 | statement(A) ::= expr(B) LSL_STATEMENT(D). { A = addStatement(D, LSL_EXPRESSION, B); } | 75 | statement(A) ::= expr(B) LSL_STATEMENT(D). { A = addStatement(D, LSL_EXPRESSION, B); } |
77 | 76 | ||
78 | %nonassoc LSL_SPACE LSL_COMMENT LSL_COMMENT_LINE LSL_IDENTIFIER LSL_SCRIPT LSL_UNKNOWN. | 77 | %nonassoc LSL_IDENTIFIER LSL_SCRIPT. |
79 | script ::= script statement(A). { A->left = param->ast; param->ast = A; } | 78 | script ::= script statement(A). { A->left = param->ast; param->ast = A; } |
80 | script ::= statement(A). { A->left = param->ast; param->ast = A; } | 79 | script ::= statement(A). { A->left = param->ast; param->ast = A; } |
81 | 80 | ||
81 | %nonassoc LSL_SPACE LSL_COMMENT LSL_COMMENT_LINE LSL_UNKNOWN. | ||
82 | |||
82 | 83 | ||
83 | %parse_accept {printf("Parsing complete.\n");} | 84 | %parse_accept {printf("Parsing complete.\n");} |
84 | 85 | ||