Initial operator commit

adambeynon · adambeynon · commit c93ea95ac5e4 · 2014-08-15T10:39:47.000+01:00
diff --git a/lib/opal/compiler.rb b/lib/opal/compiler.rb
@@ -84,6 +84,11 @@ def helpers
       @helpers ||= Set.new([:breaker, :slice])
     end
 
+    # Operator helpers
+    def operator_helpers
+      @operator_helpers ||= Set.new
+    end
+
     # Method calls made in this file
     def method_calls
       @method_calls ||= Set.new
diff --git a/lib/opal/nodes/call.rb b/lib/opal/nodes/call.rb
@@ -11,6 +11,9 @@ class CallNode < Base
 
       SPECIALS = {}
 
+      # Operators that get optimized by compiler
+      OPERATORS = { :+ => :plus }
+
       def self.add_special(name, options = {}, &handler)
         SPECIALS[name] = options
         define_method("handle_#{name}", &handler)
@@ -139,6 +142,19 @@ def compile_default?
         @compile_default
       end
 
+      OPERATORS.each do |operator, name|
+        add_special(operator.to_sym) do
+          compiler.operator_helpers << operator.to_sym
+          lhs, rhs = expr(recvr), expr(arglist[1])
+
+          push fragment("$rb_#{name}(")
+          push lhs
+          push fragment(", ")
+          push rhs
+          push fragment(")")
+        end
+      end
+
       add_special :require do
         compile_default!
         str = DependencyResolver.new(compiler, arglist[1]).resolve
diff --git a/lib/opal/nodes/top.rb b/lib/opal/nodes/top.rb
@@ -23,6 +23,7 @@ def compile
           add_temp 'nil = $opal.nil'
 
           add_used_helpers
+          add_used_operators
           line scope.to_vars
 
           compile_method_stubs
@@ -66,6 +67,16 @@ def add_used_helpers
         helpers.to_a.each { |h| add_temp "$#{h} = $opal.#{h}" }
       end
 
+      def add_used_operators
+        operators = compiler.operator_helpers.to_a
+        operators.each do |op|
+          name = Nodes::CallNode::OPERATORS[op]
+          line "function $rb_#{name}(lhs, rhs) {"
+          line "  return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs #{op} rhs : lhs['$#{op}'](rhs);"
+          line "}"
+        end
+      end
+
       def compile_method_stubs
         if compiler.method_missing?
           calls = compiler.method_calls
