ruby2js 1.15.1 → 2.0.0

data/lib/ruby2js/converter/const.rb

@@ -7,7 +7,7 @@ module Ruby2JS
       # resolve anonymous receivers against rbstack
       receiver ||= @rbstack.map {|rb| rb[name]}.compact.last
 
-      "#{ parse receiver }#{ '.' if receiver }#{ name }"
+      parse receiver; put '.' if receiver; put name
     end
   end
 end

data/lib/ruby2js/converter/cvar.rb

@@ -5,11 +5,12 @@ module Ruby2JS
 
     handle :cvar do |var|
       if @class_name
-        var.to_s.sub('@@', "#{parse @class_name}._")
+        parse @class_name
+        put var.to_s.sub('@@', "._")
       elsif @prototype
-        var.to_s.sub('@@', 'this._')
+        put var.to_s.sub('@@', 'this._')
       else
-        var.to_s.sub('@@', 'this.constructor._')
+        put var.to_s.sub('@@', 'this.constructor._')
       end
     end
   end

data/lib/ruby2js/converter/cvasgn.rb

@@ -6,17 +6,16 @@ module Ruby2JS
 
     handle :cvasgn do |var, expression=nil|
       if @class_name
-        var = var.to_s.sub('@@', "#{parse @class_name}._")
+        parse @class_name
+        put var.to_s.sub('@@', "._")
       elsif @prototype
-        var = var.to_s.sub('@@', 'this._')
+        put var.to_s.sub('@@', 'this._')
       else
-        var = var.to_s.sub('@@', 'this.constructor._')
+        put var.to_s.sub('@@', 'this.constructor._')
       end
 
       if expression
-        "#{ var } = #{ parse expression }"
-      else
-        var
+        put " = "; parse expression
       end
     end
   end

data/lib/ruby2js/converter/def.rb

@@ -90,15 +90,27 @@ module Ruby2JS
 
       nl = @nl unless body == s(:begin)
       begin
+        if name
+          put "function #{name}"
+        elsif @prop
+          put @prop
+          @prop = nil
+        else
+          put 'function'
+        end
+
+        put '('; parse args; put ") {#{nl}"
+
         next_token, @next_token = @next_token, :return
         @block_depth += 1 if @block_depth
-        body = scope body, vars
+        mark = output_location
+        scope body, vars
         if @block_this and @block_depth == 1
-          body = "var self = this#{@sep}#{body}"
+          insert mark, "var self = this#{@sep}"
           @block_this = false
         end
 
-        "function#{ " #{name}" if name }(#{ parse args }) {#{nl}#{ body }#{nl}}"
+        put "#{nl}}"
       ensure
         @next_token = next_token
         @block_depth -= 1 if @block_depth

data/lib/ruby2js/converter/defined.rb

@@ -9,7 +9,7 @@ module Ruby2JS
 
     handle :defined?, :undefined? do |var|
       op = (@ast.type == :defined? ? :"!==" : :===)
-      "typeof #{ parse var } #{ op } 'undefined'"
+      put "typeof "; parse var; put " #{ op } 'undefined'"
     end
   end
 end

data/lib/ruby2js/converter/defs.rb

@@ -13,19 +13,23 @@ module Ruby2JS
 
     def transform_defs(target, method, args, body)
       if not @ast.is_method? or @ast.type == :defp
