opal 0.11.4 → 1.0.0.beta1

data/lib/opal/nodes/top.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'pathname'
 require 'opal/version'
 require 'opal/nodes/scope'
@@ -26,6 +27,8 @@ module Opal
             add_temp '$nesting = []'
           end
           add_temp 'nil = Opal.nil'
+          add_temp '$$$ = Opal.const_get_qualified'
+          add_temp '$$ = Opal.const_get_relative'
 
           add_used_helpers
           add_used_operators
@@ -43,12 +46,11 @@ module Opal
 
       def opening
         if compiler.requirable?
-          path = Pathname(compiler.file).cleanpath.to_s
-          line "Opal.modules[#{path.inspect}] = function(Opal) {"
+          line "Opal.modules[#{Opal::Compiler.module_name(compiler.file).inspect}] = function(Opal) {"
         elsif compiler.eval?
-          line "(function(Opal, self) {"
+          line '(function(Opal, self) {'
         else
-          line "(function(Opal) {"
+          line '(function(Opal) {'
         end
       end
 
@@ -56,7 +58,7 @@ module Opal
         if compiler.requirable?
           line "};\n"
         elsif compiler.eval?
-          line "})(Opal, self)"
+          line '})(Opal, self)'
         else
           line "})(Opal);\n"
         end
@@ -68,7 +70,7 @@ module Opal
 
       def compile_irb_vars
         if compiler.irb?
-          line "if (!Opal.irb_vars) { Opal.irb_vars = {}; }"
+          line 'if (!Opal.irb_vars) { Opal.irb_vars = {}; }'
         end
       end
 
@@ -83,7 +85,7 @@ module Opal
           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 "}"
+          line '}'
         end
       end
 
@@ -98,7 +100,7 @@ module Opal
       # Any special __END__ content in code
       def compile_end_construct
         if content = compiler.eof_content
-          line "var $__END__ = Opal.Object.$new();"
+          line 'var $__END__ = Opal.Object.$new();'
           line "$__END__.$read = function() { return #{content.inspect}; };"
         end
       end

data/lib/opal/nodes/variables.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 
 module Opal
@@ -9,7 +10,7 @@ module Opal
       children :var_name
 
       def using_irb?
-        compiler.irb? and scope.top?
+        compiler.irb? && scope.top?
       end
 
       def compile
@@ -28,7 +29,7 @@ module Opal
       children :var_name, :value
 
       def using_irb?
-        compiler.irb? and scope.top?
+        compiler.irb? && scope.top?
       end
 
       def compile
@@ -87,7 +88,7 @@ module Opal
         push "self#{name} = "
         push expr(value)
 
-        wrap '(', ')'  if (recv? || expr?) && value
+        wrap '(', ')' if (recv? || expr?) && value
       end
     end
 
@@ -107,7 +108,6 @@ module Opal
         add_gvar name
         push "$gvars#{name}"
       end
-
     end
 
     # back_ref can be:
@@ -169,7 +169,7 @@ module Opal
         push "$gvars#{name} = "
         push expr(value)
 
-        wrap '(', ')'  if (recv? || expr?) && value
+        wrap '(', ')' if (recv? || expr?) && value
       end
     end
 
@@ -206,7 +206,7 @@ module Opal
       children :name, :value
 
       def compile
-        push "(Opal.class_variable_set(#{class_variable_owner}, '#{name}', ", expr(value), "))"
+        push "(Opal.class_variable_set(#{class_variable_owner}, '#{name}', ", expr(value), '))'
       end
     end
   end

data/lib/opal/nodes/while.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 
 module Opal
@@ -29,18 +30,18 @@ module Opal
             push "#{redo_var} = false;" if uses_redo?
             line body_code
           end
-          line "}"
+          line '}'
         end
 
         wrap '(function() {', '; return nil; })()' if wrap_in_closure?
       end
 
       def while_open
-        "while ("
+        'while ('
       end
 
       def while_close
-        ") {"
+        ') {'
       end
 
       def uses_redo?
@@ -48,7 +49,7 @@ module Opal
       end
 
       def wrap_in_closure?
