rubinius-ast 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 6c813e2d9aab238e0539b24b9e8a99577df03d18
-  data.tar.gz: 05a46ba5bc2c13e3e05a0f9ee715405c33a8fca5
-SHA512:
-  metadata.gz: 83fd6bb2b4515527473abb408e5c6be2ae809d3aa1c9191234f1b242927c5f42fcf680afb2f05fcf68c895d5d90b9a495681ce8344fceac9b89d1ca0fb4adef1
-  data.tar.gz: b7e29a91fc198d7bfc0e23373b3f4ed8f8da28bbd76d514dcca2b8df05c3629ed2416a67fb15b1bbcf2474b27900d29cc59a40e98370097154349c96c696b665
+--- 
+SHA1: 
+  metadata.gz: 13b07db1a174109a85371ff4bb970022d1da2609
+  data.tar.gz: 19c959ab30fa989682ea04b38af56544e7b66ef5
+SHA512: 
+  metadata.gz: f8fd2fb2d25c37da961ae9489a86e220e2623a161e9d99834a1e88bee31fd3b5062940a2cc46ffaa73e05d962b95bdd4b32168abf0d749d051a706132f896c8c
+  data.tar.gz: 8340b99e01eddfd2956eed6401210bcd6fce86d71c4d16d9dc404dfbfeb745487df2e3608554aa22c6d862d69208717625ffc1d76dd1c24f8fe03cfc8e23985a

data/lib/rubinius/ast/control_flow.rb

@@ -39,7 +39,7 @@ module Rubinius::ToolSet.current::TS
       def to_sexp
         else_sexp = @else.kind_of?(NilLiteral) ? nil : @else.to_sexp
         sexp = [:case, receiver_sexp]
-        sexp << [:whens] + @whens.map { |x| x.to_sexp }
+        sexp += @whens.map { |x| x.to_sexp }
         sexp << else_sexp
         sexp
       end
@@ -542,6 +542,10 @@ module Rubinius::ToolSet.current::TS
         @value = expr || NilLiteral.new(line)
       end
 
+      def block=(node)
+        @value.block = node if @value
+      end
+
       def jump_error(g, name)
         g.push_rubinius
         g.push_literal name

data/lib/rubinius/ast/exceptions.rb

@@ -392,7 +392,7 @@ module Rubinius::ToolSet.current::TS
         case body
         when Block
           @assignment = body.array.shift if assignment? body.array.first
-          @body = body
+          @body = body.array.size == 1 ? body.array.first : body
         when nil
           @body = NilLiteral.new line
         else
@@ -510,11 +510,18 @@ module Rubinius::ToolSet.current::TS
       end
 
       def to_sexp
-        array = @conditions.to_sexp
-        array << @assignment.to_sexp if @assignment
+        sexp = [:resbody]
+
+        if @conditions
+          array = @conditions.to_sexp
+          sexp << array
+        else
+          array = sexp
+        end
+
         array << @splat.to_sexp if @splat
+        array << @assignment.to_sexp if @assignment
 
-        sexp = [:resbody, array]
         case @body
         when Block
           sexp << (@body ? @body.array.map { |x| x.to_sexp } : nil)

data/lib/rubinius/ast/literals.rb

@@ -499,6 +499,12 @@ module Rubinius::ToolSet.current::TS
       def sexp_name
         :dregx
       end
+
+      def to_sexp
+        sexp = super
+        sexp << @options if @options != 0
+        sexp
+      end
     end
 
     class DynamicOnceRegex < DynamicRegex

data/lib/rubinius/ast/operators.rb

@@ -221,7 +221,14 @@ module Rubinius::ToolSet.current::TS
 
       def to_sexp
         arguments = [:arglist] + @arguments.to_sexp
-        op = @op == :or ? :"||" : :"&&"
+        case @op
+        when :or
+          op = :"||"
+        when :and
+          op = :"&&"
+        else
+          op = @op
+        end
         [:op_asgn1, @receiver.to_sexp, arguments, op, @value.to_sexp]
       end
     end
@@ -299,7 +306,14 @@ module Rubinius::ToolSet.current::TS
       end
 
       def to_sexp
