rubinius-processor 1.3.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17bb63303deae27551913ea385e8fc323fc483df
-  data.tar.gz: f4557fd0bc40e7e5c209b69209a9e43ed8c4c06c
+  metadata.gz: b91c4c695d269d32bf32e778acfd5bb3a0a5a885
+  data.tar.gz: 9598db1ec8feba3f114d9876abbb93ead8aaf5b9
 SHA512:
-  metadata.gz: d826cb8efec9f9012ef95fbf27329bd4d9c9a8eb9399d32ac5b1c4ff3fd70e3a0d5402db56c8586fd8d4a90a4b59fd2631f51279bc7a2e4f0c903c6052eb6605
-  data.tar.gz: ba3f008c8d171c0aeb96867925e2b68bf7cebf20107a18ace235f8dd5aa6bc4181e2d69cc57d70da3e05d4378259b8c08d48c52120496f3811732854651d27bc
+  metadata.gz: aee6f2e2769f414a0ab098a4c4c947e6533eb0840dedff19d8a6c97f9ca835b689109580b0ec5db415a761a26987abea2a26be6bd8c18e23450a95591c16972f
+  data.tar.gz: b9fa3229e3da0a6dcf42d91d724fa6dd697c212cdc20e98346b2657283ba4fdd87f2502873b4b34cf401dc71f07ca48398890b56bfd9f38322b97e13ec9a690c

data/lib/rubinius/processor/processor.rb

@@ -1,4 +1,4 @@
-module CodeTools
+module Rubinius::ToolSet.current::TS
   # TODO: This will change to:
   # class Processor
   class Melbourne
@@ -20,7 +20,7 @@ module CodeTools
 
     # TODO: remove when all processors are defined
     def method_missing(sym, *args)
-      puts "#{self.class}#method_missing: #{sym} #{args.map { |x| x.inspect}.join(", ")}"
+      puts " *** missing #{sym} #{args.map { |x| x.inspect}.join(", ")}"
     end
 
 
@@ -34,8 +34,8 @@ module CodeTools
       AST::And.new line, left, right
     end
 
-    def process_args(line, args, defaults, splat)
-      AST::FormalArguments.new line, args, defaults, splat
+    def process_args(line, required, optional, splat, post, block)
+      AST::FormalArguments19.new line, required, optional, splat, post, block
     end
 
     def process_argscat(line, array, rest)
@@ -74,14 +74,8 @@ module CodeTools
       AST::BlockArgument.new line, name
     end
 
-    def process_block_pass(line, method_send, body)
-      node = AST::BlockPass.new line, body
-      if method_send
-        method_send.block = node
-        method_send
-      else
-        node
-      end
+    def process_block_pass(line, arguments, body)
+      AST::BlockPass19.new line, arguments, body
     end
 
     def process_break(line, value)
@@ -208,6 +202,10 @@ module CodeTools
       AST::DynamicExecuteString.new line, str, array
     end
 
+    def process_encoding(line, name)
+      AST::Encoding.new line, name
+    end
+
     def process_ensure(line, body, ensr)
       AST::Ensure.new line, body, ensr
     end
@@ -271,9 +269,9 @@ module CodeTools
     end
 
     def process_for(line, iter, arguments, body)
-      method_send = AST::Send.new line, iter, :each
-      method_send.block = AST::For.new line, arguments, body
-      method_send
+      send = AST::Send.new line, iter, :each
+      send.block = AST::For19.new line, arguments, body
+      send
     end
 
     def process_gasgn(line, name, expr)
@@ -296,8 +294,32 @@ module CodeTools
       AST::If.new line, cond, body, else_body
     end
 
-    def process_iter(line, method_send, arguments, body)
-      method_send.block = AST::Iter.new line, arguments, body
+    def process_iter(line, method_send, scope)
+      ary = scope && scope.array || []
+      arguments = nil
+
+      if ary.first.kind_of? AST::FormalArguments
+        arguments = scope.array.shift
+      end
+
+      unless arguments
+        arguments = AST::FormalArguments19.new line, nil, nil, nil, nil, nil
+      end
+
+      case ary.size
+      when 0
+        body = nil
+      when 1
+        if scope.locals
+          body = scope
+        else
+          body = scope.array.shift
+        end
+      else
+        body = scope
+      end
+
+      method_send.block = AST::Iter19.new line, arguments, body
       method_send
     end
 