-        expr? or recv?
+        expr? || recv?
       end
     end
 
@@ -60,11 +61,11 @@ module Opal
       handle :until
 
       def while_open
-        "while (!("
+        'while (!('
       end
 
       def while_close
-        ")) {"
+        ')) {'
       end
     end
 

data/lib/opal/nodes/x_string.rb

@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+module Opal
+  module Nodes
+    class XStringNode < Base
+      handle :xstr
+
+      def compile
+        @should_add_semicolon = false
+        unpacked_children = unpack_return(children)
+        stripped_children = strip_empty_children(unpacked_children)
+
+        if single_line?(stripped_children)
+          # If it's a single line we'll try to:
+          #
+          # - strip empty lines
+          # - remove a trailing `;`
+          # - detect an embedded `return`
+          # - prepend a `return` when needed
+          # - append a `;` when needed
+          # - warn the user not to use the semicolon in single-line x-strings
+          compile_single_line(stripped_children)
+        else
+          # Here we leave to the user the responsibility to add
+          # a return where it's due.
+          unpacked_children.each { |c| compile_child(c) }
+        end
+
+        wrap '(', ')' if recv?
+        push ';' if @should_add_semicolon
+      end
+
+
+      private
+
+      def compile_child(child)
+        case child.type
+        when :str
+          value = child.loc.expression.source
+          push Fragment.new(value, scope, child)
+        when :begin, :gvar, :ivar, :nil
+          push expr(child)
+        else
+          raise "Unsupported xstr part: #{child.type}"
+        end
+      end
+
+      def compile_single_line(children)
+        has_embeded_return = false
+
+        first_child  = children.shift
+        single_child = children.empty?
+
+        first_child ||= s(:nil)
+
+        if first_child.type == :str
+          first_value = first_child.loc.expression.source.strip
+          has_embeded_return = first_value =~ /^return\b/
+        end
+
+        push('return ') if @returning && !has_embeded_return
+
+        last_child = children.pop || first_child
+        last_value = extract_last_value(last_child) if last_child.type == :str
+
+        unless single_child
+          # assuming there's an interpolation somewhere (type != :str)
+          @should_add_semicolon = false
+          compile_child(first_child)
+          children.each { |c| compile_child(c) }
+        end
+
+        if last_child.type == :str
+          push Fragment.new(last_value, scope, last_child)
+        else
+          compile_child(last_child)
+        end
+      end
+
+      # Will drop the trailing semicolon if all conditions are met
+      def extract_last_value(last_child)
+        last_value = last_child.loc.expression.source.rstrip
+
+        if (@returning || expr?) && last_value.end_with?(';')
+          compiler.warning(
+            'Removed semicolon ending x-string expression, interpreted as unintentional',
+            last_child.line,
+          )
+          last_value = last_value[0..-2]
+        end
+
+        @should_add_semicolon = true if @returning
+
+        last_value
+      end
+
+      # Check if there's only one child or if they're all part of
+      # the same line (e.g. because of interpolations)
+      def single_line?(children)
+        (children.size == 1) || children.none? do |c|
+          c.type == :str && c.loc.expression.source.end_with?("\n")
+        end
+      end
+
+      # A case for manually created :js_return statement in Compiler#returns
+      # Since we need to take original source of :str we have to use raw source
+      # so we need to combine "return" with "raw_source"
+      def unpack_return(children)
+        first_child = children.first
+        @returning  = false
+
+        if first_child.type == :js_return
+          @returning = true
+          children = first_child.children
+        end
+
+        children
+      end
+
+      # Will remove empty :str lines coming from cosmetic newlines in x-strings
+      #
+      # @example
+      #   # this will generate two additional empty
+      #   # children before and after `foo()`
+      #   %x{
+      #     foo()
+      #   }
+      def strip_empty_children(children)
+        children = children.dup
+        empty_line = ->(child) { child.nil? || (child.type == :str && child.loc.expression.source.rstrip.empty?) }
+
+        children.shift while children.any? && empty_line[children.first]
+        children.pop while children.any? && empty_line[children.last]
+
+        children
+      end
+    end
+  end
+end

