opal 1.2.0 → 1.3.0.alpha1

data/lib/opal/nodes/call.rb

@@ -45,6 +45,9 @@ module Opal
         handle_special do
           compiler.method_calls << meth.to_sym if record_method?
 
+          # if trying to access an lvar in eval or irb mode
+          return compile_eval_var if using_eval?
+
           # if trying to access an lvar in irb mode
           return compile_irb_var if using_irb?
 
@@ -81,8 +84,19 @@ module Opal
         iter || splat?
       end
 
+      def invoke_using_refinement?
+        !scope.scope.collect_refinements_temps.empty?
+      end
+
       def default_compile
-        if invoke_using_send?
+        if auto_await?
+          push 'await '
+          scope.await_encountered = true
+        end
+
+        if invoke_using_refinement?
+          compile_using_refined_send
+        elsif invoke_using_send?
           compile_using_send
         else
           compile_simple_call_chain
@@ -109,6 +123,25 @@ module Opal
         push ')'
       end
 
+      # Compiles method call using `Opal.refined_send`
+      #
+      # @example
+      #   a.b(c, &block)
+      #
+      #   Opal.refined_send(a, 'b', [c], block, [[Opal.MyRefinements]])
+      #
+      def compile_using_refined_send
+        helper :refined_send
+
+        push '$refined_send('
+        compile_refinements
+        compile_receiver
+        compile_method_name
+        compile_arguments
+        compile_block_pass
+        push ')'
+      end
+
       def compile_receiver
         push recv(receiver_sexp)
       end
@@ -135,6 +168,11 @@ module Opal
         end
       end
 
+      def compile_refinements
+        refinements = scope.collect_refinements_temps.map { |i| s(:js_tmp, i) }
+        push expr(s(:array, *refinements)), ', '
+      end
+
       def compile_break_catcher
         if iter_has_break?
           unshift 'return '
@@ -172,16 +210,34 @@ module Opal
         end
       end
 
+      def compile_eval_var
+        push meth.to_s
+      end
+
       # a variable reference in irb mode in top scope might be a var ref,
       # or it might be a method call
       def using_irb?
-        @compiler.irb? && scope.top? && arglist == s(:arglist) && recvr.nil? && iter.nil?
+        @compiler.irb? && scope.top? && variable_like?
+      end
+
+      def using_eval?
+        @compiler.eval? && scope.top? && @compiler.scope_variables.include?(meth)
+      end
+
+      def variable_like?
+        arglist == s(:arglist) && recvr.nil? && iter.nil?
       end
 
       def sexp_with_arglist
         @sexp.updated(nil, [recvr, meth, arglist])
       end
 
+      def auto_await?
+        awaited_set = compiler.async_await
+
+        awaited_set && awaited_set != true && awaited_set.match?(meth.to_s)
+      end
+
       # Handle "special" method calls, e.g. require(). Subclasses can override
       # this method. If this method returns nil, then the method will continue
       # to be generated by CallNode.
@@ -273,6 +329,24 @@ module Opal
         end
       end
 
+      # Refinements support
+      add_special :using do |compile_default|
+        if scope.accepts_using? && arglist.children.count == 1
+          using_refinement(arglist.children.first)
+        else
+          compile_default.call
+        end
+      end
+
+      def using_refinement(arg)
+        prev, curr = *scope.refinements_temp
+        if prev
+          push "(#{curr} = #{prev}.slice(), #{curr}.push(", expr(arg), '), self)'
+        else
+          push "(#{curr} = [", expr(arg), '], self)'
+        end
+      end
+
       add_special :debugger do
         push fragment 'debugger'
       end
@@ -281,6 +355,12 @@ module Opal
         push fragment "Opal.hash({ arity_check: #{compiler.arity_check?} })"
       end
 
+      add_special :lambda do |compile_default|
+        scope.defines_lambda do
+          compile_default.call
+        end
+      end
+
       add_special :nesting do |compile_default|
         push_nesting = push_nesting?
         push '(Opal.Module.$$nesting = $nesting, ' if push_nesting
@@ -295,6 +375,47 @@ module Opal
         push ')' if push_nesting
       end
 
