Down to 90/29

txus · Jan 24, 2012 · b034f03 · b034f03
1 parent 68757ed
commit b034f03
Show file tree

Hide file tree

Showing 2 changed files with 331 additions and 394 deletions.
diff --git a/lib/noscript/parser/noscript.y b/lib/noscript/parser/noscript.y
@@ -98,21 +98,17 @@ rule
   ;
 
   Array:
-    '[' ArrayList ']' { result = ArrayLiteral.new(lineno, val[1]) }
+    '[]'              { p 'parsing empty array!'; result = ArrayLiteral.new(lineno, []) }
+  | '[' ArrayList ']' { result = ArrayLiteral.new(lineno, val[1]) }
   ;
 
   ArrayList:
     /* nothing */                  { result = [] }
-  | ArrayListElement               { result = [val[0]] }
-  | ArrayList "," ArrayListElement { result = val[0] += [val[2]] }
+  | Expression               { result = [val[0]] }
+  | ArrayList "," Expression { result = val[0] += [val[2]] }
   | ArrayList Newline              { result = val[0] }
   ;
 
-  ArrayListElement:
-    Expression                 { result = val[0] }
-  | Newline Expression         { result = val[1] }
-  ;
-
   Tuple:
     '{' TupleList '}' { result = HashLiteral.new(lineno, val[1].flatten) }
   | '{' TupleList Newline '}' { result = HashLiteral.new(lineno, val[1].flatten) }