data/lib/opal/nodes/yield.rb

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 
 module Opal
   module Nodes
     class BaseYieldNode < Base
-      def compile_call(children, level)
+      def compile_call
         yielding_scope = find_yielding_scope
 
         yielding_scope.uses_block!
-        block_name = yielding_scope.block_name || '$yield'
+        yielding_scope.block_name ||= '$yield'
+
+        block_name = yielding_scope.block_name
 
         if yields_single_arg?(children)
           push expr(children.first)
@@ -27,7 +30,7 @@ module Opal
       def find_yielding_scope
         working = scope
         while working
-          if working.block_name or working.def?
+          if working.block_name || working.def?
             break
           end
           working = working.parent
@@ -37,7 +40,7 @@ module Opal
       end
 
       def yields_single_arg?(children)
-        !uses_splat?(children) and children.size == 1
+        !uses_splat?(children) && children.size == 1
       end
 
       def uses_splat?(children)
@@ -49,7 +52,7 @@ module Opal
       handle :yield
 
       def compile
-        compile_call(children, @level)
+        compile_call
       end
     end
 
@@ -59,9 +62,9 @@ module Opal
       handle :returnable_yield
 
       def compile
-        compile_call children, @level
+        compile_call
 
-        wrap "return ", ";"
+        wrap 'return ', ';'
       end
     end
   end

data/lib/opal/parser.rb

@@ -1,50 +1,13 @@
 # frozen_string_literal: true
+
 require 'opal/ast/builder'
 require 'opal/rewriter'
-
-module Opal
-  module Source
-    class Buffer < Parser::Source::Buffer
-      def self.recognize_encoding(string)
-        super || Encoding::UTF_8
-      end
-    end
-  end
-
-  class Parser < ::Parser::Ruby23
-    class << self
-      attr_accessor :diagnostics_consumer
-
-      def default_parser
-        parser = super
-
-        parser.diagnostics.all_errors_are_fatal = true
-        parser.diagnostics.ignore_warnings      = false
-
-        if RUBY_ENGINE == 'opal'
-          parser.diagnostics.consumer = ->(diag){}
-        else
-          parser.diagnostics.consumer = diagnostics_consumer
-        end
-
-        parser
-      end
-    end
-
-    self.diagnostics_consumer = ->(diagnostic) { $stderr.puts(diagnostic.render) }
-
-    def initialize(*)
-      super(Opal::AST::Builder.new)
-    end
-
-    def parse(source_buffer)
-      parsed = super
-      rewriten = rewrite(parsed)
-      rewriten
-    end
-
-    def rewrite(node)
-      Opal::Rewriter.new(node).process
-    end
-  end
+require 'opal/parser/source_buffer'
+require 'opal/parser/default_config'
+require 'opal/parser/with_ruby_lexer'
+
+if RUBY_ENGINE == 'opal'
+  require 'opal/parser/patch'
+else
+  require 'opal/parser/with_c_lexer'
 end

data/lib/opal/parser/default_config.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Opal
+  module Parser
+    module DefaultConfig
+      module ClassMethods
+        attr_accessor :diagnostics_consumer
+
+        def default_parser
+          parser = super
+          parser.diagnostics.all_errors_are_fatal = true
+          parser.diagnostics.ignore_warnings      = false
+          parser.diagnostics.consumer             = diagnostics_consumer
+          parser
+        end
+      end
+
+      def self.included(klass)
+        klass.extend(ClassMethods)
+        klass.diagnostics_consumer = ->(diagnostic) do
+          if RUBY_ENGINE != 'opal'
+            $stderr.puts(diagnostic.render)
+          end
+        end
+      end
+
+      def initialize(*)
+        super(Opal::AST::Builder.new)
+      end
+
+      def parse(source_buffer)
+        parsed = super
+        rewriten = rewrite(parsed)
+        rewriten
+      end
+
+      def rewrite(node)
+        Opal::Rewriter.new(node).process
+      end
+    end
+
+    class << self
+      attr_accessor :default_parser_class
+
+      def default_parser
+        default_parser_class.default_parser
+      end
+    end
+  end
+end