Fix block args merging into sexps

adambeynon · adambeynon · commit f931afd0223a · 2013-11-21T20:57:49.000Z
diff --git a/lib/opal/nodes/logic.rb b/lib/opal/nodes/logic.rb
@@ -148,7 +148,13 @@ class ReturnNode < Base
       children :value
 
       def return_val
-        expr_or_nil value
+        if value.nil?
+          expr(s(:nil))
+        elsif children.size > 1
+          expr(s(:array, *children))
+        else
+          expr(value)
+        end
       end
 
       def return_in_iter?
diff --git a/lib/opal/parser.rb b/lib/opal/parser.rb
@@ -56,7 +56,7 @@ def value(tok)
     end
 
     def source(tok)
-      tok[1]
+      tok ? tok[1] : nil
     end
 
     def new_nil(tok)
@@ -154,19 +154,18 @@ def new_compstmt(block)
 
     def new_body(compstmt, res, els, ens)
       s = compstmt || s(:block)
-      s.line = compstmt.line if compstmt
 
       if res
-        s = s(:rescue, s)
+        s = s(:rescue, [s])
         res.each { |r| s << r }
         s << els if els
       end
 
-      ens ? s(:ensure, s, ens) : s
+      ens ? s(:ensure, [s, ens]) : s
     end
 
     def new_def(kw, recv, name, args, body, end_tok)
-      body = s(:block, body) if body.type != :block
+      body = s(:block, [body]) if body.type != :block
       body << s(:nil) if body.size == 1
 
       s(:def, [recv, value(name).to_sym, args, body], source(kw))
@@ -276,13 +275,13 @@ def new_block_args(norm, opt, rest, block)
 
       if opt
         opt[1..-1].each do |_opt|
-          res << s(:lasgn, _opt[1])
+          res << s(:lasgn, [_opt[1]])
         end
       end
 
       if rest
         r = rest.to_s[1..-1].to_sym
-        res << s(:splat, s(:lasgn, r))
+        res << new_splat(nil, s(:lasgn, [r]))
         scope.add_local r
       end
 
@@ -330,6 +329,10 @@ def add_block_pass(arglist, block)
       arglist
     end
 
+    def new_block_pass(amper_tok, val)
+      s(:block_pass, [val], source(amper_tok))
+    end
+
     def new_splat(tok, value)
       s(:splat, [value], source(tok))
     end
diff --git a/lib/opal/parser/grammar.rb b/lib/opal/parser/grammar.rb
diff --git a/lib/opal/parser/grammar.y b/lib/opal/parser/grammar.y
@@ -73,7 +73,7 @@ rule
 
         bodystmt: compstmt opt_rescue opt_else opt_ensure
                     {
-                      result = new_body val[0], val[1], val[2], val[3]
+                      result = new_body(val[0], val[1], val[2], val[3])
                     }
 
         compstmt: stmts opt_terms