-        s(:prop, target, method.to_s => 
+        node = s(:prop, target, method.to_s =>
           {enumerable: s(:true), configurable: s(:true),
           get: s(:block, s(:send, nil, :proc), args,
           s(:autoreturn, body))})
       elsif method =~ /=$/
-        s(:prop, target, method.to_s.sub('=', '') => 
+        node = s(:prop, target, method.to_s.sub('=', '') =>
           {enumerable: s(:true), configurable: s(:true),
           set: s(:block, s(:send, nil, :proc), args,
           body)})
       else
-        s(:send, target, "#{method}=", 
+        node = s(:send, target, "#{method}=",
           s(:block, s(:send, nil, :lambda), args, body))
       end
+
+      @comments[node] = @comments[@ast] if @comments[@ast]
+
+      node
     end
   end
 end

data/lib/ruby2js/converter/dstr.rb

@@ -10,7 +10,9 @@ module Ruby2JS
     #   (...))
 
     handle :dstr, :dsym do |*children|
-      children.map! do |child| 
+      children.each_with_index do |child, index|
+        put ' + ' unless index == 0
+
         if child.type == :begin and child.children.length == 1
           child = child.children.first
         end
@@ -26,8 +28,6 @@ module Ruby2JS
           parse child
         end
       end
-
-      children.join(' + ')
     end
   end
 end

data/lib/ruby2js/converter/for.rb

@@ -12,18 +12,15 @@ module Ruby2JS
     handle :for do |var, expression, block|
       begin
         next_token, @next_token = @next_token, :continue
-        if expression.type == :irange
-          "for (var #{parse var} = #{ parse expression.children.first }; " +
-            "#{ parse var } <= #{ parse expression.children.last }; " +
-            "#{ parse var }++) {#@nl#{ scope block }#@nl}"
-        elsif expression.type == :erange
-          "for (var #{parse var} = #{ parse expression.children.first }; " +
-            "#{ parse var } < #{ parse expression.children.last }; " +
-            "#{ parse var }++) {#@nl#{ scope block }#@nl}"
+        put "for (var "; parse var
+        if [:irange, :erange].include? expression.type
+          put ' = '; parse expression.children.first; put '; '; parse var
+          (expression.type == :erange ? put(' < ') : put(' <= '))
+          parse expression.children.last; put '; '; parse var; puts '++'
         else
-          "for (var #{parse var} in #{ parse expression }) " +
-            "{#@nl#{ scope block }#@nl}"
+          put ' in '; parse expression; 
         end
+        puts ') {'; scope block; sput '}'
       ensure
         @next_token = next_token
       end

data/lib/ruby2js/converter/hash.rb

@@ -7,50 +7,86 @@ module Ruby2JS
     #     (str "value")))
 
     handle :hash do |*pairs|
-      pairs.map! do |node|
-        raise NotImplementedError, "kwsplat" if node.type == :kwsplat
+      compact do
+        singleton = pairs.length <= 1
 
-        begin
-          block_depth, block_this, block_hash = @block_depth, @block_this, false
-          left, right = node.children
+        (singleton ? put('{') : puts('{'))
 
-          if Hash === right or right.type == :block
-            @block_depth, block_hash = 0, true
+        pairs.each_with_index do |node, index|
+          raise NotImplementedError, "kwsplat" if node.type == :kwsplat
+
+          (singleton ? put(', ') : put(",#@ws")) unless index == 0
+
+          if not @comments[node].empty?
+            (puts ''; singleton = false) if singleton
+            comments(node).each {|comment| put comment}
           end
 
-          if left.type == :prop
-            result = []
-            if right[:get]
-              result << "get #{left.children[0]}#{
-                parse(right[:get]).sub(/^function/,'')}"
+          begin
+            block_depth,block_this,block_hash = @block_depth,@block_this,false
+            left, right = node.children
+
+            if Hash === right or right.type == :block
+              @block_depth, block_hash = 0, true
             end
-            if right[:set]
-              result << "set #{left.children[0]}#{
-                parse(right[:set]).sub(/^function/,'')}"
+
+            if left.type == :prop
+              if right[:get]
+                unless @comments[right[:get]].empty?
+                  (puts ''; singleton = false) if singleton
+                  comments(right[:get]).each {|comment| put comment}
+                end
+
+                @prop = "get #{left.children[0]}"
+                parse(right[:get])
+                (singleton ? put(', ') : put(",#@ws")) if right[:set]
+              end
+
+              if right[:set]
+                unless @comments[right[:set]].empty?
+                  (puts ''; singleton = false) if singleton
+                  comments(right[:set]).each {|comment| put comment}
+                end
+
+                @prop = "set #{left.children[0]}"
+                parse(right[:set])
+              end
+            else
+              # hoist get/set comments to definition of property
+              if right.type == :hash
+                right.children.each do |pair|
+                next unless Parser::AST::Node === pair.children.last
+                  if pair.children.last.type == :block
+                    if @comments[pair.children.last]
+                      (puts ''; singleton = false) if singleton
+                      comments(pair.children.last).each do |comment|
+                        put comment
+                      end
+                    end
+                  end
+                end
+              end
+
+              if 
+                left.children.first.to_s =~ /\A[a-zA-Z_$][a-zA-Z_$0-9]*\Z/
+              then
+                put left.children.first
+              else
+                parse left
+              end
+
+              put ': '; parse right
             end
-            result
-          else
-            key = parse left
-            key = $1 if key =~ /\A"([a-zA-Z_$][a-zA-Z_$0-9]*)"\Z/
-            "#{key}: #{parse right}"
-          end
 
-        ensure
-          if block_hash
-            @block_depth = block_depth
-            @block_this = block_this
+          ensure
+            if block_hash
+              @block_depth = block_depth
+              @block_this = block_this
+            end
           end
         end
-      end
-
-      pairs.flatten!
 
-      if pairs.map {|item| item.length+2}.reduce(&:+).to_i < @width-10
-        "{#{ pairs.join(', ') }}"
-      elsif pairs.length == 1
-        "{#{ pairs.join(', ') }}"
-      else
-        "{#@nl#{ pairs.join(",#@ws") }#@nl}"
+        (singleton ? put('}') : sput('}'))
       end
     end
   end

data/lib/ruby2js/converter/if.rb

@@ -15,23 +15,45 @@ module Ruby2JS
       then_block ||= s(:nil)
 
       if @state == :statement
-        output = "if (#{ parse condition }) {#@nl#{ scope then_block }#@nl}"
-        while else_block and else_block.type == :if
-          condition, then_block, else_block = else_block.children
-          output <<  " else if (#{ parse condition }) " +
-            "{#@nl#{ scope then_block }#@nl}"
-        end
-        output << " else {#@nl#{ scope else_block }#@nl}" if else_block
+        begin
+          scope, @scope = @scope, false
+          mark = output_location
 
-        # use short form when appropriate
-        unless output.length>@width-8 or else_block or then_block.type == :begin
-          output = "if (#{ parse condition }) #{ scope then_block }"
-        end
+          # use short form when appropriate
+          unless else_block or then_block.type == :begin
+            put "if ("; parse condition; put ') '
+            wrap { parse then_block, :statement }
+          else
+            put "if ("; parse condition; puts ') {'
+            parse then_block, :statement
+            sput '}'
+
+            while else_block and else_block.type == :if
+              condition, then_block, else_block = else_block.children
+              put ' else if ('; parse condition; puts ') {'
+              parse then_block, :statement
+              sput '}'
+            end
 
-        output
+            if else_block
+              puts ' else {'; parse else_block, :statement; sput '}'
+            end
+          end
+
+          if scope
+            vars = @vars.select {|key, value| value == :pending}.keys
+            unless vars.empty?
+              insert mark, "var #{vars.join(', ')}#{@sep}"
+              vars.each {|var| @vars[var] = true}
+            end
+          end
+        ensure
+          @scope = scope
+        end
       else
         else_block ||= s(:nil)
-        "(#{ parse condition } ? #{ parse then_block } : #{ parse else_block })"
+        put '('; parse condition; put ' ? '; parse then_block
+        put ' : '; parse else_block; put ')'
       end
     end
   end

data/lib/ruby2js/converter/in.rb

@@ -6,7 +6,7 @@ module Ruby2JS
     # NOTE: in? is a synthetic 
 
     handle :in? do |left, right|
-      "#{ parse left } in #{ parse right }"
+      parse left; put " in "; parse right
     end
   end
 end

data/lib/ruby2js/converter/ivasgn.rb

@@ -5,7 +5,7 @@ module Ruby2JS
     #   (int 1))
 
     handle :ivasgn do |var, expression|
-      "#{ var.to_s.sub('@', 'this._') } = #{ parse expression }"
+      put "#{ var.to_s.sub('@', 'this._') } = "; parse expression
     end
   end
 end

data/lib/ruby2js/converter/kwbegin.rb

@@ -35,51 +35,51 @@ module Ruby2JS
         body = block
       end
 
-      output = "try {#@nl#{ parse body, :statement }#@nl}"
+      if not recovers and not finally
+        return parse s(:begin, *children)
+      end
+
+      puts "try {"; parse body, :statement; sput '}'
 
       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}"
