opal 0.4.3 → 0.4.4

data/lib/opal/require_parser.rb

@@ -28,7 +28,7 @@ module Opal
     def handle_require(sexp)
       str = handle_require_sexp sexp
       @requires << str unless str.nil? if @requires
-      fragment("", sexp)
+      f("", sexp)
     end
 
     def handle_require_sexp(sexp)

data/lib/opal/source_map.rb

@@ -3,45 +3,31 @@ require 'source_map'
 
 module Opal
   class SourceMap
-    LINE_REGEXP = %r{/\*:(\d+)\*/}.freeze
-    FILE_REGEXP = %r{/\*-file:(.+?)-\*/}.freeze
+    attr_reader :fragments
+    attr_reader :file
 
-    attr_reader :generated, :file
-
-    def initialize generated, file
-      @generated = generated
+    def initialize(fragments, file)
+      @fragments = fragments
       @file = file
     end
 
     def map
       @map ||= ::SourceMap.new.tap do |map|
-        source_file = file
-        generated.lines.each_with_index do |line, index|
-          generated_line = index+1
-          if line =~ FILE_REGEXP
-            source_file = "file://#{$1}"
-            map.add_mapping(
-              :generated_line => generated_line,
-              :generated_col  => 0,
-              :source_line    => 1,
-              :source_col     => 0,
-              :source         => source_file
-            )
-          end
+        line, column = 1, 0
 
-          pos = 0
-          while (pos = line.index(LINE_REGEXP, pos))
-            pos          += $~.size
-            source_line   = $1.to_i + 1
-            source_col    = 0 # until column info will be available
-            generated_col = pos
+        @fragments.each do |fragment|
+          if source_line = fragment.line
             map.add_mapping(
-              :generated_line => generated_line,
-              :generated_col  => generated_col,
+              :generated_line => line,
+              :generated_col  => column,
               :source_line    => source_line,
-              :source_col     => source_col,
-              :source         => source_file
+              :source_col     => 0,
+              :source         => file
             )
+
+            new_lines = fragment.code.count "\n"
+            line += new_lines
+            column = 0
           end
         end
       end
@@ -59,5 +45,4 @@ module Opal
       "\n//@ sourceMappingURL=file://#{map_path}"
     end
   end
-
 end

data/lib/opal/target_scope.rb

@@ -33,6 +33,9 @@ module Opal
 
     # uses parents super method
     attr_accessor :uses_super
+    attr_accessor :uses_zuper
+
+    attr_accessor :catch_return
 
     # @param [Symbol] type the scope type (:class, :module, :iter, :def, :top)
     # @param [Opal::Parser] parser a parser instance used to create this scope
@@ -88,6 +91,10 @@ module Opal
       @type == :iter
     end
 
+    def def?
+      @type == :def
+    end
+
     # Is this a normal def method directly inside a class? This is
     # used for optimizing ivars as we can set them to nil in the
     # class body
@@ -133,19 +140,19 @@ module Opal
         result = str
       end
 
-      fragment(result)
+      f(result)
     end
 
-    def fragment(code, sexp = nil)
-      @parser.fragment code
+    def f(code, sexp = nil)
+      @parser.f code
     end
 
     # Generates code for this module to donate methods
     def to_donate_methods
       if should_donate? and !@methods.empty?
-        fragment("%s;__opal.donate(#{@name}, [%s]);" % [@parser.parser_indent, @methods.map(&:inspect).join(', ')])
+        f("%s;$opal.donate(#{@name}, [%s]);" % [@parser.parser_indent, @methods.map(&:inspect).join(', ')])
       else
-        fragment("")
+        f("")
       end
     end
 
@@ -163,6 +170,7 @@ module Opal
 
     def add_arg(arg)
       @args << arg unless @args.include? arg
+      arg
     end
 
     def add_local(local)
@@ -235,6 +243,17 @@ module Opal
       @identity
     end
 
+    def find_parent_def
+      scope = self
+      while scope = scope.parent
+        if scope.def?
+          return scope
+        end
+      end
+
+      nil
+    end
+
     def get_super_chain
       chain, scope, defn, mid = [], self, 'null', 'null'
 

data/lib/opal/version.rb

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

data/mri_spec/cli_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../spec_helper', __FILE__)
+require 'opal/cli'
+require 'stringio'
+
+describe Opal::CLI do
+  let(:output) { StringIO.new }
+
+  context 'with a file' do
+    let(:file) { File.expand_path('../fixtures/opal_file.rb', __FILE__) }
+    subject(:cli) { described_class.new(file, :output => output) }
+
+    it 'runs the file' do
+      cli.run
+      output.rewind
+      expect(output.read).to eq("hi from opal!\n")
+    end
+  end
+end

data/mri_spec/fixtures/opal_file.rb

@@ -0,0 +1,2 @@
+require 'opal'
+puts 'hi from opal!'

data/mri_spec/spec_helper.rb

@@ -0,0 +1,17 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

data/opal.gemspec

@@ -1,5 +1,7 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/opal/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'opal/version'
 
 Gem::Specification.new do |s|
   s.name         = 'opal'
