From 6bb5fed5a7bbf2208bdd8f16e362070f56c513f5 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 23 Jan 2012 21:08:36 +1000
Subject: Remove the conflict, and the comment.  lol

---
 LuaSL/src/LuaSL_lemon_yaccer.y | 2 --
 1 file changed, 2 deletions(-)

(limited to 'LuaSL/src/LuaSL_lemon_yaccer.y')

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; }
 expr(A) ::= LSL_KEY(B).								{ B->basicType = OT_key; A = B; }
 %nonassoc  LSL_LIST.
 expr(A) ::= LSL_BRACKET_OPEN(B) exprList LSL_BRACKET_CLOSE.	[LSL_BRACKET_OPEN]	{ B->basicType = OT_list; A = B; }	// Probably need a specific addList().
-// This causes a parsing conflict.  How?
-expr(A) ::= LSL_BRACKET_OPEN(B) LSL_BRACKET_CLOSE.		[LSL_BRACKET_OPEN]	{ B->basicType = OT_list; A = B; }
 %nonassoc  LSL_ROTATION.
 // Uses the same symbol for less than, greater than, and the rotation / vector delimiters.
 expr ::= LSL_LESS_THAN expr LSL_COMMA expr LSL_COMMA expr LSL_COMMA expr LSL_GREATER_THAN.	[LSL_ANGLE_OPEN]
-- 
cgit v1.1