+      # This can be refactored in terms of binding, but it would 'corelib/binding'
+      # to be required in existing code.
+      add_special :eval do |compile_default|
+        next compile_default.call if arglist.children.length != 1 || ![s(:self), nil].include?(recvr)
+
+        temp = scope.new_temp
+        scope_variables = scope.scope_locals.map(&:to_s).inspect
+        push "(#{temp} = ", expr(arglist)
+        push ", typeof Opal.compile === 'function' ? eval(Opal.compile(#{temp}"
+        push ', {scope_variables: ', scope_variables
+        push ", arity_check: #{compiler.arity_check?}, file: '(eval)', eval: true})) : "
+        push "self.$eval(#{temp}))"
+      end
+
+      add_special :binding do
+        push "Opal.Binding.$new("
+        push "  function($code, $value) {"
+        push "    if (typeof $value === 'undefined') {"
+        push "      return eval($code);"
+        push "    }"
+        push "    else {"
+        push "      return eval($code + ' = $value');"
+        push "    }"
+        push "  },"
+        push "  ", scope.scope_locals.map(&:to_s).inspect, ","
+        push "  self,"
+        push "  ", source_location
+        push ")"
+      end
+
+      add_special :__await__ do |compile_default|
+        if compiler.async_await
+          push fragment '(await ('
+          push process(recvr)
+          push fragment '))'
+          scope.await_encountered = true
+        else
+          compile_default.call
+        end
+      end
+
       def push_nesting?
         recv = children.first
 

data/lib/opal/nodes/case.rb

@@ -13,7 +13,13 @@ module Opal
         compiler.in_case do
           compile_code
 
-          wrap '(function() {', '})()' if needs_closure?
+          if needs_closure?
+            if scope.await_encountered
+              wrap '(await (async function() {', '})())'
+            else
+              wrap '(function() {', '})()'
+            end
+          end
         end
       end
 

data/lib/opal/nodes/class.rb

@@ -13,13 +13,23 @@ module Opal
         name, base = name_and_base
         helper :klass
 
-        push '(function($base, $super, $parent_nesting) {'
         line "  var self = $klass($base, $super, '#{name}');"
         in_scope do
           scope.name = name
           compile_body
         end
-        line '})(', base, ', ', super_code, ', $nesting)'
+
+        if await_encountered
+          await_begin = '(await '
+          await_end = ')'
+          async = 'async '
+          parent.await_encountered = true
+        else
+          await_begin, await_end, async = '', '', ''
+        end
+
+        unshift "#{await_begin}(#{async}function($base, $super, $parent_nesting) {"
+        line '})(', base, ', ', super_code, ", $nesting)#{await_end}"
       end
 
       def super_code

data/lib/opal/nodes/def.rb

@@ -33,10 +33,6 @@ module Opal
 
           compile_arity_check
 
-          if scope.uses_zuper
-            prepare_super
-          end
-
           unshift "\n#{current_indent}", scope.to_vars
 
           line stmt_code
@@ -61,6 +57,9 @@ module Opal
         unshift ') {'
         unshift(inline_params)
         unshift "function#{function_name}("
+        if await_encountered
+          unshift "async "
+        end
         unshift "#{scope_name} = " if scope_name
         line '}'
 
@@ -91,28 +90,9 @@ module Opal
         end
       end
 
-      def source_location
-        file = @sexp.loc.expression.source_buffer.name
-        file = "<internal:#{file}>" if file.start_with?("corelib/")
-        file = "<js:#{file}>" if file.end_with?(".js")
-        line = @sexp.loc.line
-        "['#{file}', #{line}]"
-      end
-
       def comments_code
         '[' + comments.map { |comment| comment.text.inspect }.join(', ') + ']'
       end
-
-      def prepare_super
-        add_local '$zuper'
-        add_local '$zuper_i'
-        add_local '$zuper_ii'
-
-        line '// Prepare super implicit arguments'
-        line 'for($zuper_i = 0, $zuper_ii = arguments.length, $zuper = new Array($zuper_ii); $zuper_i < $zuper_ii; $zuper_i++) {'
-        line '  $zuper[$zuper_i] = arguments[$zuper_i];'
-        line '}'
-      end
     end
   end
 end

