ruby2js 1.15.1 → 2.0.0

data/lib/ruby2js/converter/logical.rb

@@ -19,16 +19,14 @@ module Ruby2JS
       lgroup   = LOGICAL.include?( left.type ) && 
         op_index < operator_index( left.type )
       lgroup = true if left and left.type == :begin
-      left     = parse left
-      left     = "(#{ left })" if lgroup
 
       rgroup = LOGICAL.include?( right.type ) && 
         op_index < operator_index( right.type )
       rgroup = true if right.type == :begin
-      right    = parse right
-      right    = "(#{ right })" if rgroup
 
-      "#{ left } #{ type==:and ? '&&' : '||' } #{ right }"
+      put '(' if lgroup; parse left; put ')' if lgroup
+      put (type==:and ? ' && ' : ' || ')
+      put '(' if rgroup; parse right; put ')' if rgroup
     end
 
     # (not
@@ -49,10 +47,8 @@ module Ruby2JS
         group   = LOGICAL.include?( expr.type ) && 
           operator_index( :not ) < operator_index( expr.type )
         group = true if expr and expr.type == :begin
-        expr     = parse expr
-        expr     = "(#{ expr })" if group
 
-        "!#{ expr }"
+        put '!'; put '(' if group; parse expr; put ')' if group
       end
     end
   end

data/lib/ruby2js/converter/next.rb

@@ -6,7 +6,7 @@ module Ruby2JS
 
     handle :next do |n=nil|
       raise NotImplementedError, "next argument #{ n.inspect }" if n
-      @next_token.to_s
+      put @next_token.to_s
     end
   end
 end

data/lib/ruby2js/converter/nil.rb

@@ -4,7 +4,7 @@ module Ruby2JS
     # (nil)
 
     handle :nil do
-      'null'
+      put 'null'
     end
   end
 end

data/lib/ruby2js/converter/nthref.rb

@@ -4,7 +4,7 @@ module Ruby2JS
     # (nthref 1)
 
     handle :nth_ref do |var|
-      "$#{var}"
+      put "$#{var}"
     end
   end
 end

data/lib/ruby2js/converter/opasgn.rb

@@ -14,12 +14,12 @@ module Ruby2JS
 
       if [:+, :-].include?(op) and value.type==:int and value.children==[1]
         if @state == :statement
-          "#{ parse var }#{ op }#{ op }"
+          parse var; put "#{ op }#{ op }"
         else
-          "#{ op }#{ op }#{ parse var }"
+          put "#{ op }#{ op }"; parse var
         end
       else
-        "#{ parse var } #{ op }= #{ parse value }"
+        parse var; put " #{ op }= "; parse value
       end
     end
 

data/lib/ruby2js/converter/regexp.rb

