ruby2js 1.9.3 → 1.10.0

data/README.md

@@ -156,6 +156,7 @@ the script.
     * `.last(n)` becomes `.slice(*.length-1, *.length)`
     * `.max` becomes `Math.max.apply(Math)`
     * `.min` becomes `Math.min.apply(Math)`
+    * `.nil?` becomes `== null`
     * `.ord` becomes `charCodeAt(0)`
     * `puts` becomes `console.log`
     * `.replace` becomes `.length = 0; ...push.apply(*)`
@@ -178,6 +179,9 @@ the script.
     * for the following methods, if the block consists entirely of a simple
       expression (or ends with one), a `return` is added prior to the
       expression: `sub`, `gsub`, `any?`, `all?`, `map`.
+    * New classes subclassed off of `Exception` will become subclassed off
+      of `Error` instead; and default constructors will be provided
+    * `loop do...end` will be replaced with `while (true) {...}`
 
 * [underscore](https://github.com/rubys/ruby2js/blob/master/lib/ruby2js/filter/underscore.rb)
 

data/lib/ruby2js/converter.rb

@@ -4,7 +4,7 @@ module Ruby2JS
   class Converter
     LOGICAL   = :and, :not, :or
     OPERATORS = [:[], :[]=], [:not, :!], [:*, :/, :%], [:+, :-], [:>>, :<<], 
-      [:<=, :<, :>, :>=], [:==, :!=, :===, :"!=="], [:and, :or]
+      [:&], [:^, :|], [:<=, :<, :>, :>=], [:==, :!=, :===, :"!=="], [:and, :or]
     
     INVERT_OP = {
       :<  => :>=,
@@ -24,6 +24,7 @@ module Ruby2JS
       @nl = ''
       @ws = ' '
       @varstack = []
+      @rbstack = []
       @width = 80
       @next_token = :return
 

data/lib/ruby2js/converter/block.rb

@@ -8,9 +8,24 @@ module Ruby2JS
     #   (lvar :a))
 
     handle :block do |call, args, block|
-      block ||= s(:begin)
-      function = s(:def, nil, args, block)
-      parse s(:send, *call.children, function)
+
+      if
+        @state == :statement and args.children.length == 1 and
+        call.children.first and call.children.first.type == :begin and
+        [:irange, :erange].include? call.children.first.children.first.type
+      then
+        var = args.children.first
+        expression = call.children.first.children.first
+        comp = (expression.type == :irange ? '<=' : '<')
+        "for (var #{parse var} = #{ parse expression.children.first }; " +
+          "#{ parse var } #{ comp } #{ parse expression.children.last }; " +
+          "#{ parse var } += #{ parse call.children[2] }) " +
+          "{#@nl#{ scope block }#@nl}"
+      else
+        block ||= s(:begin)
+        function = s(:def, nil, args, block)
+        parse s(:send, *call.children, function)
+      end
     end
   end
 end

data/lib/ruby2js/converter/class.rb

@@ -22,6 +22,7 @@ module Ruby2JS
       end
 
       body.compact!
+      visible = {}
       body.map! do |m| 
         if m.type == :def
           if m.children.first == :initialize
@@ -35,6 +36,8 @@ module Ruby2JS
                 {enumerable: s(:true), configurable: s(:true),
                 set: s(:block, s(:send, nil, :proc), *m.children[1..-1])})
           else
+            visible[m.children[0]] = s(:self)
+
             if not m.is_method?
               # property getter
               s(:prop, s(:attr, name, :prototype), m.children.first =>
@@ -122,7 +125,12 @@ module Ruby2JS
             *m.children[1..-1])
         elsif m.type == :casgn and m.children[0] == nil
           # class constant
+          visible[m.children[1]] = name
           s(:send, name, "#{m.children[1]}=", *m.children[2..-1])
+        elsif m.type == :alias
+          s(:send, s(:attr, name, :prototype),
+            "#{m.children[0].children.first}=", 
+            s(:attr, s(:attr, name, :prototype), m.children[1].children.first))
         else
           raise NotImplementedError, "class #{ m.type }"
         end
@@ -178,13 +186,19 @@ module Ruby2JS
         # save class name
         class_name, @class_name = @class_name, name
         class_parent, @class_parent = @class_parent, inheritance
+
         # inhibit ivar substitution within a class definition.  See ivars.rb
         ivars, self.ivars = self.ivars, nil
+
+        # add locally visible interfaces to rbstack.  See send.rb, const.rb
+        @rbstack.push visible
+
         parse s(:begin, *body.compact)
       ensure
         self.ivars = ivars
         @class_name = class_name
         @class_parent = class_parent
+        @rbstack.pop
       end
     end
 

data/lib/ruby2js/converter/const.rb

@@ -4,6 +4,9 @@ module Ruby2JS
     # (const nil :C)
 
     handle :const do |receiver, name|
+      # resolve anonymous receivers against rbstack
+      receiver ||= @rbstack.map {|rb| rb[name]}.compact.last
+
       "#{ parse receiver }#{ '.' if receiver }#{ name }"
     end
   end

data/lib/ruby2js/converter/kwbegin.rb

@@ -18,24 +18,64 @@ module Ruby2JS
       end
 
       if block and block.type == :rescue
-        body, recover, otherwise = block.children
+        body, *recovers, otherwise = block.children
         raise NotImplementedError, "block else" if otherwise
-        exception, name, recovery = recover.children
-        raise NotImplementedError, parse(exception) if exception
+
+        if recovers.any? {|recover| not recover.children[1]}
+          raise NotImplementedError, "recover without exception variable"
+        end
+
+        var = recovers.first.children[1]
+
+        if recovers.any? {|recover| recover.children[1] != var}
+          raise NotImplementedError, 
+            "multiple recovers with different exception variables"
+        end
       else
         body = block
       end
 
       output = "try {#@nl#{ parse body, :statement }#@nl}"
 
-      if recovery
-        output += " catch (#{ parse name }) " +
-          "{#@nl#{ parse recovery, :statement }#@nl}"
+      if recovers
+        if recovers.length == 1 and not recovers.first.children.first
+          # single catch with no exception named
+          output += " catch (#{ parse var }) " +
+            "{#@nl#{ parse recovers.first.children.last, :statement }#@nl}"
+        else
+          output += " catch (#{ parse var }) {#@nl"
+
+          first = true
+          recovers.each do |recover|
+            exceptions, var, recovery = recover.children
+
+            if exceptions
+              tests = exceptions.children.map do |exception|
+                "#{ parse var} instanceof #{ parse exception }"
+              end
+
+              output += "} else " if not first
+              first = false
+
+              output += "if (#{ tests.join(' || ') }) {#@nl"
+            else
+              output += "} else {#@nl"
+            end
+
+            output += "#{ parse recovery, :statement }#@nl"
+          end
+
+          if recovers.last.children.first
+            output += "} else {#{@nl}throw #{ parse var }#@nl"
+          end
+
+          output += "}#@nl}"
+        end
       end
 
       output += " finally {#@nl#{ parse finally, :statement }#@nl}" if finally
 
-      if recovery or finally
+      if recovers or finally
         output
       else
         parse s(:begin, *children)

data/lib/ruby2js/converter/send.rb

@@ -42,6 +42,9 @@ module Ruby2JS
         target = args.first 
       end
 
+      # resolve anonymous receivers against rbstack
+      receiver ||= @rbstack.map {|rb| rb[method]}.compact.last
+
       if receiver
         group_receiver = receiver.type == :send &&
           op_index < operator_index( receiver.children[1] ) if receiver

data/lib/ruby2js/filter/functions.rb

@@ -87,6 +87,9 @@ module Ruby2JS
         elsif method == :empty? and args.length == 0
           process s(:send, s(:attr, target, :length), :==, s(:int, 0))
 
+        elsif method == :nil? and args.length == 0
+          process s(:send, target, :==, s(:nil))
+
         elsif [:start_with?, :end_with?].include? method and args.length == 1
           if args.first.type == :str
             length = s(:int, args.first.children.first.length)
@@ -251,6 +254,34 @@ module Ruby2JS
             s(:block, s(:send, target, method, *call.children[2..-1]),
             *node.children[1..-1]))))
 
