opal · Nov 17, 2013
diff --git a/Diff for: ‎lib/opal/parser/grammar.rb
+1,628-1,644 b/Diff for: ‎lib/opal/parser/grammar.rb
+1,628-1,644
diff --git a/Diff for: ‎lib/opal/parser/grammar.y
+13-15 b/Diff for: ‎lib/opal/parser/grammar.y
+13-15
@@ -702,7 +702,7 @@ rule
                     {
                       result = val[1]
                     }
-                | none_block_pass
+                | # none
                     {
                       result = nil
                     }
@@ -1518,7 +1518,14 @@ xstring_contents: none
                       result = s(:args)
                     }
 
-      f_norm_arg: tCONSTANT
+      f_norm_arg: f_bad_arg
+                | tIDENTIFIER
+                    {
+                      result = val[0].intern
+                      scope.add_local result
+                    }
+
+       f_bad_arg: tCONSTANT
                     {
                       raise 'formal argument cannot be a constant'
                     }
@@ -1534,11 +1541,6 @@ xstring_contents: none
                     {
                       raise 'formal argument cannot be a global variable'
                     }
-                | tIDENTIFIER
-                    {
-                      result = val[0].intern
-                      scope.add_local result
-                    }
 
       f_arg_item: f_norm_arg
                     {
@@ -1634,18 +1636,14 @@ xstring_contents: none
                       result = val[1]
                     }
 
-      assoc_list: none
+      assoc_list: # none
                     {
                       result = []
                     }
                 | assocs trailer
                     {
                       result = val[0]
                     }
-                | args trailer
-                    {
-                      raise "unsupported assoc list type (#@line_number)"
-                    }
 
           assocs: assoc
                     {
@@ -1698,9 +1696,9 @@ xstring_contents: none
                 | terms tSEMI
 
             none: # none
-
- none_block_pass: # none
-
+                    {
+                      result = nil
+                    }
 end
 
 ---- inner
Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,7 @@ rule`
`702`	`702`	`{`
`703`	`703`	`result = val[1]`
`704`	`704`	`}`
`705`		`- \| none_block_pass`
	`705`	`+ \| # none`
`706`	`706`	`{`
`707`	`707`	`result = nil`
`708`	`708`	`}`
`@@ -1518,7 +1518,14 @@ xstring_contents: none`
`1518`	`1518`	`result = s(:args)`
`1519`	`1519`	`}`
`1520`	`1520`
`1521`		`- f_norm_arg: tCONSTANT`
	`1521`	`+ f_norm_arg: f_bad_arg`
	`1522`	`+ \| tIDENTIFIER`
	`1523`	`+ {`
	`1524`	`+ result = val[0].intern`
	`1525`	`+ scope.add_local result`
	`1526`	`+ }`
	`1527`	`+`
	`1528`	`+ f_bad_arg: tCONSTANT`
`1522`	`1529`	`{`
`1523`	`1530`	`raise 'formal argument cannot be a constant'`
`1524`	`1531`	`}`
`@@ -1534,11 +1541,6 @@ xstring_contents: none`
`1534`	`1541`	`{`
`1535`	`1542`	`raise 'formal argument cannot be a global variable'`
`1536`	`1543`	`}`
`1537`		`- \| tIDENTIFIER`
`1538`		`- {`
`1539`		`- result = val[0].intern`
`1540`		`- scope.add_local result`
`1541`		`- }`
`1542`	`1544`
`1543`	`1545`	`f_arg_item: f_norm_arg`
`1544`	`1546`	`{`
`@@ -1634,18 +1636,14 @@ xstring_contents: none`
`1634`	`1636`	`result = val[1]`
`1635`	`1637`	`}`
`1636`	`1638`
`1637`		`- assoc_list: none`
	`1639`	`+ assoc_list: # none`
`1638`	`1640`	`{`
`1639`	`1641`	`result = []`
`1640`	`1642`	`}`
`1641`	`1643`	`\| assocs trailer`
`1642`	`1644`	`{`
`1643`	`1645`	`result = val[0]`
`1644`	`1646`	`}`
`1645`		`- \| args trailer`
`1646`		`- {`
`1647`		`- raise "unsupported assoc list type (#@line_number)"`
`1648`		`- }`
`1649`	`1647`
`1650`	`1648`	`assocs: assoc`
`1651`	`1649`	`{`
`@@ -1698,9 +1696,9 @@ xstring_contents: none`
`1698`	`1696`	`\| terms tSEMI`
`1699`	`1697`
`1700`	`1698`	`none: # none`
`1701`		`-`
`1702`		`- none_block_pass: # none`
`1703`		`-`
	`1699`	`+ {`
	`1700`	`+ result = nil`
	`1701`	`+ }`
`1704`	`1702`	`end`
`1705`	`1703`
`1706`	`1704`	`---- inner`