data/lib/opal/nodes/definitions.rb

@@ -22,7 +22,19 @@ module Opal
       children :new_name, :old_name
 
       def compile
-        push 'Opal.alias(self, ', expr(new_name), ', ', expr(old_name), ')'
+        # We only need to check one type, because parser otherwise denies invalid expressions
+        case new_name.type
+        when :gvar # This is a gvar alias: alias $a $b
+          helper :alias_gvar
+          new_name_str = new_name.children.first.to_s[1..-1].inspect
+          old_name_str = old_name.children.first.to_s[1..-1].inspect
+          push '$alias_gvar(', new_name_str, ', ', old_name_str, ')'
+        when :dsym, :sym # This is a method alias: alias a b
+          helper :alias
+          push '$alias(self, ', expr(new_name), ', ', expr(old_name), ')'
+        else # Nothing else is available, but just in case, drop an error
+          error "Opal doesn't know yet how to alias with #{new_name.type}"
+        end
       end
     end
 
@@ -41,7 +53,12 @@ module Opal
           compile_inline_children(returned_children, @level)
         else
           compile_children(returned_children, @level)
-          wrap '(function() {', '})()'
+
+          if scope.parent.await_encountered
+            wrap '(await (async function() {', '})())'
+          else
+            wrap '(function() {', '})()'
+          end
         end
       end
 
@@ -58,7 +75,7 @@ module Opal
 
       def compile_children(children, level)
         children.each do |child|
-          line process(child, level), ';'
+          line process(child, level), fragment(';', loc: false)
         end
       end
 
@@ -76,7 +93,7 @@ module Opal
         end
 
         processed_children.reject(&:empty?).each_with_index do |child, idx|
-          push ', ' unless idx == 0
+          push fragment(', ', loc: false) unless idx == 0
           push child
         end
       end

data/lib/opal/nodes/helpers.rb

@@ -35,12 +35,12 @@ module Opal
       end
 
       def line(*strs)
-        push "\n#{current_indent}"
+        push fragment("\n#{current_indent}", loc: false)
         push(*strs)
       end
 
       def empty_line
-        push "\n"
+        push fragment("\n", loc: false)
       end
 
       def js_truthy(sexp)

data/lib/opal/nodes/if.rb

@@ -33,7 +33,13 @@ module Opal
           push '}'
         end
 
-        wrap '(function() {', '; return nil; })()' if needs_wrapper?
+        if needs_wrapper?
+          if scope.await_encountered
+            wrap '(await (async function() {', '; return nil; })())'
+          else
+            wrap '(function() {', '; return nil; })()'
+          end
+        end
       end
 
       def truthy
@@ -52,20 +58,44 @@ module Opal
     class IFlipFlop < Base
       handle :iflipflop
 
+      children :from, :to
+
+      # Is this an exclusive flip flop? If no, run both branches
+      def excl
+        ""
+      end
+
+      # We create a function that we put in the top scope, that stores the state of our
+      # flip-flop. We pass to it functions that are ran with the current binding.
       def compile
-        # Unsupported
-        # Always compiles to 'true' to not break generated JS
-        push 'true'
+        helper :truthy
+
+        fun_name = top_scope.new_temp
+        ff = "#{fun_name}.$$ff"
+
+        push "(typeof #{fun_name} === 'undefined' ? (#{fun_name} = function(from, to){"
+        push "  if (typeof #{ff} === 'undefined') #{ff} = false;"
+        push "  var retval = #{ff};"
+        push "  if (!#{ff}) {"
+        push "    #{ff} = retval = $truthy(from());"
+        push "  }"
+        push "  #{excl}if (#{ff}) {"
+        push "    if ($truthy(to())) #{ff} = false;"
+        push "  }"
+        push "  return retval;"
+        push "}) : #{fun_name})("
+        push "  function() { ", stmt(compiler.returns(from)), " },"
+        push "  function() { ", stmt(compiler.returns(to)), " }"
+        push ")"
       end
     end
 
-    class EFlipFlop < Base
+    class EFlipFlop < IFlipFlop
       handle :eflipflop
 
-      def compile
-        # Unsupported
-        # Always compiles to 'true' to not break generated JS
-        push 'true'
+      # Is this an exclusive flip flop? If yes, run only a single branch
+      def excl
+        "else "
       end
     end
   end