+        elsif node.children[0..1] == [s(:send, nil, :loop), s(:args)]
+          # input: loop {statements}
+          # output: while(true) {statements}
+          s(:while, s(:true), node.children[2])
+
+        else
+          super
+        end
+      end
+
+      def on_class(node)
+        name, inheritance, *body = node.children
+        body.compact!
+
+        if inheritance == s(:const, nil, :Exception)
+          unless 
+            body.any? {|statement| statement.type == :def and
+            statement.children.first == :initialize}
+          then
+            body.unshift s(:def, :initialize, s(:args, s(:arg, :message)),
+              s(:begin, s(:send, s(:self), :message=, s(:lvar, :message)),
+              s(:send, s(:self), :name=, s(:sym, name.children[1])),
+              s(:send, s(:self), :stack=, s(:send, s(:send, nil, :Error,
+              s(:lvar, :message)), :stack))))
+          end
+
+          body = [s(:begin, *body)] if body.length > 1
+          s(:class, name, s(:const, nil, :Error), *body)
         else
           super
         end

data/lib/ruby2js/version.rb

@@ -1,8 +1,8 @@
 module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 9
-    TINY  = 3
+    MINOR = 10
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/ruby2js.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby2js"
-  s.version = "1.9.3"
+  s.version = "1.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2014-10-04"
+  s.date = "2014-10-25"
   s.description = "    The base package maps Ruby syntax to JavaScript semantics.\n    Filters may be provided to add Ruby-specific or framework specific\n    behavior.\n"
   s.email = "rubys@intertwingly.net"
