opal 0.3.41 → 0.3.42

data/lib/opal/target_scope.rb

@@ -0,0 +1,257 @@
+module Opal
+  # Instances of TargetScope are used by the parser when a new scope is
+  # being processed. It is used to keep track of used variables,
+  # temp variables and ivars so they can be processed and output
+  # along with the scope implementation.
+  class TargetScope
+
+    # Every scope can have a parent scope
+    attr_accessor :parent
+
+    # The class or module name if this scope is a class scope
+    attr_accessor :name
+
+    # The given block name for a def scope
+    attr_accessor :block_name
+
+    attr_reader :scope_name
+    attr_reader :ivars
+
+    attr_reader :type
+
+    attr_accessor :defines_defn
+    attr_accessor :defines_defs
+
+    # One of - :class, :module, :top, :iter, :def
+    attr_accessor :mid
+
+    # true if singleton def, false otherwise
+    attr_accessor :defs
+
+    # used by modules to know what methods to donate to includees
+    attr_reader :methods
+
+    # uses parents super method
+    attr_accessor :uses_super
+
+    # @param [Symbol] type the scope type (:class, :module, :iter, :def, :top)
+    # @param [Opal::Parser] parser a parser instance used to create this scope
+    def initialize(type, parser)
+      @parser  = parser
+      @type    = type
+      @locals  = []
+      @temps   = []
+      @args    = []
+      @ivars   = []
+      @parent  = nil
+      @queue   = []
+      @unique  = "a"
+      @while_stack = []
+
+      @defines_defs = false
+      @defines_defn = false
+
+      @methods  = []
+
+      @uses_block = false
+
+      # used by classes to store all ivars used in direct def methods
+      @proto_ivars = []
+    end
+
+    # Returns true if this scope is a class/module body scope
+    def class_scope?
+      @type == :class or @type == :module
+    end
+
+    # Returns true if this is strictly a class scope
+    def class?
+      @type == :class
+    end
+
+    # True if this is a module scope
+    def module?
+      @type == :module
+    end
+
+    def sclass?
+      @type == :sclass
+    end
+
+    # Returns true if this is a top scope (main file body)
+    def top?
+      @type == :top
+    end
+
+    # True if a block/iter scope
+    def iter?
+      @type == :iter
+    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
+    def def_in_class?
+      !@defs && @type == :def && @parent && @parent.class?
+    end
+
+    # Inside a class or module scope, the javascript variable name returned
+    # by this function points to the classes' prototype. This is the target
+    # to where methods are actually added inside a class body.
+    def proto
+      "def"
+    end
+
+    # A scope donates its methods if it is a module, or the core Object
+    # class. Modules donate their methods to classes or objects they are
+    # included in. Object donates methods to bridged classes whose native
+    # prototypes do not actually inherit from Opal.Object.prototype.
+    def should_donate?
+      @type == :module or @name.to_s == 'Object'
+    end
+
+    ##
+    # Vars to use inside each scope
+    def to_vars
+      vars = @locals.map { |l| "#{l} = nil" }
+      vars.push(*@temps)
+      current_self = @parser.current_self
+
+      iv = ivars.map do |ivar|
+       "if (#{current_self}#{ivar} == null) #{current_self}#{ivar} = nil;\n"
+      end
+
+      indent = @parser.parser_indent
+      res = vars.empty? ? '' : "var #{vars.join ', '};"
+      str = ivars.empty? ? res : "#{res}\n#{indent}#{iv.join indent}"
+
+      if class? and !@proto_ivars.empty?
+        pvars = @proto_ivars.map { |i| "#{proto}#{i}"}.join(' = ')
+        "%s\n%s%s = nil;" % [str, indent, pvars]
+      else
+        str
+      end
+    end
+
+    # Generates code for this module to donate methods
+    def to_donate_methods
+      if should_donate? and !@methods.empty?
+        "%s;#{@name}._donate([%s]);" % [@parser.parser_indent, @methods.map(&:inspect).join(', ')]
+      else
+        ""
+      end
+    end
+
+    def add_ivar(ivar)
+      if def_in_class?
+        @parent.add_proto_ivar ivar
+      else
+        @ivars << ivar unless @ivars.include? ivar
+      end
+    end
+
+    def add_proto_ivar(ivar)
+      @proto_ivars << ivar unless @proto_ivars.include? ivar
+    end
+
+    def add_arg(arg)
+      @args << arg unless @args.include? arg
+    end
+
+    def add_local(local)
+      return if has_local? local
+
+      @locals << local
+    end
+
+    def has_local?(local)
+      return true if @locals.include? local or @args.include? local
+      return @parent.has_local?(local) if @parent and @type == :iter
+
+      false
+    end
+
+    def add_temp(*tmps)
+      @temps.push(*tmps)
+    end
+
+    def has_temp?(tmp)
+      @temps.include? tmp
+    end
+
+    def new_temp
+      return @queue.pop unless @queue.empty?
+
+      tmp = "_#{@unique}"
+      @unique = @unique.succ
+      @temps << tmp
+      tmp
+    end
+
+    def queue_temp(name)
+      @queue << name
+    end
+
+    def push_while
+      info = {}
+      @while_stack.push info
+      info
+    end
+
+    def pop_while
+      @while_stack.pop
+    end
+
+    def in_while?
+      !@while_stack.empty?
+    end
+
+    def uses_block!
+      if @type == :iter && @parent
+        @parent.uses_block!
+      else
+        @uses_block = true
+        identify!
+      end
+    end
+
+    def identify!
+      return @identity if @identity
+
+      @identity = @parser.unique_temp
+      @parent.add_temp @identity if @parent
+
+      @identity
+    end
+
+    def identity
+      @identity
+    end
+
+    def get_super_chain
+      chain, scope, defn, mid = [], self, 'null', '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 uses_block?
+      @uses_block
+    end
+  end
+end
+

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.3.41'
+  VERSION = '0.3.42'
 end