-        op = @op == :or ? :"||" : :"&&"
+        case @op
+        when :or
+          op = :"||"
+        when :and
+          op = :"&&"
+        else
+          op = @op
+        end
         [:op_asgn2, @receiver.to_sexp, :"#{@name}=", op, @value.to_sexp]
       end
     end

data/lib/rubinius/ast/sends.rb

@@ -108,22 +108,19 @@ module Rubinius::ToolSet.current::TS
       end
 
       def arguments_sexp
-        return nil if @vcall_style
-
         sexp = [:arglist]
-        sexp << @block.to_sexp if @block.kind_of? BlockPass
+        sexp << @block.to_sexp if @block
         sexp
       end
 
       def to_sexp
-        sexp = [sexp_name, receiver_sexp, @name, arguments_sexp]
         case @block
         when For
-          @block.to_sexp.insert 1, @receiver.to_sexp
-        when Iter
-          @block.to_sexp.insert 1, sexp
+          n, x, b = @block.to_sexp
+          xs = @receiver.to_sexp
+          [n, x, xs, b]
         else
-          sexp
+          [sexp_name, receiver_sexp, @name, arguments_sexp]
         end
       end
     end
@@ -863,6 +860,10 @@ module Rubinius::ToolSet.current::TS
       def splat_index
         @splat
       end
+
+      def to_sexp
+        @arguments.to_sexp
+      end
     end
 
     class For19 < For
@@ -1008,7 +1009,14 @@ module Rubinius::ToolSet.current::TS
       end
 
       def to_sexp
-        arguments_sexp :yield
+        args = @arguments.to_sexp
+        args << @block.to_sexp if @block
+        if @argument_count == 1 and !@yield_splat and @arguments.splat.nil? and
+           @arguments.array.first.kind_of? SplatValue
+          [:yield, [:array] + args]
+        else
+          [:yield] + args
+        end
       end
     end
 

data/lib/rubinius/ast/variables.rb

@@ -356,7 +356,7 @@ module Rubinius::ToolSet.current::TS
       end
 
       def to_sexp
-        [:splat_assign, @value.to_sexp]
+        @value.to_sexp
       end
     end
 
@@ -376,7 +376,7 @@ module Rubinius::ToolSet.current::TS
       end
 
       def to_sexp
-        [:splat, @value.to_sexp]
+        @value.to_sexp
       end
     end
 
@@ -399,7 +399,7 @@ module Rubinius::ToolSet.current::TS
       end
 
       def to_sexp
-        [:splat, @value.to_sexp]
+        @value.to_sexp
       end
     end
 
@@ -733,7 +733,13 @@ module Rubinius::ToolSet.current::TS
 
       def to_sexp
         left = @left ? @left.to_sexp : [:array]
-        left << [:splat, @splat.to_sexp] if @splat
+        case @splat
+        when EmptySplat
+          left << [:splat]
+        when nil
+        else
+          left << [:splat, @splat.to_sexp]
+        end
         left << @block.to_sexp if @block
 
         sexp = [:masgn, left]

data/lib/rubinius/ast/version.rb

@@ -1,5 +1,5 @@
 module Rubinius::ToolSet.current::TS
   module AST
-    VERSION = "2.0.10"
+    VERSION = "2.0.11"
   end
 end

metadata

@@ -1,51 +1,47 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rubinius-ast
-version: !ruby/object:Gem::Version
-  version: 2.0.10
+version: !ruby/object:Gem::Version 
+  version: 2.0.11
 platform: ruby
-authors:
+authors: 
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-01-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "10.0"
+  type: :development
+  version_requirements: *id002
 description: An Abstract Syntax Tree for Ruby.
-email:
+email: 
 - brixen@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
+
+files: 
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -70,28 +66,30 @@ files:
 - lib/rubinius/ast/version.rb
 - rubinius-ast.gemspec
 homepage: https://github.com/rubinius/rubinius-ast
-licenses:
+licenses: 
 - BSD
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id003 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: An Abstract Syntax Tree for Ruby.
 test_files: []
-has_rdoc: 
+