-  s.files = ["ruby2js.gemspec", "README.md", "lib/ruby2js", "lib/ruby2js/converter.rb", "lib/ruby2js/version.rb", "lib/ruby2js/filter", "lib/ruby2js/filter/jquery.rb", "lib/ruby2js/filter/return.rb", "lib/ruby2js/filter/underscore.rb", "lib/ruby2js/filter/angularrb.rb", "lib/ruby2js/filter/minitest-jasmine.rb", "lib/ruby2js/filter/strict.rb", "lib/ruby2js/filter/functions.rb", "lib/ruby2js/filter/angular-resource.rb", "lib/ruby2js/filter/angular-route.rb", "lib/ruby2js/sinatra.rb", "lib/ruby2js/rails.rb", "lib/ruby2js/cgi.rb", "lib/ruby2js/converter", "lib/ruby2js/converter/self.rb", "lib/ruby2js/converter/arg.rb", "lib/ruby2js/converter/dstr.rb", "lib/ruby2js/converter/xstr.rb", "lib/ruby2js/converter/sym.rb", "lib/ruby2js/converter/return.rb", "lib/ruby2js/converter/break.rb", "lib/ruby2js/converter/for.rb", "lib/ruby2js/converter/defined.rb", "lib/ruby2js/converter/cvasgn.rb", "lib/ruby2js/converter/whilepost.rb", "lib/ruby2js/converter/logical.rb", "lib/ruby2js/converter/args.rb", "lib/ruby2js/converter/def.rb", "lib/ruby2js/converter/prototype.rb", "lib/ruby2js/converter/class.rb", "lib/ruby2js/converter/opasgn.rb", "lib/ruby2js/converter/module.rb", "lib/ruby2js/converter/kwbegin.rb", "lib/ruby2js/converter/send.rb", "lib/ruby2js/converter/boolean.rb", "lib/ruby2js/converter/masgn.rb", "lib/ruby2js/converter/hash.rb", "lib/ruby2js/converter/cvar.rb", "lib/ruby2js/converter/ivasgn.rb", "lib/ruby2js/converter/case.rb", "lib/ruby2js/converter/const.rb", "lib/ruby2js/converter/vasgn.rb", "lib/ruby2js/converter/untilpost.rb", "lib/ruby2js/converter/begin.rb", "lib/ruby2js/converter/ivar.rb", "lib/ruby2js/converter/while.rb", "lib/ruby2js/converter/next.rb", "lib/ruby2js/converter/nil.rb", "lib/ruby2js/converter/blockpass.rb", "lib/ruby2js/converter/super.rb", "lib/ruby2js/converter/defs.rb", "lib/ruby2js/converter/array.rb", "lib/ruby2js/converter/block.rb", "lib/ruby2js/converter/if.rb", "lib/ruby2js/converter/until.rb", "lib/ruby2js/converter/regexp.rb", "lib/ruby2js/converter/casgn.rb", "lib/ruby2js/converter/undef.rb", "lib/ruby2js/converter/literal.rb", "lib/ruby2js/converter/var.rb", "lib/ruby2js.rb"]
+  s.files = ["ruby2js.gemspec", "README.md", "lib/ruby2js.rb", "lib/ruby2js", "lib/ruby2js/converter.rb", "lib/ruby2js/version.rb", "lib/ruby2js/cgi.rb", "lib/ruby2js/rails.rb", "lib/ruby2js/converter", "lib/ruby2js/converter/prototype.rb", "lib/ruby2js/converter/begin.rb", "lib/ruby2js/converter/undef.rb", "lib/ruby2js/converter/kwbegin.rb", "lib/ruby2js/converter/const.rb", "lib/ruby2js/converter/self.rb", "lib/ruby2js/converter/class.rb", "lib/ruby2js/converter/untilpost.rb", "lib/ruby2js/converter/while.rb", "lib/ruby2js/converter/blockpass.rb", "lib/ruby2js/converter/array.rb", "lib/ruby2js/converter/for.rb", "lib/ruby2js/converter/hash.rb", "lib/ruby2js/converter/block.rb", "lib/ruby2js/converter/def.rb", "lib/ruby2js/converter/nil.rb", "lib/ruby2js/converter/if.rb", "lib/ruby2js/converter/break.rb", "lib/ruby2js/converter/send.rb", "lib/ruby2js/converter/module.rb", "lib/ruby2js/converter/defs.rb", "lib/ruby2js/converter/ivar.rb", "lib/ruby2js/converter/var.rb", "lib/ruby2js/converter/case.rb", "lib/ruby2js/converter/literal.rb", "lib/ruby2js/converter/super.rb", "lib/ruby2js/converter/opasgn.rb", "lib/ruby2js/converter/return.rb", "lib/ruby2js/converter/arg.rb", "lib/ruby2js/converter/regexp.rb", "lib/ruby2js/converter/args.rb", "lib/ruby2js/converter/until.rb", "lib/ruby2js/converter/dstr.rb", "lib/ruby2js/converter/vasgn.rb", "lib/ruby2js/converter/whilepost.rb", "lib/ruby2js/converter/xstr.rb", "lib/ruby2js/converter/defined.rb", "lib/ruby2js/converter/next.rb", "lib/ruby2js/converter/ivasgn.rb", "lib/ruby2js/converter/cvasgn.rb", "lib/ruby2js/converter/logical.rb", "lib/ruby2js/converter/sym.rb", "lib/ruby2js/converter/boolean.rb", "lib/ruby2js/converter/masgn.rb", "lib/ruby2js/converter/cvar.rb", "lib/ruby2js/converter/casgn.rb", "lib/ruby2js/sinatra.rb", "lib/ruby2js/filter", "lib/ruby2js/filter/angular-resource.rb", "lib/ruby2js/filter/functions.rb", "lib/ruby2js/filter/angularrb.rb", "lib/ruby2js/filter/return.rb", "lib/ruby2js/filter/underscore.rb", "lib/ruby2js/filter/strict.rb", "lib/ruby2js/filter/minitest-jasmine.rb", "lib/ruby2js/filter/angular-route.rb", "lib/ruby2js/filter/jquery.rb"]
   s.homepage = "http://github.com/rubys/ruby2js"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -36,67 +36,67 @@ extra_rdoc_files: []
 files:
 - ruby2js.gemspec
 - README.md