@@ -22,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'racc'
   s.add_development_dependency 'opal-sprockets', '~> 0.1.1'
+  s.add_development_dependency 'rspec', '~> 2.14'
 end

data/spec/filters/bugs/array/combination.rb

@@ -0,0 +1,11 @@
+opal_filter "Array#combination" do
+  fails "Array#combination generates from a defensive copy, ignoring mutations"
+  fails "Array#combination yields a partition consisting of only singletons"
+  fails "Array#combination yields [] when length is 0"
+  fails "Array#combination yields a copy of self if the argument is the size of the receiver"
+  fails "Array#combination yields nothing if the argument is out of bounds"
+  fails "Array#combination yields the expected combinations"
+  fails "Array#combination yields nothing for out of bounds length and return self"
+  fails "Array#combination returns self when a block is given"
+  fails "Array#combination returns an enumerator when no block is provided"
+end

data/spec/filters/bugs/array/count.rb

@@ -0,0 +1,3 @@
+opal_filter "Array#count" do
+  fails "Array#count returns the number of element for which the block evaluates to true"
+end

data/spec/filters/bugs/array/delete_if.rb

@@ -0,0 +1,3 @@
+opal_filter "Array#delete_if" do
+  fails "Array#delete_if returns an Enumerator if no block given, and the enumerator can modify the original array"
+end

data/spec/filters/bugs/array/drop.rb

@@ -0,0 +1,3 @@
+opal_filter "Array#drop" do
+  fails "Array#drop raises an ArgumentError if the number of elements specified is negative"
+end

data/spec/filters/bugs/array/drop_while.rb

@@ -0,0 +1,5 @@
+opal_filter "Array#drop_while" do
+  fails "Array#drop_while removes elements from the start of the array until the block returns false"
+  fails "Array#drop_while removes elements from the start of the array until the block returns nil"
+  fails "Array#drop_while removes elements from the start of the array while the block evaluates to true"
+end

data/spec/filters/bugs/array/eql.rb

@@ -0,0 +1,3 @@
+opal_filter "Array#eql?" do
+  fails "Array#eql? returns false if any corresponding elements are not #eql?"
+end

data/spec/filters/bugs/array/flatten.rb

@@ -0,0 +1,9 @@
+opal_filter "Array#flatten" do
+  fails "Array#flatten raises a TypeError when the passed Object can't be converted to an Integer"
+  fails "Array#flatten tries to convert passed Objects to Integers using #to_int"
+end
+
+opal_filter "Array#flatten!" do
+  fails "Array#flatten! raises a TypeError when the passed Object can't be converted to an Integer"
+  fails "Array#flatten! tries to convert passed Objects to Integers using #to_int"
+end

data/spec/filters/bugs/array/minus.rb

@@ -0,0 +1,5 @@
+opal_filter "Array#-" do
+  fails "Array#- removes an identical item even when its #eql? isn't reflexive"
+  fails "Array#- doesn't remove an item with the same hash but not #eql?"
+  fails "Array#- removes an item identified as equivalent via #hash and #eql?"
+end

data/spec/filters/bugs/array/multipliy.rb

@@ -0,0 +1,9 @@
+opal_filter "Array#*" do
+  fails "Array#* with an integer with a subclass of Array returns a subclass instance"
+  fails "Array#* with an integer raises an ArgumentError when passed a negative integer"
+  fails "Array#* raises a TypeError is the passed argument is nil"
+  fails "Array#* converts the passed argument to a String rather than an Integer"
+  fails "Array#* raises a TypeError if the argument can neither be converted to a string nor an integer"
+  fails "Array#* tires to convert the passed argument to an Integer using #to_int"
+  fails "Array#* tries to convert the passed argument to a String using #to_str"
+end

data/spec/filters/bugs/array/new.rb

@@ -0,0 +1,3 @@
+opal_filter "Array.new" do
+  fails "Array.new with (size, object=nil) raises an ArgumentError if size is too large"
+end

data/spec/filters/bugs/array/pop.rb

@@ -0,0 +1,6 @@
+opal_filter "Array#pop" do
+  fails "Array#pop passed a number n as an argument raises an ArgumentError if more arguments are passed"
+  fails "Array#pop passed a number n as an argument raises a TypeError when the passed n can be coerced to Integer"
+  fails "Array#pop passed a number n as an argument tries to convert n to an Integer using #to_int"
+  fails "Array#pop passed a number n as an argument raises an ArgumentError if n is negative"
+end

data/spec/filters/bugs/array/rassoc.rb

@@ -0,0 +1,4 @@
+opal_filter "Array#rassoc" do
+  fails "Array#rassoc does not check the last element in each contained but speficically the second"
+  fails "Array#rassoc calls elem == obj on the second element of each contained array"
+end

data/spec/filters/bugs/array/rindex.rb

@@ -0,0 +1,6 @@
+opal_filter "Array#rindex" do
+  fails "Array#rindex given no argument and no block produces an Enumerator"
+  fails "Array#rindex rechecks the array size during iteration"
+  fails "Array#rindex ignore the block if there is an argument"
+  fails "Array#rindex returns the first index backwards from the end where element == to object"
+end

