opal 0.3.16 → 0.3.17

data/lib/opal/{parser/scope.rb → scope.rb}

@@ -6,9 +6,11 @@ module Opal; class Parser
 
     attr_accessor :name
 
+    attr_accessor :block_name
+
     attr_reader :scope_name
     attr_reader :ivars
-    
+
     attr_accessor :donates_methods
 
     attr_reader :type
@@ -16,7 +18,8 @@ module Opal; class Parser
     # used by modules to know what methods to donate to includees
     attr_reader :methods
 
-    def initialize(type)
+    def initialize(type, parser)
+      @parser  = parser
       @type    = type
       @locals  = []
       @temps   = []
@@ -39,20 +42,20 @@ module Opal; class Parser
       vars = []
 
       if @type == :class
-        vars << '$const = this.$const'
-        vars << 'def = this.$proto'
+        vars << '__scope = this._scope'
+        vars << 'def = this._proto'
       elsif @type == :module
-        vars << '$const = this.$const'
-        vars << 'def = this.$proto'
+        vars << '__scope = this._scope'
+        vars << 'def = this._proto'
       elsif @type == :sclass
-        vars << '$const = this.$const'
+        vars << '__scope = this._scope'
       end
 
       locals.each { |l| vars << "#{l} = nil" }
       temps.each { |t| vars << t }
 
       iv = ivars.map do |ivar|
-        "this#{ivar} == null && (this#{ivar} = nil);"
+       "if (this#{ivar} == null) this#{ivar} = nil;\n"
       end
 
       res = vars.empty? ? '' : "var #{vars.join ', '}; "
@@ -88,7 +91,7 @@ module Opal; class Parser
     def new_temp
       return @queue.pop unless @queue.empty?
 
-      tmp = "_#{@unique}"
+      tmp = "__#{@unique}"
       @unique = @unique.succ
       @temps << tmp
       tmp
@@ -117,6 +120,48 @@ module Opal; class Parser
         @parent.uses_block!
       else
         @uses_block = true
+        identify!
+      end
+    end
+
+    def identify!
+      @identity ||= @parser.unique_temp
+    end
+
+    def identity
+      @identity
+    end
+
+    def get_super_chain
+      chain = []
+      scope = self
+      defn  = 'null'
+      mid   = 'null'
+
+      while scope
+        if scope.type == :iter
+          chain << scope.identify!
+          scope = scope.parent if scope.parent
+
+        elsif scope.type == :def
+          defn = scope.identify!
+          mid  = "'#{scope.mid}'"
+          break
+
+        else
+          break
+        end
+      end
+
+      [chain, defn, mid]
+    end
+
+    def identify_def
+      if @type == :iter && @parent
+        identify!
+        @parent.identify_def
+      elsif @type == :def
+        identify!
       end
     end
 
@@ -135,6 +180,24 @@ module Opal; class Parser
     def catches_break?
       @catches_break
     end
+
+    def mid=(mid)
+      @mid = mid
+    end
+
+    # Gets the method id (as a jsid) of the current scope, which is assumed
+    # to be a method (:def). If not, and this scope is a :iter, then the
+    # parent scope will be checked. As a fallback, nil is returned. This is
+    # used by super() to find out what method super() should be sent to.
+    def mid
+      if @type == :def
+        @mid
+      elsif @type == :iter && @parent
+        @parent.mid
+      else
+        nil
+      end
+    end
   end
 
 end; end

data/lib/opal/version.rb

@@ -1,4 +1,3 @@
 module Opal
-  VERSION = "0.3.16"
-end
-
+  VERSION = "0.3.17"
+end

data/opal.gemspec

@@ -11,8 +11,7 @@ Gem::Specification.new do |s|
   s.description  = 'Ruby runtime and core library for javascript.'
 
   s.files          = `git ls-files`.split("\n")
-  s.files         += %w[opal.js opal.debug.js]
   s.executables    = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths  = ['lib']
-end
+end

data/{core_spec → spec}/core/array/allocate_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Array.allocate" do
   it "returns an instance of Array" do
     ary = Array.allocate
@@ -12,4 +10,4 @@ describe "Array.allocate" do
     ary << 1
     ary.should == [1]
   end
-end
+end

data/{core_spec → spec}/core/array/append_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Array#<<" do
   it "pushes the object onto the end of the array" do
     ([ 1, 2 ] << "c" << "d" << [ 3, 4 ]).should == [1, 2, "c", "d", [3, 4]]