data/opal.gemspec

@@ -12,7 +12,11 @@ Gem::Specification.new do |s|
 
   s.files          = `git ls-files`.split("\n")
   s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_paths  = ['lib'] 
+  s.require_paths  = ['lib']
 
-  s.add_runtime_dependency 'sprockets' 
+  s.add_dependency 'rake'
+  s.add_dependency 'racc'
+  s.add_dependency 'opal-sprockets'
+
+  s.add_development_dependency 'mspec', '1.5.18'
 end

data/opal/opal-parser.js.erb

@@ -1,7 +1,8 @@
+<% require_asset 'opal/browser_loader' %>
 <% require_asset 'opal/racc' %>
 <% require_asset 'opal/strscan' %>
 
 // We need (some) of the libs from our real ruby parser (not in sprockets load path)
-<% %w(opal/grammar opal/lexer opal/parser opal/scope opal).each do |f| %>
-  <%= Opal.parse File.read(File.join Opal.core_dir, '..', 'lib', "#{f}.rb") %>
+<% %w(opal/grammar opal/lexer opal/parser opal/target_scope opal/core_ext opal/lexer_scope opal/grammar_helpers opal/parser opal).each do |f| %>
+<%= Opal.parse File.read(File.join Opal.core_dir, '..', 'lib', "#{f}.rb") %>
 <% end %>

data/opal/opal.rb

@@ -1,21 +1,21 @@
-require 'opal/runtime'
-require 'opal/class'
-require 'opal/basic_object'
-require 'opal/kernel'
-require 'opal/nil_class'
-require 'opal/boolean'
-require 'opal/error'
-require 'opal/regexp'
-require 'opal/comparable'
-require 'opal/enumerable'
-require 'opal/array'
-require 'opal/hash'
-require 'opal/string'
-require 'opal/numeric'
-require 'opal/proc'
-require 'opal/range'
-require 'opal/time'
-require 'opal/json'
+#= require opal/runtime
+#= require opal/class
+#= require opal/basic_object
+#= require opal/kernel
+#= require opal/nil_class
+#= require opal/boolean
+#= require opal/error
+#= require opal/regexp
+#= require opal/comparable
+#= require opal/enumerable
+#= require opal/array
+#= require opal/hash
+#= require opal/string
+#= require opal/numeric
+#= require opal/proc
+#= require opal/range
+#= require opal/time
+#= require opal/json
 
 # regexp matches
 $~ = nil
@@ -23,6 +23,8 @@ $~ = nil
 # split lines
 $/ = "\n"
 