data/spec/filters/bugs/array/select.rb

@@ -0,0 +1,3 @@
+opal_filter "Array#select" do
+  fails "Array#select returns a new array of elements for which block is true"
+end

data/spec/filters/bugs/array/shift.rb

@@ -0,0 +1,7 @@
+opal_filter "Array#shift" do
+  fails "Array#shift passed a number n as an argument raises an ArgumentError if more arguments are passed"
+  fails "Array#shift passed a number n as an argument raises a TypeError when the passed n can be coerced to Integer"
+  fails "Array#shift passed a number n as an argument tries to convert n to an Integer using #to_int"
+  fails "Array#shift passed a number n as an argument raises an ArgumentError if n is negative"
+  fails "Array#shift passed a number n as an argument returns a new empty array if there are no more elements"
+end

data/spec/filters/bugs/array/shuffle.rb

@@ -0,0 +1,11 @@
+opal_filter "Array#shuffle" do
+  fails "Array#shuffle uses given random generator"
+  fails "Array#shuffle uses default random generator"
+  fails "Array#shuffle attempts coercion via #to_hash"
+  fails "Array#shuffle is not destructive"
+  fails "Array#shuffle returns the same values, in a usually different order"
+end
+
+opal_filter "Array#shuffle!" do
+  fails "Array#shuffle! returns the same values, in a usually different order"
+end

data/spec/filters/bugs/array/slice.rb

@@ -0,0 +1,7 @@
+opal_filter "Array#slice!" do
+  fails "Array#slice! does not expand array with negative indices out of bounds"
+  fails "Array#slice! does not expand array with indices out of bounds"
+  fails "Array#slice! calls to_int on range arguments"
+  fails "Array#slice! removes and return elements in range"
+  fails "Array#slice! calls to_int on start and length arguments"
+end

data/spec/filters/bugs/array/take.rb

@@ -0,0 +1,3 @@
+opal_filter "Array#take" do
+  fails "Array#take raises an ArgumentError when the argument is negative"
+end

data/spec/filters/bugs/array/to_a.rb

@@ -0,0 +1,3 @@
+opal_filter "Array#to_a" do
+  fails "Array#to_a does not return subclass instance on Array subclasses"
+end

data/spec/filters/bugs/array/try_convert.rb

@@ -0,0 +1,7 @@
+opal_filter "Array.try_convert" do
+  fails "Array.try_convert does not rescue exceptions raised by #to_ary"
+  fails "Array.try_convert sends #to_ary to the argument and raises TypeError if it's not a kind of Array"
+  fails "Array.try_convert sends #to_ary to the argument and returns the result if it's a kind of Array"
+  fails "Array.try_convert sends #to_ary to the argument and returns the result if it's an Array"
+  fails "Array.try_convert sends #to_ary to the argument and returns the result if it's nil"
+end

data/spec/filters/bugs/array/uniq.rb

@@ -0,0 +1,10 @@
+opal_filter "Array#uniq" do
+  fails "Array#uniq compares elements based on the value returned from the block"
+  fails "Array#uniq compares elements with matching hash codes with #eql?"
+  fails "Array#uniq uses eql? semantics"
+end
+
+opal_filter "Array#uniq!" do
+  fails "Array#uniq! compares elements based on the value returned from the block"
+  fails "Array#uniq! properly handles recursive arrays"
+end

data/spec/filters/bugs/array/zip.rb

@@ -0,0 +1,4 @@
+opal_filter "Array#zip" do
+  fails "Array#zip calls #to_ary to convert the argument to an Array"
+  fails "Array#zip uses #each to extract arguments' elements when #to_ary fails"
+end

data/spec/{rubyspec/filters → filters}/bugs/array_delete.rb

@@ -1,3 +1,4 @@
 opal_filter "Array#delete accepting blocks" do
   fails "Array#delete may be given a block that is executed if no element matches object"
+  fails "Array#delete returns the last element in the array for which object is equal under #=="
 end

data/spec/filters/bugs/case.rb

@@ -0,0 +1,4 @@
+opal_filter "case" do
+  fails "The 'case'-construct lets you define a method after the case statement"
+  fails "The 'case'-construct with no target expression evaluates true as only 'true' when true is the first clause"
+end

data/spec/filters/bugs/enumerable_sort_by.rb

@@ -0,0 +1,3 @@
+opal_filter "Enumerable#sort_by" do
+  fails "Enumerable#sort_by returns an Enumerator when a block is not supplied"
+end

data/spec/filters/bugs/kernel/rand.rb

@@ -0,0 +1,4 @@
+opal_filter "Kernel#rand" do
+  fails "Kernel.rand returns a float if no argument is passed"
+  fails "Kernel.rand returns an integer for an integer argument"
+end

data/spec/filters/bugs/language/array.rb

@@ -0,0 +1,3 @@
+opal_filter "array" do
+  fails "The unpacking splat operator (*) when applied to a non-Array value attempts to coerce it to Array if the object respond_to?(:to_a)"
+end