Merge pull request #585 from opal/operators

elia · elia · commit 87d1c3a288d6 · 2014-09-27T18:30:12.000+02:00
Operators 📈
diff --git a/benchmarks/operators.rb b/benchmarks/operators.rb
@@ -1,9 +1,11 @@
-t1 = Time.now
+require "benchmark"
 
-a = 0
-100000.times do
-  a = a + 1
+time = Benchmark.measure do
+  a = 0
+  100000.times do
+    a = a + 1
+  end
+  puts a
 end
-puts a
 
-puts Time.now - t1
+puts time
diff --git a/lib/opal/cli.rb b/lib/opal/cli.rb
@@ -133,6 +133,7 @@ def processor_option_names
         dynamic_require_severity
         source_map_enabled
         irb_enabled
+        inline_operators
       ]
     end
 
diff --git a/lib/opal/cli_options.rb b/lib/opal/cli_options.rb
@@ -103,6 +103,10 @@ def initialize
         options[:arity_check] = true
       end
 
+      on('-V', 'Enable inline Operators') do
+        options[:inline_operators] = true
+      end
+
       dynamic_require_levels = %w[error warning ignore]
       on('-D', '--dynamic-require LEVEL', dynamic_require_levels,
                     'Set level of dynamic require severity.',
diff --git a/lib/opal/compiler.rb b/lib/opal/compiler.rb
@@ -45,6 +45,9 @@ def self.compiler_option(name, default_value, options = {})
     # Prepare the code for future requires
     compiler_option :requirable, false, :as => :requirable?
 
+    # are operators compiled inline
+    compiler_option :inline_operators, false, :as => :inline_operators?
+
     attr_reader :result, :fragments
 
     # Current scope
@@ -84,6 +87,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,10 @@ class CallNode < Base
 
       SPECIALS = {}
 
+      # Operators that get optimized by compiler
+      OPERATORS = { :+ => :plus, :- => :minus, :* => :times, :/ => :divide,
+                    :< => :lt, :<= => :le, :> => :gt, :>= => :ge }
+
       def self.add_special(name, options = {}, &handler)
         SPECIALS[name] = options
         define_method("handle_#{name}", &handler)
@@ -139,6 +143,23 @@ def compile_default?
         @compile_default
       end
 
+      OPERATORS.each do |operator, name|
+        add_special(operator.to_sym) do
+          if compiler.inline_operators?
+            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(")")
+          else
+            compile_default!
+          end
+        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
diff --git a/stdlib/benchmark.rb b/stdlib/benchmark.rb
@@ -0,0 +1,10 @@
+module Benchmark
+
+  def measure(&block)
+    start = Time.now
+    yield
+    Time.now - start
+  end
+
+  module_function :measure
+end

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ def processor_option_names`
`133`	`133`	`dynamic_require_severity`
`134`	`134`	`source_map_enabled`
`135`	`135`	`irb_enabled`
	`136`	`+ inline_operators`
`136`	`137`	`]`
`137`	`138`	`end`
`138`	`139`