data/lib/opal/nodes/iter.rb

@@ -11,6 +11,8 @@ module Opal
       children :inline_args, :body
 
       def compile
+        is_lambda! if scope.lambda_definition?
+
         inline_params = nil
 
         to_vars = identity = body_code = nil
@@ -25,13 +27,23 @@ module Opal
 
           body_code = stmt(returned_body)
           to_vars = scope.to_vars
-        end
 
-        line body_code
+          line body_code
+
+          if scope.catch_return
+            unshift "try {\n"
+            line '} catch ($returner) { if ($returner === Opal.returner) { return $returner.$v }'
+            push ' throw $returner; }'
+          end
+        end
 
         unshift to_vars
 
-        unshift "(#{identity} = function(", inline_params, '){'
+        if await_encountered
+          unshift "(#{identity} = async function(", inline_params, '){'
+        else
+          unshift "(#{identity} = function(", inline_params, '){'
+        end
         push "}, #{identity}.$$s = self,"
         push " #{identity}.$$brk = $brk," if contains_break?
         push " #{identity}.$$arity = #{arity},"

data/lib/opal/nodes/lambda.rb

@@ -11,7 +11,9 @@ module Opal
       def compile
         helper :lambda
 
-        push '$lambda(', expr(iter), ')'
+        scope.defines_lambda do
+          push '$lambda(', expr(iter), ')'
+        end
       end
     end
   end

data/lib/opal/nodes/literal.rb

@@ -152,9 +152,6 @@ module Opal
         case value
         when ''
           push('/(?:)/')
-        when %r{\?<\w+\>}
-          message = "named captures are not supported in javascript: #{value.inspect}"
-          push "self.$raise(new SyntaxError('#{message}'))"
         else
           push "#{Regexp.new(value).inspect}#{flags.join}"
         end
@@ -164,11 +161,10 @@ module Opal
         *values, flags_sexp = *children
         self.flags = flags_sexp.children.map(&:to_s)
 
-        self.value = case values.length
-                     when 0
+        self.value = if values.empty?
                        # empty regexp, we can process it inline
                        s(:str, '')
-                     when 1
+                     elsif single_line?(values)
                        # simple plain regexp, we can put it inline
                        values[0]
                      else
@@ -200,6 +196,16 @@ module Opal
       def raw_value
         self.value = @sexp.loc.expression.source
       end
+
+      private
+
+      def single_line?(values)
+        return false if values.length > 1
+
+        value = values[0]
+        # JavaScript doesn't support multiline regexp
+        value.type != :str || !value.children[0].include?("\n")
+      end
     end
 
     # $_ = 'foo'; call if /foo/
@@ -229,7 +235,7 @@ module Opal
           push ' + '
 
           if part.type == :str
-            push part.children[0].inspect
+            push expr(part)
           else
             push '(', expr(part), ')'
           end

data/lib/opal/nodes/logic.rb

@@ -126,13 +126,13 @@ module Opal
       end
 
       def return_in_iter?
-        if scope.iter? && parent_def = scope.find_parent_def
+        if (scope.iter? && !scope.lambda?) && parent_def = scope.find_parent_def
           parent_def
         end
       end
 
       def return_expr_in_def?
-        return scope if expr? && scope.def?
+        return scope if expr? && (scope.def? || scope.lambda?)
       end
 
       def scope_to_catch_return

data/lib/opal/nodes/module.rb

@@ -13,13 +13,23 @@ module Opal
         name, base = name_and_base
         helper :module
 
-        push '(function($base, $parent_nesting) {'
         line "  var self = $module($base, '#{name}');"
         in_scope do
           scope.name = name
           compile_body
         end
-        line '})(', base, ', $nesting)'
+
+        if await_encountered
+          await_begin = '(await '
+          await_end = ')'
+          async = 'async '
+          parent.await_encountered = true
+        else
+          await_begin, await_end, async = '', '', ''
+        end
+
+        unshift "#{await_begin}(#{async}function($base, $parent_nesting) {"
+        line '})(', base, ", $nesting)#{await_end}"
       end
 
       private