@@ -27,5 +25,4 @@ describe "Array#<<" do
     a << :foo
     a.should == [:foo]
   end
-end
-
+end

data/{core_spec → spec}/core/array/assoc_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Array#assoc" do
   it "returns the first array whose 1st item is == obj or nil" do
     s1 = ["colors", "red", "blue", "green"]
@@ -25,5 +23,4 @@ describe "Array#assoc" do
     a.assoc(s1.first).should == s1
     a.assoc(s2.first).should == s2
   end
-end
-
+end

data/{core_spec → spec}/core/array/at_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Array#at" do
   it "returns the (n+1)'th element for the passed index n" do
     a = [1, 2, 3, 4, 5, 6]
@@ -35,4 +33,4 @@ describe "Array#at" do
     a.at(-100)
     a.length.should == 6
   end
-end
+end

data/{core_spec → spec}/core/array/clear_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Array#clear" do
   it "removes all elements" do
     a = [1, 2, 3, 4]
@@ -19,4 +17,4 @@ describe "Array#clear" do
     a.empty?.should == true
     a.size.should == 0
   end
-end
+end

data/spec/core/array/clone_spec.rb

@@ -0,0 +1,15 @@
+describe "Array#clone" do
+  it "produces a shallow copy where the references are directly copied" do
+    a = [mock('1'), mock('2')]
+    b = a.clone
+    b.first.object_id.should == a.first.object_id
+    b.last.object_id.should == a.last.object_id
+  end
+
+  it "creates a new array containing all the elements of the original" do
+    a = [1, 2, 3, 4]
+    b = a.clone
+    b.should == a
+    b.object_id.should_not == a.object_id
+  end
+end

data/{core_spec/core/array/shared/collect.rb → spec/core/array/collect_spec.rb}

@@ -50,4 +50,4 @@ describe "Array#collect!" do
     b.should == 0
     a.should == ['a!', 'b!', 'c', 'd']
   end
-end
+end

data/{core_spec → spec}/core/array/compact_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Array#compact" do
   it "returns a copy of array with all nil elements removed" do
     a = [1, 2, 4]
@@ -39,4 +37,4 @@ describe "Array#compact!" do
   it "returns nil if there are no nil elements to remove" do
     [1, 2, false, 3].compact!.should == nil
   end
-end
+end

data/{core_spec → spec}/core/array/concat_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Array#concat" do
   it "returns the array itself" do
     ary = [1,2,3]
@@ -18,4 +16,4 @@ describe "Array#concat" do
     ary = ["x", "y"]
     ary.concat(ary).should == ["x", "y", "x", "y"]
   end
-end
+end

data/{core_spec → spec}/core/array/constructor_spec.rb

@@ -1,5 +1,11 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+module ArraySpecs
+  class MyArray < Array
+    def initialize(a, b)
+      self << a << b
+      ScratchPad.record :my_array_initialize
+    end
+  end
+end
 
 describe "Array.[]" do
   it "returns a new array populated with the given elements" do
@@ -21,4 +27,4 @@ describe "Array[]" do
     a.should be_kind_of(ArraySpecs::MyArray)
     a.inspect.should == [5, true, nil, "a", "Ruby", obj].inspect
   end
-end
+end

data/{core_spec → spec}/core/array/count_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Array#count" do
   it "returns the count of elements" do
     [1, :two, 'three'].count.should == 3
@@ -8,4 +6,4 @@ describe "Array#count" do
   it "returns count of elements that equals given object" do
     [1, 'some text', 'other text', 2, 1].count(1).should == 2
   end
-end
+end

data/{core_spec → spec}/core/array/delete_at_spec.rb

@@ -1,6 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
-
 describe "Array#delete_at" do
   it "removes the element at the specified index" do
     a = [1, 2, 3, 4]
@@ -28,4 +25,4 @@ describe "Array#delete_at" do
     a = [1, 2]
     a.delete_at(-2).should == 1
   end
-end
+end

data/{core_spec → spec}/core/array/delete_if_spec.rb

@@ -1,6 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
-
 describe "Array#delete_if" do
   before do
     @a = [ "a", "b", "c" ]
@@ -21,4 +18,4 @@ describe "Array#delete_if" do
     array.shift
     array.delete_if { |x| true }.should equal(array)
   end
