unified ParamSplatNode and ArgSplatNode into SplatNode

jashkenas · jashkenas · commit abd9ab5c7182 · 2010-01-12T23:49:47.000-05:00
diff --git a/lib/coffee_script/grammar.y b/lib/coffee_script/grammar.y
@@ -211,12 +211,12 @@ rule
   # A Parameter (or ParamSplat) in a function definition.
   Param:
     PARAM
-  | PARAM "." "." "."                 { result = ParamSplatNode.new(val[0]) }
+  | PARAM "." "." "."                 { result = SplatNode.new(val[0]) }
   ;
 
   # A regular splat.
   Splat:
-    Expression "." "." "."            { result = ArgSplatNode.new(val[0])}
+    Expression "." "." "."            { result = SplatNode.new(val[0]) }
   ;
 
   # Expressions that can be treated as values.
diff --git a/lib/coffee_script/nodes.rb b/lib/coffee_script/nodes.rb
@@ -244,7 +244,7 @@ def prefix
     end
 
     def splat?
-      @arguments.any? {|a| a.is_a?(ArgSplatNode) }
+      @arguments.any? {|a| a.is_a?(SplatNode) }
     end
 
     def <<(argument)
@@ -274,7 +274,7 @@ def compile_splat(o)
       obj  = @variable.source || 'this'
       args = @arguments.map do |arg|
         code = arg.compile(o)
-        code = arg.is_a?(ArgSplatNode) ? code : "[#{code}]"
+        code = arg.is_a?(SplatNode) ? code : "[#{code}]"
         arg.equal?(@arguments.first) ? code : ".concat(#{code})"
       end
       "#{prefix}#{meth}.apply(#{obj}, #{args.join('')})"
@@ -562,7 +562,7 @@ def compile_node(o)
       o.delete(:no_wrap)
       o.delete(:globals)
       name = o.delete(:immediate_assign)
-      if @params.last.is_a?(ParamSplatNode)
+      if @params.last.is_a?(SplatNode)
         splat = @params.pop
         splat.index = @params.length
         @body.unshift(splat)
@@ -574,8 +574,9 @@ def compile_node(o)
     end
   end
 
-  # A parameter splat in a function definition.
-  class ParamSplatNode < Node
+  # A splat, either as a parameter to a function, an argument to a call,
+  # or in a destructuring assignment.
+  class SplatNode < Node
     attr_accessor :index
     attr_reader :name
 
@@ -584,20 +585,16 @@ def initialize(name)
     end
 
     def compile_node(o={})
-      o[:scope].find(@name)
-      write("#{@name} = Array.prototype.slice.call(arguments, #{@index})")
+      write(@index ? compile_param(o) : compile_arg(o))
     end
-  end
-
-  class ArgSplatNode < Node
-    attr_reader :value
 
-    def initialize(value)
-      @value = value
+    def compile_param(o)
+      o[:scope].find(@name)
+      "#{@name} = Array.prototype.slice.call(arguments, #{@index})"
     end
 
-    def compile_node(o={})
-      write(@value.compile(o))
+    def compile_arg(o)
+      @name.compile(o)
     end
 
   end

Original file line number	Diff line number	Diff line change
`@@ -211,12 +211,12 @@ rule`
`211`	`211`	`# A Parameter (or ParamSplat) in a function definition.`
`212`	`212`	`Param:`
`213`	`213`	`PARAM`
`214`		`- \| PARAM "." "." "." { result = ParamSplatNode.new(val[0]) }`
	`214`	`+ \| PARAM "." "." "." { result = SplatNode.new(val[0]) }`
`215`	`215`	`;`
`216`	`216`
`217`	`217`	`# A regular splat.`
`218`	`218`	`Splat:`
`219`		`- Expression "." "." "." { result = ArgSplatNode.new(val[0])}`
	`219`	`+ Expression "." "." "." { result = SplatNode.new(val[0]) }`
`220`	`220`	`;`
`221`	`221`
`222`	`222`	`# Expressions that can be treated as values.`