@@ -198,9 +198,7 @@ rule
                 | block_command
                 | kRETURN call_args
                     {
-                      args = val[1]
-                      args = args[1] if args.size == 2
-                      result = new_return(val[0], args)
+                      result = new_return(val[0], val[1])
                     }
                 | kBREAK call_args
                     {
@@ -627,7 +625,7 @@ rule
 
        call_args: command
                     {
-                      result = s(:array, val[0])
+                      result = [val[0]]
                     }
                 | args opt_block_arg
                     {
@@ -636,17 +634,17 @@ rule
                     }
                 | assocs opt_block_arg
                     {
-                      result = s(:arglist, s(:hash, *val[0]))
+                      result = [new_hash(nil, val[0], nil)]
                       add_block_pass result, val[1]
                     }
                 | args tCOMMA assocs opt_block_arg
                     {
                       result = val[0]
-                      result << s(:hash, *val[2])
+                      result << new_hash(nil, val[2], nil)
                     }
                 | block_arg
                     {
-                      result = s(:arglist)
+                      result = []
                       add_block_pass result, val[0]
                     }
 
@@ -674,7 +672,7 @@ rule
 
        block_arg: tAMPER arg_value
                     {
-                      result = s(:block_pass, val[1])
+                      result = new_block_pass(val[0], val[1])
                     }
 
    opt_block_arg: tCOMMA block_arg
@@ -985,7 +983,7 @@ rule
 
   f_block_optarg: f_block_opt
                     {
-                      result = s(:block, val[0])
+                      result = s(:block, [val[0]])
                     }
                 | f_block_optarg tCOMMA f_block_opt
                     {
@@ -995,7 +993,8 @@ rule
 
      f_block_opt: tIDENTIFIER tEQL primary_value
                     {
-                      result = new_assign new_assignable(s(:identifier, val[0].intern)), val[2]
+                      result = new_assign(new_assignable(new_ident(
+                                  val[0])), val[1], val[2])
                     }
 
    opt_block_var: none
@@ -1157,7 +1156,7 @@ opt_block_args_tail: tCOMMA block_args_tail
                     {
                       exc = val[1] || s(:array)
                       exc << new_assign(val[2], s(:gvar, '$!'.intern)) if val[2]
-                      result = [s(:resbody, exc, val[4])]
+                      result = [s(:resbody, [exc, val[4]])]
                       result.push val[5].first if val[5]
                     }
                 | # none
@@ -1167,7 +1166,7 @@ opt_block_args_tail: tCOMMA block_args_tail
 
         exc_list: arg_value
                     {
-                      result = s(:array, val[0])
+                      result = s(:array, [val[0]])
                     }
                 | mrhs
                 | none

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ rule`
`73`	`73`
`74`	`74`	`bodystmt: compstmt opt_rescue opt_else opt_ensure`
`75`	`75`	`{`
`76`		`- result = new_body val[0], val[1], val[2], val[3]`
	`76`	`+ result = new_body(val[0], val[1], val[2], val[3])`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`compstmt: stmts opt_terms`
`@@ -198,9 +198,7 @@ rule`
`198`	`198`	`\| block_command`
`199`	`199`	`\| kRETURN call_args`
`200`	`200`	`{`
`201`		`- args = val[1]`
`202`		`- args = args[1] if args.size == 2`
`203`		`- result = new_return(val[0], args)`
	`201`	`+ result = new_return(val[0], val[1])`
`204`	`202`	`}`
`205`	`203`	`\| kBREAK call_args`
`206`	`204`	`{`
`@@ -627,7 +625,7 @@ rule`
`627`	`625`
`628`	`626`	`call_args: command`
`629`	`627`	`{`
`630`		`- result = s(:array, val[0])`
	`628`	`+ result = [val[0]]`
`631`	`629`	`}`
`632`	`630`	`\| args opt_block_arg`
`633`	`631`	`{`
`@@ -636,17 +634,17 @@ rule`
`636`	`634`	`}`
`637`	`635`	`\| assocs opt_block_arg`
`638`	`636`	`{`
`639`		`- result = s(:arglist, s(:hash, *val[0]))`
	`637`	`+ result = [new_hash(nil, val[0], nil)]`
`640`	`638`	`add_block_pass result, val[1]`
`641`	`639`	`}`
`642`	`640`	`\| args tCOMMA assocs opt_block_arg`
`643`	`641`	`{`
`644`	`642`	`result = val[0]`
`645`		`- result << s(:hash, *val[2])`
	`643`	`+ result << new_hash(nil, val[2], nil)`
`646`	`644`	`}`
`647`	`645`	`\| block_arg`
`648`	`646`	`{`
`649`		`- result = s(:arglist)`
	`647`	`+ result = []`
`650`	`648`	`add_block_pass result, val[0]`
`651`	`649`	`}`
`652`	`650`
`@@ -674,7 +672,7 @@ rule`
`674`	`672`
`675`	`673`	`block_arg: tAMPER arg_value`
`676`	`674`	`{`
`677`		`- result = s(:block_pass, val[1])`
	`675`	`+ result = new_block_pass(val[0], val[1])`
`678`	`676`	`}`
`679`	`677`
`680`	`678`	`opt_block_arg: tCOMMA block_arg`
`@@ -985,7 +983,7 @@ rule`
`985`	`983`
`986`	`984`	`f_block_optarg: f_block_opt`
`987`	`985`	`{`
`988`		`- result = s(:block, val[0])`
	`986`	`+ result = s(:block, [val[0]])`
`989`	`987`	`}`
`990`	`988`	`\| f_block_optarg tCOMMA f_block_opt`
`991`	`989`	`{`
`@@ -995,7 +993,8 @@ rule`
`995`	`993`
`996`	`994`	`f_block_opt: tIDENTIFIER tEQL primary_value`
`997`	`995`	`{`
`998`		`- result = new_assign new_assignable(s(:identifier, val[0].intern)), val[2]`
	`996`	`+ result = new_assign(new_assignable(new_ident(`
	`997`	`+ val[0])), val[1], val[2])`
`999`	`998`	`}`
`1000`	`999`
`1001`	`1000`	`opt_block_var: none`
`@@ -1157,7 +1156,7 @@ opt_block_args_tail: tCOMMA block_args_tail`
`1157`	`1156`	`{`
`1158`	`1157`	`exc = val[1] \|\| s(:array)`
`1159`	`1158`	`exc << new_assign(val[2], s(:gvar, '$!'.intern)) if val[2]`
`1160`		`- result = [s(:resbody, exc, val[4])]`
	`1159`	`+ result = [s(:resbody, [exc, val[4]])]`
`1161`	`1160`	`result.push val[5].first if val[5]`
`1162`	`1161`	`}`
`1163`	`1162`	`\| # none`
`@@ -1167,7 +1166,7 @@ opt_block_args_tail: tCOMMA block_args_tail`
`1167`	`1166`
`1168`	`1167`	`exc_list: arg_value`
`1169`	`1168`	`{`
`1170`		`- result = s(:array, val[0])`
	`1169`	`+ result = s(:array, [val[0]])`
`1171`	`1170`	`}`
`1172`	`1171`	`\| mrhs`
`1173`	`1172`	`\| none`