+          put " catch ("; parse var; puts ") {"
+          parse recovers.first.children.last, :statement; sput '}'
         else
-          output += " catch (#{ parse var }) {#@nl"
+          put " catch ("; parse var; puts ') {'
 
           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
+              put "} else " if not first
               first = false
 
-              output += "if (#{ tests.join(' || ') }) {#@nl"
+              put  'if ('
+              exceptions.children.each_with_index do |exception, index|
+                put ' || ' unless index == 0
+                parse var; put ' instanceof '; parse exception
+              end
+              puts ') {'
             else
-              output += "} else {#@nl"
+              puts '} else {'
             end
 
-            output += "#{ parse recovery, :statement }#@nl"
+            parse recovery, :statement; puts ''
           end
 
           if recovers.last.children.first
-            output += "} else {#{@nl}throw #{ parse var }#@nl"
+            puts "} else {"; put 'throw '; parse var; puts ''
           end
 
-          output += "}#@nl}"
+          puts '}'; put '}'
         end
       end
 
-      output += " finally {#@nl#{ parse finally, :statement }#@nl}" if finally
-
-      if recovers or finally
-        output
-      else
-        parse s(:begin, *children)
-      end
+      (puts ' finally {'; parse finally, :statement; sput '}') if finally
     end
   end
 end

data/lib/ruby2js/converter/literal.rb

@@ -6,7 +6,7 @@ module Ruby2JS
     # (str "1"))
 
     handle :int, :float, :str do |value|
-      value.inspect
+      put value.inspect
     end
   end
 end