+- lib/ruby2js.rb
 - lib/ruby2js/converter.rb
 - lib/ruby2js/version.rb
-- lib/ruby2js/filter/jquery.rb
-- lib/ruby2js/filter/return.rb
-- lib/ruby2js/filter/underscore.rb
-- lib/ruby2js/filter/angularrb.rb
-- lib/ruby2js/filter/minitest-jasmine.rb
-- lib/ruby2js/filter/strict.rb
-- lib/ruby2js/filter/functions.rb
-- lib/ruby2js/filter/angular-resource.rb
-- lib/ruby2js/filter/angular-route.rb
-- lib/ruby2js/sinatra.rb
-- lib/ruby2js/rails.rb
 - lib/ruby2js/cgi.rb
-- lib/ruby2js/converter/self.rb
-- lib/ruby2js/converter/arg.rb
-- lib/ruby2js/converter/dstr.rb
-- lib/ruby2js/converter/xstr.rb
-- lib/ruby2js/converter/sym.rb
-- lib/ruby2js/converter/return.rb
-- lib/ruby2js/converter/break.rb
-- lib/ruby2js/converter/for.rb
-- lib/ruby2js/converter/defined.rb
-- lib/ruby2js/converter/cvasgn.rb
-- lib/ruby2js/converter/whilepost.rb
-- lib/ruby2js/converter/logical.rb
-- lib/ruby2js/converter/args.rb
-- lib/ruby2js/converter/def.rb
+- lib/ruby2js/rails.rb
 - lib/ruby2js/converter/prototype.rb
