diff options
author | David Walter Seikel | 2012-01-23 21:08:36 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 21:08:36 +1000 |
commit | 6bb5fed5a7bbf2208bdd8f16e362070f56c513f5 (patch) | |
tree | ff528714b591f1da24ea21c3c4a1ec744152ff7c | |
parent | Document the new parser conflict. (diff) | |
download | SledjHamr-6bb5fed5a7bbf2208bdd8f16e362070f56c513f5.zip SledjHamr-6bb5fed5a7bbf2208bdd8f16e362070f56c513f5.tar.gz SledjHamr-6bb5fed5a7bbf2208bdd8f16e362070f56c513f5.tar.bz2 SledjHamr-6bb5fed5a7bbf2208bdd8f16e362070f56c513f5.tar.xz |
Remove the conflict, and the comment. lol
-rw-r--r-- | LuaSL/src/LuaSL_lemon_yaccer.y | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/src/LuaSL_lemon_yaccer.y index 5995cab..42b02c7 100644 --- a/LuaSL/src/LuaSL_lemon_yaccer.y +++ b/LuaSL/src/LuaSL_lemon_yaccer.y | |||
@@ -196,8 +196,6 @@ expr(A) ::= LSL_INTEGER(B). { B->basicType = OT_integer; A = B; } | |||
196 | expr(A) ::= LSL_KEY(B). { B->basicType = OT_key; A = B; } | 196 | expr(A) ::= LSL_KEY(B). { B->basicType = OT_key; A = B; } |
197 | %nonassoc LSL_LIST. | 197 | %nonassoc LSL_LIST. |
198 | expr(A) ::= LSL_BRACKET_OPEN(B) exprList LSL_BRACKET_CLOSE. [LSL_BRACKET_OPEN] { B->basicType = OT_list; A = B; } // Probably need a specific addList(). | 198 | expr(A) ::= LSL_BRACKET_OPEN(B) exprList LSL_BRACKET_CLOSE. [LSL_BRACKET_OPEN] { B->basicType = OT_list; A = B; } // Probably need a specific addList(). |
199 | // This causes a parsing conflict. How? | ||
200 | expr(A) ::= LSL_BRACKET_OPEN(B) LSL_BRACKET_CLOSE. [LSL_BRACKET_OPEN] { B->basicType = OT_list; A = B; } | ||
201 | %nonassoc LSL_ROTATION. | 199 | %nonassoc LSL_ROTATION. |
202 | // Uses the same symbol for less than, greater than, and the rotation / vector delimiters. | 200 | // Uses the same symbol for less than, greater than, and the rotation / vector delimiters. |
203 | expr ::= LSL_LESS_THAN expr LSL_COMMA expr LSL_COMMA expr LSL_COMMA expr LSL_GREATER_THAN. [LSL_ANGLE_OPEN] | 201 | expr ::= LSL_LESS_THAN expr LSL_COMMA expr LSL_COMMA expr LSL_COMMA expr LSL_GREATER_THAN. [LSL_ANGLE_OPEN] |