opal 0.4.2 → 0.4.3

data/lib/opal/grammar_helpers.rb

@@ -259,8 +259,8 @@ module Opal
         ref
       when :ivar, :gvar, :cvar
         ref
-      when :lit
-        # this is when we passed __LINE__ which is converted into :lit
+      when :int
+        # this is when we passed __LINE__ which is converted into :int
         ref
       when :str
         # returns for __FILE__ as it is converted into str
@@ -301,7 +301,7 @@ module Opal
       return s(:nil) unless str
       case str[0]
       when :str
-        str[0] = :lit
+        str[0] = :sym
         str[1] = str[1].to_sym
       when :dstr
         str[0] = :dsym
@@ -329,10 +329,10 @@ module Opal
     end
 
     def new_regexp(reg, ending)
-      return s(:lit, //) unless reg
+      return s(:regexp, //) unless reg
       case reg[0]
       when :str
-        s(:lit, Regexp.new(reg[1], ending))
+        s(:regexp, Regexp.new(reg[1], ending))
       when :evstr
         s(:dregx, "", reg)
       when :dstr

data/lib/opal/lexer.rb

@@ -117,7 +117,8 @@ module Opal
             @lex_state = :expr_end
 
             if str_parse[:regexp]
-              return :REGEXP_END, scanner.matched
+              result = scanner.scan(/\w+/)
+              return :REGEXP_END, result
             end
             return :STRING_END, scanner.matched
           else
@@ -576,7 +577,7 @@ module Opal
               @lex_state = :expr_end
               return '<<', '<<'
             elsif ![:expr_end, :expr_dot, :expr_endarg, :expr_class].include?(@lex_state) && space_seen
-              if scanner.scan(/(-?)(\w+)/)
+              if scanner.scan(/(-?)['"]?(\w+)['"]?/)
                 heredoc = scanner[2]
                 # for now just scrap rest of line + skip down one line for
                 # string content

data/lib/opal/parser.rb

@@ -191,6 +191,7 @@ module Opal
           scope.line = sexp.line
 
           code = process(scope, :stmt)
+          code = [code] unless code.is_a? Array
           code.unshift fragment(@indent, sexp)
         }
 
@@ -198,7 +199,7 @@ module Opal
         @scope.add_temp "__scope = __opal"
         @scope.add_temp "$mm = __opal.mm"
         @scope.add_temp "nil = __opal.nil"
-        @scope.add_temp "def = __opal.Object.prototype" if @scope.defines_defn
+        @scope.add_temp "def = __opal.Object._proto" if @scope.defines_defn
         @helpers.keys.each { |h| @scope.add_temp "__#{h} = __opal.#{h}" }
 
         vars = [fragment(INDENT, sexp), @scope.to_vars, fragment("\n", sexp)]
@@ -307,11 +308,11 @@ module Opal
     # of the format "process_<sexp_name>". Any sexp handler should
     # return a string of content.
     #
-    # For example, calling `process` with `s(:lit, 42)` will call the
+    # For example, calling `process` with `s(:sym, 42)` will call the
     # method `#process_lit`. If a method with that name cannot be
     # found, then an error is raised.
     #
-    #     process(s(:lit, 42), :stmt)
+    #     process(s(:int, 42), :stmt)
     #     # => "42"
     #
     # @param [Array] sexp the sexp to process
@@ -413,7 +414,7 @@ module Opal
     # into a block sexp. A block sexp just holds any number of other
     # sexps.
     #
-    #     s(:block, s(:str, "hey"), s(:lit, 42))
+    #     s(:block, s(:str, "hey"), s(:int, 42))
     #
     # A block can actually be empty. As opal requires real values to
     # be returned (to appease javascript values), a nil sexp
@@ -564,29 +565,31 @@ module Opal
       fragment((reverse ? "#{ name } === nil" : "#{ name } !== nil"), sexp)
     end
 
-    # s(:lit, 1)
-    # s(:lit, :foo)
-    def process_lit(sexp, level)
-      val = sexp.shift
-      case val
-      when Numeric
-        if level == :recv
-          fragment("(#{val.inspect})", sexp)
-        else
-          fragment(val.inspect, sexp)
-        end
-      when Symbol
-        fragment(val.to_s.inspect, sexp)
-      when Regexp
-        fragment((val == // ? /^/.inspect : val.inspect), sexp)
-      when Range
-        @helpers[:range] = true
-        "__range(#{val.begin}, #{val.end}, #{val.exclude_end?})"
+    def process_sym(sexp, level)
+      fragment(sexp[0].to_s.inspect, sexp)
+    end
+
+    def process_int(sexp, level)
+      handle_number sexp, level
+    end
+
+    def process_float(sexp, level)
+      handle_number sexp, level
+    end
+
+    def handle_number(sexp, level)
+      if level == :recv
+        fragment("(#{sexp[0]})", sexp)
       else
-        raise "Bad lit: #{val.inspect}"
+        fragment(sexp[0].to_s, sexp)
       end
     end
 
+    def process_regexp(sexp, level)
+      val = sexp[0]
+      fragment((val == // ? /^/.inspect : val.inspect), sexp)
+    end
+
     def process_dregx(sexp, level)
       result = []
 
@@ -653,6 +656,8 @@ module Opal
         fragment("(__scope.#{part[1].to_s} != null)", sexp)
       when :colon2
         fragment("false", sexp)
+      when :colon3
+        fragment("(__opal.Object._scope.#{sexp[0][1]} == null ? nil : 'constant')", sexp)
       when :ivar
         ivar_name = part[1].to_s[1..-1]
         with_temp do |t|
@@ -739,7 +744,7 @@ module Opal
           code << process(body, :stmt)
 
           if @scope.defines_defn
-            @scope.add_temp "def = ((typeof(#{current_self}) === 'function') ? #{current_self}.prototype : #{current_self})"
+            @scope.add_temp "def = ((#{current_self}._isClass) ? #{current_self}._proto : #{current_self})"
           end
 
           to_vars = [fragment("\n#@indent", sexp), @scope.to_vars, fragment("\n#@indent", sexp)]
@@ -782,7 +787,7 @@ module Opal
     # using the Module#attr_* methods as expected.
     #
     # @param [Symbol] meth :attr_{reader,writer,accessor}
-    # @param [Array<Sexp>] attrs array of s(:lit) or s(:str)
+    # @param [Array<Sexp>] attrs array of s(:sym) or s(:str)
     # @return [String] precompiled attr methods
     def handle_attr_optimize(meth, attrs)
       out = []
@@ -880,8 +885,19 @@ module Opal
         result = dispatch
       else
         args = process arglist, :expr
-        dispatch = tmprecv ? "(#{tmprecv} = #{recv_code})#{mid}" : "#{recv_code}#{mid}"
-        result = splat ? "#{dispatch}.apply(#{tmprecv || recv_code}, #{args})" : "#{dispatch}(#{args})"
+
+        dispatch = if tmprecv
+          [fragment("(#{tmprecv} = ", sexp), recv_code, fragment(")#{mid}", sexp)]
+        else
+          [recv_code, fragment(mid, sexp)]
+        end
+
+        result = if splat
+          [dispatch, fragment(".apply(", sexp), (tmprecv ? fragment(tmprecv, sexp) : recv_code),
+           fragment(", ", sexp), args, fragment(")", sexp)]
+        else
+          [dispatch, fragment("(", sexp), args, fragment(")", sexp)]
+        end
       end
 
       @scope.queue_temp tmpfunc if tmpfunc
@@ -941,7 +957,7 @@ module Opal
     def process_splat(sexp, level)
       if sexp.first == [:nil]
         [fragment("[]", sexp)]
-      elsif sexp.first.first == :lit
+      elsif sexp.first.first == :sym
         [fragment("[", sexp), process(sexp.first, :expr), fragment("]", sexp)]
       else
         process sexp.first, :recv
@@ -975,7 +991,7 @@ module Opal
       indent do
         in_scope(:class) do
           @scope.name = name
-          @scope.add_temp "#{ @scope.proto } = #{name}.prototype", "__scope = #{name}._scope"
+          @scope.add_temp "#{ @scope.proto } = #{name}._proto", "__scope = #{name}._scope"
 
           if Array === body.last
             # A single statement will need a block
@@ -1019,7 +1035,7 @@ module Opal
 
       in_scope(:sclass) do
         @scope.add_temp "__scope = #{current_self}._scope"
-        @scope.add_temp "def = #{current_self}.prototype"
+        @scope.add_temp "def = #{current_self}._proto"
 
         body = process body, :stmt
         code << @scope.to_vars << body
@@ -1055,7 +1071,7 @@ module Opal
       indent do
         in_scope(:module) do
           @scope.name = name
-          @scope.add_temp "#{ @scope.proto } = #{name}.prototype", "__scope = #{name}._scope"
+          @scope.add_temp "#{ @scope.proto } = #{name}._proto", "__scope = #{name}._scope"
           body = process body, :stmt
 
           code << fragment(@indent, sexp)
@@ -1193,7 +1209,7 @@ module Opal
 
       if recvr
         if smethod
-          [fragment("__opal.defs(#{@scope.name}, '$#{mid}', ", sexp), result, fragment(")", sexp)]
+          [fragment("#{@scope.name}.constructor.prototype['$#{mid}'] = ", sexp), result]
         else
           [recv, fragment("#{jsid} = ", sexp), result]
         end
@@ -1341,7 +1357,7 @@ module Opal
         end
       end
 
-      if keys.all? { |k| [:lit, :str].include? k[0] }
+      if keys.all? { |k| [:sym, :str].include? k[0] }
         hash_obj  = {}
         hash_keys = []
         keys.size.times do |i|
@@ -1454,7 +1470,7 @@ module Opal
 
     # alias foo bar
     #
-    # s(:alias, s(:lit, :foo), s(:lit, :bar))
+    # s(:alias, s(:sym, :foo), s(:sym, :bar))
     def process_alias(exp, level)
       new = mid_to_jsid exp[0][1].to_s
       old = mid_to_jsid exp[1][1].to_s
@@ -1464,7 +1480,7 @@ module Opal
         fragment("%s%s = %s%s" % [@scope.proto, new, @scope.proto, old], exp)
       else
         current = current_self
-        fragment("%s.prototype%s = %s.prototype%s" % [current, new, current, old], exp)
+        fragment("%s._proto%s = %s._proto%s" % [current, new, current, old], exp)
       end
     end
 
@@ -1494,9 +1510,10 @@ module Opal
         code << fragment(", ", sexp) unless code.empty?
 
         if l.first == :splat
-          s = l[1]
-          s << s(:js_tmp, "__slice.call(#{tmp}, #{idx})")
-          code << process(s, :expr)
+          if s = l[1]
+            s << s(:js_tmp, "__slice.call(#{tmp}, #{idx})")
+            code << process(s, :expr)
+          end
         else
           if idx >= len
             l << s(:js_tmp, "(#{tmp}[#{idx}] == null ? nil : #{tmp}[#{idx}])")
@@ -2038,19 +2055,19 @@ module Opal
 
       elsif @scope.type == :def
         @scope.identify!
-        cls_name = @scope.parent.name || "#{current_self}.constructor.prototype"
+        cls_name = @scope.parent.name || "#{current_self}._klass._proto"
         jsid     = mid_to_jsid @scope.mid.to_s
 
         if @scope.defs
           [fragment(("%s._super%s.apply(this, " % [cls_name, jsid]), sexp), args, fragment(")", sexp)]
         else
-          [fragment("#{current_self}.constructor._super.prototype#{jsid}.apply(#{current_self}, ", sexp), args, fragment(")", sexp)]
+          [fragment("#{current_self}._klass._super._proto#{jsid}.apply(#{current_self}, ", sexp), args, fragment(")", sexp)]
         end
 
       elsif @scope.type == :iter
         chain, defn, mid = @scope.get_super_chain
         trys = chain.map { |c| "#{c}._sup" }.join ' || '
-        [fragment("(#{trys} || #{current_self}.constructor._super.prototype[#{mid}]).apply(#{current_self}, ", sexp), args, fragment(")", sexp)]
+        [fragment("(#{trys} || #{current_self}._klass._super._proto[#{mid}]).apply(#{current_self}, ", sexp), args, fragment(")", sexp)]
       else
         raise "Cannot call super() from outside a method block"
       end

data/lib/opal/require_parser.rb

@@ -0,0 +1,77 @@
+require 'opal/parser'
+
+module Opal
+  # A parser which collects all require() statments for dependency building
+  class RequireParser < Parser
+    def self.parse source, options = {}
+      self.new.parse source, options
+    end
+
+    # Holds an array of paths which this file 'requires'.
+    # @return Array<String>
+    attr_reader :requires
+
+    def parse source, options = {}
+      @requires = []
+      @dynamic_require_severity = (options[:dynamic_require_severity] || :error)
+      super source, options
+    end
+
+    def process_call sexp, level
+      if sexp[1] == :require
+        return handle_require sexp[2][1]
+      end
+
+      super sexp, level
+    end
+
+    def handle_require(sexp)
+      str = handle_require_sexp sexp
+      @requires << str unless str.nil? if @requires
+      fragment("", sexp)
+    end
+
+    def handle_require_sexp(sexp)
+      type = sexp.shift
+
+      if type == :str
+        return sexp[0]
+      elsif type == :call
+        recv, meth, args = sexp
+        parts = args[1..-1].map { |s| handle_require_sexp s }
+
+        if recv == [:const, :File]
+          if meth == :expand_path
+            return handle_expand_path(*parts)
+          elsif meth == :join
+            return handle_expand_path parts.join("/")
+          elsif meth == :dirname
+            return handle_expand_path parts[0].split("/")[0...-1].join("/")
+          end
+        end
+      end
+
+
+      case @dynamic_require_severity
+      when :error
+        error "Cannot handle dynamic require"
+      when :warning
+        warning "Cannot handle dynamic require"
+      end
+    end
+
+    def handle_expand_path(path, base = '')
+      "#{base}/#{path}".split("/").inject([]) do |p, part|
+        if part == ''
+          # we had '//', so ignore
+        elsif part == '..'
+          p.pop
+        else
+          p << part
+        end
+
+        p
+      end.join "/"
+    end
+  end
+end

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/opal.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'uglifier'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'racc'
-  s.add_development_dependency 'opal-sprockets', '~> 0.1.0'
+  s.add_development_dependency 'opal-sprockets', '~> 0.1.1'
 end

data/spec/opal/array/to_json_spec.rb

@@ -1,7 +1,9 @@
+require 'json'
+
 describe "Array#to_json" do
   it "returns a string of all array elements converted to json" do
     [].to_json.should == "[]"
     [1, 2, 3].to_json.should == "[1, 2, 3]"
     [true, nil, false, "3", 42].to_json.should == '[true, null, false, "3", 42]'
   end
-end
+end

data/spec/opal/boolean/to_json_spec.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 describe "Boolean#to_json" do
   it "returns 'true' when true" do
     true.to_json.should == "true"
@@ -6,4 +8,4 @@ describe "Boolean#to_json" do
   it "returns 'false' when false" do
     false.to_json.should == "false"
   end
-end
+end

data/spec/opal/erb/erb_spec.rb

@@ -0,0 +1,25 @@
+require 'erb'
+
+require File.expand_path('../simple', __FILE__)
+require File.expand_path('../quoted', __FILE__)
+
+describe "ERB files" do
+  before :each do
+    @simple = Template['opal/erb/simple']
+    @quoted = Template['opal/erb/quoted']
+  end
+
+  it "should be defined by their filename on Template namespace" do
+    @simple.should be_kind_of(ERB)
+  end
+
+  it "calling the block with a context should render the block" do
+    @some_data = "hello"
+    @simple.render(self).should == "<div>hello</div>\n"
+  end
+
+  it "should accept quotes in strings" do
+    @name = "adam"
+    @quoted.render(self).should == "<div class=\"foo\">hello there adam</div>\n"
+  end
+end

data/spec/opal/erb/quoted.opalerb

@@ -0,0 +1 @@
+<div class="foo">hello <%= "there " + @name %></div>

data/spec/opal/erb/simple.opalerb

@@ -0,0 +1 @@
+<div><%= @some_data %></div>

data/spec/opal/json/parse_spec.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 describe "JSON.parse" do
   it "parses null into nil" do
     JSON.parse("null").should be_nil
@@ -28,4 +30,4 @@ describe "JSON.parse" do
     JSON.parse('{"a": "b"}').should == {"a" => "b"}
     JSON.parse('{"a": null, "b": 10, "c": [true, false]}').should == {"a" => nil, "b" => 10, "c" => [true, false]}
   end
-end
+end