-- lib/ruby2js/converter/class.rb
-- lib/ruby2js/converter/opasgn.rb
-- lib/ruby2js/converter/module.rb
+- lib/ruby2js/converter/begin.rb
+- lib/ruby2js/converter/undef.rb
 - lib/ruby2js/converter/kwbegin.rb
-- lib/ruby2js/converter/send.rb
-- lib/ruby2js/converter/boolean.rb
-- lib/ruby2js/converter/masgn.rb
-- lib/ruby2js/converter/hash.rb
-- lib/ruby2js/converter/cvar.rb
-- lib/ruby2js/converter/ivasgn.rb
-- lib/ruby2js/converter/case.rb
 - lib/ruby2js/converter/const.rb
-- lib/ruby2js/converter/vasgn.rb
+- lib/ruby2js/converter/self.rb
+- lib/ruby2js/converter/class.rb
 - lib/ruby2js/converter/untilpost.rb
-- lib/ruby2js/converter/begin.rb
-- lib/ruby2js/converter/ivar.rb
 - lib/ruby2js/converter/while.rb
-- lib/ruby2js/converter/next.rb
-- lib/ruby2js/converter/nil.rb
 - lib/ruby2js/converter/blockpass.rb
-- lib/ruby2js/converter/super.rb
-- lib/ruby2js/converter/defs.rb
 - lib/ruby2js/converter/array.rb
+- lib/ruby2js/converter/for.rb
+- lib/ruby2js/converter/hash.rb
 - lib/ruby2js/converter/block.rb
+- lib/ruby2js/converter/def.rb
+- lib/ruby2js/converter/nil.rb
 - lib/ruby2js/converter/if.rb
-- lib/ruby2js/converter/until.rb
+- lib/ruby2js/converter/break.rb
+- lib/ruby2js/converter/send.rb
+- lib/ruby2js/converter/module.rb
+- lib/ruby2js/converter/defs.rb
+- lib/ruby2js/converter/ivar.rb
+- lib/ruby2js/converter/var.rb
+- lib/ruby2js/converter/case.rb
+- lib/ruby2js/converter/literal.rb
+- lib/ruby2js/converter/super.rb
+- lib/ruby2js/converter/opasgn.rb
+- lib/ruby2js/converter/return.rb
+- lib/ruby2js/converter/arg.rb
 - lib/ruby2js/converter/regexp.rb
+- lib/ruby2js/converter/args.rb
+- lib/ruby2js/converter/until.rb
+- lib/ruby2js/converter/dstr.rb
+- lib/ruby2js/converter/vasgn.rb
+- lib/ruby2js/converter/whilepost.rb
+- lib/ruby2js/converter/xstr.rb
+- lib/ruby2js/converter/defined.rb
+- lib/ruby2js/converter/next.rb
+- lib/ruby2js/converter/ivasgn.rb
+- lib/ruby2js/converter/cvasgn.rb
+- lib/ruby2js/converter/logical.rb
+- lib/ruby2js/converter/sym.rb
+- lib/ruby2js/converter/boolean.rb
+- lib/ruby2js/converter/masgn.rb
+- lib/ruby2js/converter/cvar.rb
 - lib/ruby2js/converter/casgn.rb
-- lib/ruby2js/converter/undef.rb
-- lib/ruby2js/converter/literal.rb
-- lib/ruby2js/converter/var.rb
-- lib/ruby2js.rb
+- lib/ruby2js/sinatra.rb
+- lib/ruby2js/filter/angular-resource.rb
+- lib/ruby2js/filter/functions.rb
+- lib/ruby2js/filter/angularrb.rb
+- lib/ruby2js/filter/return.rb
+- lib/ruby2js/filter/underscore.rb
+- lib/ruby2js/filter/strict.rb
+- lib/ruby2js/filter/minitest-jasmine.rb
+- lib/ruby2js/filter/angular-route.rb
+- lib/ruby2js/filter/jquery.rb
 homepage: http://github.com/rubys/ruby2js
 licenses:
 - MIT