-end
+end

data/{core_spec → spec}/core/array/delete_spec.rb

@@ -1,6 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
-
 describe "Array#delete" do
   it "removes elements that are #== to object" do
     x = mock('delete')
@@ -23,4 +20,4 @@ describe "Array#delete" do
     [1, 2, 4, 5].delete(1).should == 1
     [1, 2, 4, 5].delete(3).should == nil
   end
-end
+end

data/{core_spec → spec}/core/array/each_index_spec.rb

@@ -1,6 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
-
 describe "Array#each_index" do
   before :each do
     ScratchPad.record []
@@ -30,4 +27,4 @@ describe "Array#each_index" do
     a.each_index { |i| ScratchPad << i }
     ScratchPad.recorded.should == [0]
   end
-end
+end

data/{core_spec → spec}/core/array/each_spec.rb

@@ -1,6 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
-
 describe "Array#each" do
   it "yields each element to the block" do
     a = []
@@ -8,4 +5,4 @@ describe "Array#each" do
     x.each { |item| a << item }.should equal(x)
     a.should == [1, 2, 3]
   end
-end
+end

data/{core_spec → spec}/core/array/element_reference_spec.rb

@@ -1,6 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
-
 describe "Array#[]" do
   it "returns the element at index with [index]" do
     [ "a", "b", "c", "d", "e" ][1].should == "b"
@@ -106,6 +103,79 @@ describe "Array#[]" do
     a.should == [1, 2, 3]
   end
 
+  it "returns the elements specified by Range indexes with [m..n]" do
+    [ "a", "b", "c", "d", "e" ][1..3].should == ["b", "c", "d"]
+    [ "a", "b", "c", "d", "e" ][4..-1].should == ['e']
+    [ "a", "b", "c", "d", "e" ][3..3].should == ['d']
+    [ "a", "b", "c", "d", "e" ][3..-2].should == ['d']
+    ['a'][0..-1].should == ['a']
+
+
+    a = [1, 2, 3, 4]
+
+    a[0..-10].should == []
+    a[0..0].should == [1]
+    a[0..1].should == [1, 2]
+    a[0..2].should == [1, 2, 3]
+    a[0..3].should == [1, 2, 3, 4]
+    a[0..4].should == [1, 2, 3, 4]
+    a[0..10].should == [1, 2, 3, 4]
+
+    a[2..-10].should == []
+    a[2..0].should == []
+    a[2..2].should == [3]
+    a[2..3].should == [3, 4]
+    a[2..4].should == [3, 4]
+
+    a[3..0].should == []
+    a[3..3].should == [4]
+    a[3..4].should == [4]
+
+    a[4..0].should == []
+    a[4..4].should == []
+    a[4..5].should == []
+
+    a[5..0].should == nil
+    a[5..5].should == nil
+    a[5..6].should == nil
+
+    a.should == [1, 2, 3, 4]
+  end
+
+  it "returns elements specified by Range indexes except the lement at index n with [m...n]" do
+    [ "a", "b", "c", "d", "e" ][1...3].should == ["b", "c"]
+
+    a = [1, 2, 3, 4]
+
+    a[0...-10].should == []
+    a[0...0].should == []
+    a[0...1].should == [1]
+    a[0...2].should == [1, 2]
+    a[0...3].should == [1, 2, 3]
+    a[0...4].should == [1, 2, 3, 4]
+    a[0...10].should == [1, 2, 3, 4]
+
+    a[2...-10].should == []
+    a[2...0].should == []
+    a[2...2].should == []
+    a[2...3].should == [3]
+    a[2...4].should == [3, 4]
+
+    a[3...0].should == []
+    a[3...3].should == []
+    a[3...4].should == [4]
+
+    a[4...0].should == []
+    a[4...4].should == []
+    a[4...5].should == []
+
+    a[5...0].should == nil
+    a[5...5].should == nil
+    a[5...6].should == nil
+
+    a.should == [1, 2, 3, 4]
+  end
+
   it "returns nil for a requested index not in the array with [index]" do
     [ "a", "b", "c", "d", "e" ][5].should == nil
   end
@@ -133,4 +203,4 @@ describe "Array#[]" do
     %w|a b c d e|[2, -2].should == nil
     %w|a b c d e|[1, -100].should == nil
   end
-end
+end