+$stderr = $stdout = Object.new
+
 RUBY_ENGINE   = 'opal'
 RUBY_PLATFORM = 'opal'
 

data/opal/opal/array.rb

@@ -421,7 +421,7 @@ class Array < `Array`
         return block(original);
       }
 
-      #{ raise "Array#fetch" };
+      #{ raise IndexError, "Array#fetch" };
     }
   end
 
@@ -536,7 +536,7 @@ class Array < `Array`
           index += #{self}.length + 1;
 
           if (index < 0) {
-            #{ raise "#{index} is out of bounds" };
+            #{ raise IndexError, "#{index} is out of bounds" };
           }
         }
         if (index > #{self}.length) {
@@ -606,12 +606,25 @@ class Array < `Array`
   def last(count = undefined)
     %x{
       var length = #{self}.length;
-
+      
+      if (count === nil || typeof(count) == 'string') { 
+        #{ raise TypeError, "no implicit conversion to integer" };
+      }
+        
+      if (typeof(count) == 'object') {
+        if (typeof(count['$to_int']) == 'function') {
+          count = count['$to_int']();
+        } 
+        else {
+          #{ raise TypeError, "no implicit conversion to integer" };
+        }
+      }
+      
       if (count == null) {
         return length === 0 ? nil : #{self}[length - 1];
       }
       else if (count < 0) {
-        #{ raise "negative count given" };
+        #{ raise ArgumentError, "negative count given" };
       }
 
       if (count > length) {
@@ -705,16 +718,12 @@ class Array < `Array`
     }
   end
 
-  alias_native :reverse, :reverse
-
-  def reverse!
-    %x{
-      #{self}.splice(0);
-      #{self}.push.apply(#{self}, #{reverse});
-      return #{self};
-    }
+  def reverse
+    `#{self}.slice(0).reverse()`
   end
 
+  alias_native :reverse!, :reverse
+
   def reverse_each(&block)
     reverse.each &block
 

data/opal/opal/basic_object.rb

@@ -11,10 +11,11 @@ class BasicObject
       var func = #{self}['$' + symbol]
 
       if (func) {
-        if (block !== nil) { args.push(block); }
+        if (block !== nil) { func._p = block; }
         return func.apply(#{self}, args);
       }
 
+      if (block !== nil) { #{self}.$method_missing._p = block; }
       return #{self}.$method_missing.apply(#{self}, [symbol].concat(args));
     }
   end

data/opal/opal/boolean.rb

@@ -31,3 +31,6 @@ class Boolean < `Boolean`
     `(#{self} == true) ? 'true' : 'false'`
   end
 end
+
+TrueClass = Boolean
+FalseClass = Boolean

data/opal/opal/browser_loader.js

@@ -0,0 +1,57 @@
+(function() {
+  // quick exit if not insde browser
+  if (typeof(window) === 'undefined' || typeof(document) === 'undefined') {
+    return;
+  }
+
+  function findRubyScripts() {
+    var all = document.getElementsByTagName('script');
+    for (var i = 0, script; i < all.length; i++) {
+      script = all[i];
+      if (script.type === 'text/ruby') {
+        if (script.src) {
+          request(script.src, function(result) {
+            runRuby(result);
+          });
+        }
+        else {
+          runRuby(script.innerHTML);
+        }
+      }
+      else if (script.type === 'text/erb') {
+        runERB(script.innerHTML);
+      }
+    }
+  }
+
+  function runRuby(source) {
+    var js = Opal.Opal.Parser.$new().$parse(source);
+    eval(js);
+  }
+
+  function request(url, callback) {
+    var xhr = new (window.ActiveXObject || XMLHttpRequest)('Microsoft.XMLHTTP');
+    xhr.open('GET', url, true);
+    if ('overrideMimeType' in xhr) {
+      xhr.overrideMimeType('text/plain');
+    }
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState === 4) {
+        if (xhr.status === 0 || xhr.status === 200) {
+          callback(xhr.responseText);
+        }
+        else {
+          throw new Error('Could not load ruby at: ' + url);
+        }
+      }
+    };
+    xhr.send(null);
+  }
+
+  if (window.addEventListener) {
+    window.addEventListener('DOMContentLoaded', findRubyScripts, false);
+  }
+  else {
+    window.attachEvent('onload', findRubyScripts);
+  }
+})();