@@ -17,27 +17,30 @@ module Ruby2JS
         str = parts.map {|part| part.children.first}.join
         str = str.gsub(/ #.*/,'').gsub(/\s/,'') if extended
         unless str.include? '/'
-          return "/#{ str }/#{ opts.join }"
+          return put "/#{ str }/#{ opts.join }"
         end
-        str = str.inspect
+        put "new RegExp(#{ str.inspect }"
       else
-        parts.map! do |part|
+        put 'new RegExp('
+
+        parts.each_with_index do |part, index|
+          put ' + ' unless index == 0
+
           if part.type == :str
             str = part.children.first 
             str = str.gsub(/ #.*/,'').gsub(/\s/,'') if extended
-            str.inspect
+            put str.inspect
           else
             parse part
           end
         end
-        str = parts.join(' + ')
       end
 
-      if opts.empty?
-        "new RegExp(#{ str })"
-      else
-        "new RegExp(#{ str }, #{ opts.join.inspect})"
+      unless opts.empty?
+        put ", #{ opts.join.inspect}"
       end
+
+      put ')'
     end
   end
 end

data/lib/ruby2js/converter/return.rb

@@ -6,9 +6,9 @@ module Ruby2JS
 
     handle :return do |value=nil|
       if value
-        "return #{ parse value }"
+        put 'return '; parse value
       else
-        "return"
+        put 'return'
       end
     end
 
@@ -24,7 +24,7 @@ module Ruby2JS
       end
 
       if EXPRESSIONS.include? block.last.type 
-        block.push s(:return, block.pop)
+        block.push @ast.updated(:return, [block.pop])
       elsif block.last.type == :if
         node = block.pop
         if node.children[1] and node.children[2] and

data/lib/ruby2js/converter/self.rb

@@ -6,9 +6,9 @@ module Ruby2JS
     handle :self do
       if @block_depth and @block_depth > 1
         @block_this = true
-        'self'
+        put 'self'
       else
-        'this'
+        put 'this'
       end
     end
   end

data/lib/ruby2js/converter/send.rb

@@ -13,7 +13,7 @@ module Ruby2JS
     # interpretation as an attribute vs a function call with zero parameters.
     # Sendw forces parameters to be placed on separate lines.
 
-    handle :send, :sendw, :attr do |receiver, method, *args|
+    handle :send, :sendw, :attr, :call do |receiver, method, *args|
       ast = @ast
 
       width = ((ast.type == :sendw && !@nl.empty?) ? 0 : @width)
@@ -32,8 +32,9 @@ module Ruby2JS
       if [:call, :[]].include? method and receiver and receiver.type == :block 
         t2,m2,*args2 = receiver.children.first.children
         if not t2 and [:lambda, :proc].include? m2 and args2.length == 0
-          receiver = (@state == :statement ? group(receiver) : parse(receiver))
-          return parse s(:send, nil, receiver, *args)
+          (@state == :statement ? group(receiver) : parse(receiver))
+          put '('; parse_all *args, join: ', '; put ')'
+          return
         end
       end
 
@@ -62,31 +63,36 @@ module Ruby2JS
         parse s(:not, receiver)
 
       elsif method == :[]
-        "#{ parse receiver }[#{ args.map {|arg| parse arg}.join(', ') }]"
+        parse receiver; put '['; parse_all *args, join: ', '; put ']'
 
       elsif method == :[]=
-        "#{ parse receiver }[#{ args[0..-2].map {|arg| parse arg}.join(', ') }] = #{ parse args[-1] }"
+        parse receiver; put '['; parse_all *args[0..-2], join: ', '; put '] = '
+        parse args[-1]
 
       elsif [:-@, :+@, :~, '~'].include? method
-        "#{ method.to_s[0] }#{ parse receiver }"
+        put method.to_s[0]; parse receiver
 
       elsif method == :=~
-        "#{ parse args.first }.test(#{ parse receiver })"
+        parse args.first; put '.test('; parse receiver; put ')'
 
       elsif method == :!~
-        "!#{ parse args.first }.test(#{ parse receiver })"
+        put '!'; parse args.first; put '.test('; parse receiver; put ')'
 
       elsif method == :<< and args.length == 1 and @state == :statement
-        "#{ parse receiver }.push(#{ parse args.first })"
+        parse receiver; put '.push('; parse args.first; put ')'
 
       elsif method == :<=>
         raise NotImplementedError, "use of <=>"
 
       elsif OPERATORS.flatten.include?(method) and not LOGICAL.include?(method)
-        "#{ group_receiver ? group(receiver) : parse(receiver) } #{ method } #{ group_target ? group(target) : parse(target) }"  
+        (group_receiver ? group(receiver) : parse(receiver))
+        put " #{ method } "
+        (group_target ? group(target) : parse(target))
 
       elsif method =~ /=$/
-        "#{ parse receiver }#{ '.' if receiver }#{ method.to_s.sub(/=$/, ' =') } #{ parse args.first }"
+        parse receiver
+        put "#{ '.' if receiver }#{ method.to_s.sub(/=$/, ' =') } "
+        parse args.first
 
       elsif method == :new
         if receiver
@@ -120,12 +126,9 @@ module Ruby2JS
             end
           end
 
-          args = args.map {|a| parse a}.join(', ')
-
+          put "new "; parse receiver
           if ast.is_method?
-            "new #{ parse receiver }(#{ args })"
-          else
-            "new #{ parse receiver }"
+            put '('; parse_all *args, join: ', '; put ')'
           end
         elsif args.length == 1 and args.first.type == :send
           # accommodation for JavaScript like new syntax w/argument list
@@ -140,35 +143,33 @@ module Ruby2JS
 
       elsif method == :raise and receiver == nil
         if args.length == 1
-          "throw #{ parse args.first }"
+          put 'throw '; parse args.first
         else
-          "throw new #{ parse args.first }(#{ parse args[1] })"
+          put 'throw new '; parse args.first; put '('; parse args[1]; put ')'
         end
 
       elsif method == :typeof and receiver == nil
-        "typeof #{ parse args.first }"
+        put 'typeof '; parse args.first
 
       else
         if not ast.is_method?
           if receiver
-             call = (group_receiver ? group(receiver) : parse(receiver))
-            "#{ call }.#{ method }"
+            (group_receiver ? group(receiver) : parse(receiver))
+            put ".#{ method }"
           else
-            parse s(:lvasgn, method), @state
+            parse ast.updated(:lvasgn, [method]), @state
           end
         elsif args.length > 0 and args.any? {|arg| arg.type == :splat}
           parse s(:send, s(:attr, receiver, method), :apply, 
             (receiver || s(:nil)), s(:array, *args))
         else
-          call = (group_receiver ? group(receiver) : parse(receiver))
-          call = "#{ call }#{ '.' if receiver && method}#{ method }"
-          args = args.map {|a| parse a}
-          if args.map {|arg| arg.length+2}.reduce(&:+).to_i < width-10
-            "#{ call }(#{ args.join(', ') })"
-          elsif args.length == 1 and args.first.to_s.include? "\n"
-            "#{ call }(#{ args.join(', ') })"
+          (group_receiver ? group(receiver) : parse(receiver))
+          put "#{ '.' if receiver && method}#{ method }"
+
+          if args.length <= 1
+            put "("; parse_all *args, join: ', '; put ')'
           else
-            "#{ call }(#@nl#{ args.join(",#@ws") }#@nl)"
+            compact { puts "("; parse_all *args, join: ",#@ws"; sput ')' }
           end
         end
       end

data/lib/ruby2js/converter/super.rb

@@ -10,13 +10,6 @@ module Ruby2JS
         raise NotImplementedError, "super outside of a method"
       end
 
-      # what to call
-      if @instance_method.type == :constructor
-        method = ''
-      else
-        method = ".prototype.#{ @instance_method.children[1].to_s.chomp('=') }"
-      end
-
       # what to pass
       if @ast.type == :zsuper
         if @instance_method.type == :method
@@ -28,11 +21,15 @@ module Ruby2JS
         end
       end
 
+      parse @class_parent
+
+      # what to call
+      if @instance_method.type != :constructor
+        puts  ".prototype.#{ @instance_method.children[1].to_s.chomp('=') }"
+      end
+
       if args
-        args = [s(:self), *args].map {|arg| parse arg}.join(', ')
-        "#{ parse @class_parent }#{ method }.call(#{ args })"
-      else
-        "#{ parse @class_parent }#{ method }"
+        put '.call('; parse_all s(:self), *args, join: ', '; put ')'
       end
     end
   end

data/lib/ruby2js/converter/sym.rb

@@ -4,7 +4,7 @@ module Ruby2JS
     # (sym :sym))
 
     handle :sym do |sym|
-      sym.to_s.inspect
+      put sym.to_s.inspect
     end
   end
 end

data/lib/ruby2js/converter/undef.rb

@@ -6,8 +6,15 @@ module Ruby2JS
     #   (sym :bar))
 
     handle :undef do |*syms|
-      "delete " + syms.
-        map {|sym| sym.type == :sym ? sym.children.last : parse(sym)}.join(@sep)
+      syms.each_with_index do |sym, index|
+        put @sep unless index == 0
+
+        if sym.type == :sym
+          put "delete #{sym.children.last}"
+        else
+          put "delete "; parse sym
+        end
+      end
     end
   end
 end

data/lib/ruby2js/converter/var.rb

@@ -5,7 +5,7 @@ module Ruby2JS
     # (gvar :$a)
 
     handle :lvar, :gvar do |var|
-      var
+      put var
     end
   end
 end

data/lib/ruby2js/converter/vasgn.rb

@@ -8,6 +8,7 @@ module Ruby2JS
     #   (int 1))
 
     handle :lvasgn, :gvasgn do |name, value=nil|
+      state  = @state
       begin
         if value and value.type == :lvasgn and @state == :statement
           undecls = []
@@ -25,16 +26,23 @@ module Ruby2JS
           end
         end
 
-        var = 'var ' unless @vars.include?(name) or @state != :statement
+        if state == :statement and @scope and not @vars.include?(name) 
+          var = 'var ' 
+        end
 
         if value
-
-          "#{ var }#{ name } = #{ parse value }"
+          put "#{ var }#{ name } = "; parse value
         else
-          "#{ var }#{ name }"
+          put "#{ var }#{ name }"
         end
       ensure
-        @vars[name] = true
+        if @scope
+          @vars[name] = true
+        elsif state == :statement
+          @vars[name] ||= :pending
+        else
+          @vars[name] ||= :implicit # console, document, ...
+        end
       end
     end
   end

data/lib/ruby2js/converter/while.rb

@@ -8,7 +8,8 @@ module Ruby2JS
     handle :while do |condition, block|
       begin
         next_token, @next_token = @next_token, :continue
-        "while (#{ parse condition }) {#@nl#{ scope block }#@nl}"
+
+        put 'while ('; parse condition; puts ') {'; scope block; sput '}'
       ensure
         @next_token = next_token
       end

data/lib/ruby2js/converter/whilepost.rb

@@ -10,7 +10,8 @@ module Ruby2JS
       block = block.updated(:begin) if block.type == :kwbegin
       begin
         next_token, @next_token = @next_token, :continue
-        "do {#@nl#{ scope block }#@nl} while (#{ parse condition })"
+
+        puts 'do {'; scope block; sput '} while ('; parse condition; put ')'
       ensure
         @next_token = next_token
       end

data/lib/ruby2js/converter/xstr.rb

@@ -5,11 +5,12 @@ module Ruby2JS
     #   (str 'a'))
 
     handle :xstr do |*children|
-      str = eval children.map{ |child| parse child }.join
+      str = eval capture { parse_all *children }
+
       if @binding
-        @binding.eval(str).to_s
+        puts @binding.eval(str).to_s
       else
-        eval(str).to_s
+        puts eval(str).to_s
       end
     end
   end

data/lib/ruby2js/execjs.rb

@@ -3,14 +3,14 @@ require 'execjs'
 
 module Ruby2JS
   def self.compile(source, options={})
-    ExecJS.compile(convert(source, options))
+    ExecJS.compile(convert(source, options).to_s)
   end
 
   def self.eval(source, options={})
-    ExecJS.eval(convert(source, options))
+    ExecJS.eval(convert(source, options).to_s)
   end
 
   def self.exec(source, options={})
-    ExecJS.exec(convert(source, options))
+    ExecJS.exec(convert(source, options).to_s)
   end
 end