@@ -305,6 +327,21 @@ module CodeTools
       AST::InstanceVariableAccess.new line, name
     end
 
+    def process_lambda(line, scope)
+      arguments = scope.array.shift
+      if scope.array.size == 1
+        body = scope.array.shift
+      else
+        body = scope
+      end
+
+      receiver = AST::Self.new line
+      method_send = AST::Send.new line, receiver, :lambda, true
+
+      method_send.block = AST::Iter19.new line, arguments, body
+      method_send
+    end
+
     def process_lasgn(line, name, value)
       AST::LocalVariableAssignment.new line, name, value
     end
@@ -357,9 +394,7 @@ module CodeTools
       AST::NthRef.new line, ref
     end
 
-    # TODO: Fix the way 1.8 parser handles this
-    def process_number(line, base, str)
-      value = str.to_i base
+    def process_number(line, value)
       case value
       when Fixnum
         AST::FixnumLiteral.new line, value
@@ -369,11 +404,11 @@ module CodeTools
     end
 
     def process_op_asgn1(line, receiver, index, op, value)
-      AST::OpAssignElement.new line, receiver, index, op, value
+      AST::OpAssign1.new line, receiver, index, op, value
     end
 
     def process_op_asgn2(line, receiver, name, op, value)
-      AST::OpAssignAttribute.new line, receiver, name, op, value
+      AST::OpAssign2.new line, receiver, name, op, value
     end
 
     def process_op_asgn_and(line, var, value)
@@ -381,19 +416,30 @@ module CodeTools
     end
 
     def process_op_asgn_or(line, var, value)
-      AST::OpAssignOr.new line, var, value
+      AST::OpAssignOr19.new line, var, value
+    end
+
+    def process_opt_arg(line, arguments)
+      AST::Block.new line, arguments
     end
 
     def process_or(line, left, right)
       AST::Or.new line, left, right
     end
 
-    def process_postexe(line)
-      AST::Send.new line, AST::Self.new(line), :at_exit, true
+    def process_postarg(line, into, rest)
+      AST::PostArg.new line, into, rest
+    end
+
+    def process_postexe(line, body)
+      node = AST::Send.new line, AST::Self.new(line), :at_exit, true
+      node.block = AST::Iter.new line, nil, body
+      node
     end
 
-    def process_preexe(line)
-      node = AST::PreExe.new line
+    def process_preexe(line, body)
+      node = AST::PreExe19.new line
+      node.block = AST::Iter19.new line, nil, body
       add_pre_exe node
       node
     end
@@ -426,12 +472,33 @@ module CodeTools
       AST::SClass.new line, receiver, body
     end
 
-    def process_scope(line, body)
-      if body.kind_of? AST::Block
-        body
-      elsif body
-        AST::Block.new line, [body]
+    def process_scope(line, arguments, body, locals)
+      case body
+      when AST::Begin
+        if body.rescue.kind_of? AST::NilLiteral
+          return nil unless arguments
+        end
+        body = AST::Block.new line, [body.rescue]
+      when AST::Block
+        ary = body.array
+        if ary.size > 1 and
+           ary.first.kind_of?(AST::Begin) and
+           ary.first.rescue.kind_of?(AST::NilLiteral)
+          ary.shift
+        end
+      when nil
+        # Nothing
+      else
+        body = AST::Block.new line, [body]
       end
+
+      if arguments and body
+        body.array.unshift arguments
+      end
+
+      body.locals = locals if locals
+
+      body
     end
 
     def process_self(line)
@@ -447,7 +514,17 @@ module CodeTools
     end
 
     def process_super(line, arguments)
-      AST::Super.new line, arguments
+      if arguments.kind_of? AST::BlockPass
+        block = arguments
+        arguments = block.arguments
+        block.arguments = nil
+      else
+        block = nil
+      end
+
+      node = AST::Super.new line, arguments
+      node.block = block
+      node
     end
 
     def process_svalue(line, expr)
@@ -513,4 +590,145 @@ module CodeTools
       AST::ZSuper.new line
     end
   end
+
+  class Melbourne19 < Melbourne
+    def process_args(line, required, optional, splat, post, block)
+      AST::FormalArguments19.new line, required, optional, splat, post, block
+    end
+
+    def process_block_pass(line, arguments, body)
+      AST::BlockPass19.new line, arguments, body
+    end
+
+    def process_encoding(line, name)
+      AST::Encoding.new line, name
+    end
+
+    def process_postarg(line, into, rest)
+      AST::PostArg.new line, into, rest
+    end
+
+    def process_iter(line, method_send, scope)
+      ary = scope && scope.array || []
+      arguments = nil
+
+      if ary.first.kind_of? AST::FormalArguments
+        arguments = scope.array.shift
+      end
+
+      unless arguments
+        arguments = AST::FormalArguments19.new line, nil, nil, nil, nil, nil
+      end
+
+      case ary.size
+      when 0
+        body = nil
+      when 1
+        if scope.locals
+          body = scope
+        else
+          body = scope.array.shift
+        end
+      else
+        body = scope
+      end
+
+      method_send.block = AST::Iter19.new line, arguments, body
+      method_send
+    end
+
+    def process_for(line, iter, arguments, body)
+      send = AST::Send.new line, iter, :each
+      send.block = AST::For19.new line, arguments, body
+      send
+    end
+
+    def process_lambda(line, scope)
+      arguments = scope.array.shift
+      if scope.array.size == 1
+        body = scope.array.shift
+      else
+        body = scope
+      end
+
+      receiver = AST::Self.new line
+      method_send = AST::Send.new line, receiver, :lambda, true
+
+      method_send.block = AST::Iter19.new line, arguments, body
+      method_send
+    end
+
+    def process_number(line, value)
+      case value
+      when Fixnum
+        AST::FixnumLiteral.new line, value
+      when Bignum
+        AST::NumberLiteral.new line, value
+      end
+    end
+
+    def process_op_asgn_or(line, var, value)
+      AST::OpAssignOr19.new line, var, value
+    end
+
+    def process_opt_arg(line, arguments)
+      AST::Block.new line, arguments
+    end
+
+    def process_postexe(line, body)
+      node = AST::Send.new line, AST::Self.new(line), :at_exit, true
+      node.block = AST::Iter.new line, nil, body
+      node
+    end
+
+    def process_preexe(line, body)
+      node = AST::PreExe19.new line
+      node.block = AST::Iter19.new line, nil, body
+      add_pre_exe node
+      node
+    end
+
+    def process_scope(line, arguments, body, locals)
+      case body
+      when AST::Begin
+        if body.rescue.kind_of? AST::NilLiteral
+          return nil unless arguments
+        end
+        body = AST::Block.new line, [body.rescue]
+      when AST::Block
+        ary = body.array
+        if ary.size > 1 and
+           ary.first.kind_of?(AST::Begin) and
+           ary.first.rescue.kind_of?(AST::NilLiteral)
+          ary.shift
+        end
+      when nil
+        # Nothing
+      else
+        body = AST::Block.new line, [body]
+      end
+
+      if arguments and body
+        body.array.unshift arguments
+      end
+
+      body.locals = locals if locals
+
+      body
+    end
+
+    def process_super(line, arguments)
+      if arguments.kind_of? AST::BlockPass
+        block = arguments
+        arguments = block.arguments
+        block.arguments = nil
+      else
+        block = nil
+      end
+
+      node = AST::Super.new line, arguments
+      node.block = block
+      node
+    end
+  end
 end

data/lib/rubinius/processor/version.rb

@@ -1,5 +1,5 @@
-module CodeTools
+module Rubinius::ToolSet.current::TS
   class Processor
-    VERSION = "1.3.0"
+    VERSION = "2.0.1"
   end
 end

data/rubinius-processor.gemspec

@@ -1,15 +1,16 @@
 # coding: utf-8
+require 'rubinius/toolset'
 require './lib/rubinius/processor/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "rubinius-processor"
-  spec.version       = CodeTools::Processor::VERSION
+  spec.version       = Rubinius::ToolSet.current::TS::Processor::VERSION
   spec.authors       = ["Brian Shirai"]
   spec.email         = ["brixen@gmail.com"]
   spec.description   = %q{Converts Melbourne parse tree into an AST.}
   spec.summary       = %q{Converts Melbourne parse tree into an AST.}
   spec.homepage      = "https://github.com/rubinius/rubinius-processor"
-  spec.license       = "BSD"
+  spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-processor
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Converts Melbourne parse tree into an AST.
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -56,7 +56,7 @@ files:
 - rubinius-processor.gemspec
 homepage: https://github.com/rubinius/rubinius-processor
 licenses:
-- BSD
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -64,17 +64,17 @@ 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Converts Melbourne parse tree into an AST.