rubinius-compiler 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ce7bfe87d566ab6ce14b3394c0f73c684ec7296
-  data.tar.gz: 2d164dc5242d6c385ea3d0b156c37c77d545b387
+  metadata.gz: 8dd9fd0e49db22c941646e4853543e677fb23114
+  data.tar.gz: a4c1802c05c7db3f7eed86823149defbdcb54c42
 SHA512:
-  metadata.gz: 95d55cdba119ed0403f6f5b8cbfacabbdfe14f17f0a04fcac1edf130335d125a52c7b2829199f35c9a3e9490c901d557a185584816352d0e0f71d88783a240b6
-  data.tar.gz: 54f4932a5a13faf06119fd393fa5e63b5f625e3a17da25410bd3e37eb14ef57efbe36e3f34c38b5c3d2c0a51afd60f51812e81bcb7fe07799e3347e25a514082
+  metadata.gz: 04322de0c555568a219143b19c0d4e202dc5ab975c7cc066242f28e925097eab8afaabb79d676ceaa5fd45bcab311210f75eb4409dcc8ae1d669a466cd5aca11
+  data.tar.gz: d0f84e7cca7a0c0835028ad44d14febc074f687816888a47d3dc3ffa37510f8f13749b02da5d20904ea162123695ff87443460d5718f1e78f030b55c4de989c6

data/lib/rubinius/compiler.rb

@@ -8,4 +8,3 @@ require "rubinius/compiler/opcodes"
 require "rubinius/compiler/compiled_file"
 require "rubinius/compiler/evaluator"
 require "rubinius/compiler/printers"
-require "rubinius/compiler/runtime"

data/lib/rubinius/compiler/compiled_file.rb

@@ -1,6 +1,6 @@
 # -*- encoding: ascii-8bit -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   ##
   # A decode for the .rbc file format.
 
@@ -318,6 +318,8 @@ module Rubinius::ToolSets.current::ToolSet
           str.append marshal(val.post_args)
           str.append marshal(val.total_args)
           str.append marshal(val.splat)
+          str.append marshal(val.keywords)
+          str.append marshal(val.arity)
           str.append marshal(val.literals)
           str.append marshal(val.lines)
           str.append marshal(val.file)

data/lib/rubinius/compiler/compiler.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
 
   class CompileError < RuntimeError
   end

data/lib/rubinius/compiler/evaluator.rb

@@ -3,7 +3,7 @@
 ##
 # Used for the Rubinius::asm Compiler hook.
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   module AST
     class Node
     end
@@ -298,7 +298,7 @@ module Rubinius::ToolSets.current::ToolSet
       end
     end
 
-    class ActualArguments < Node
+    class Arguments < Node
       def execute(e)
         array = @array.map { |x| x.execute(e) }
         array << @splat.execute if @splat.kind_of? SplatValue

data/lib/rubinius/compiler/generator.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   class Generator
     include GeneratorMethods
 
@@ -261,6 +261,7 @@ module Rubinius::ToolSets.current::ToolSet
       @required_args = 0
       @post_args = 0
       @total_args = 0
+      @arity = 0
 
       @detected_args = 0
       @detected_locals = 0
@@ -268,6 +269,7 @@ module Rubinius::ToolSets.current::ToolSet
       @splat_index = nil
       @local_names = nil
       @block_index = nil
+      @keywords = nil
       @local_count = 0
 
       @state = []
@@ -285,7 +287,7 @@ module Rubinius::ToolSets.current::ToolSet
                   :required_args, :post_args, :total_args, :splat_index,
                   :local_count, :local_names, :primitive, :for_block, :for_module_body,
                   :current_block, :detected_args, :detected_locals,
-                  :block_index
+                  :block_index, :arity, :keywords
 
     def execute(node)
       node.bytecode self
@@ -324,8 +326,10 @@ module Rubinius::ToolSets.current::ToolSet
       code.total_args     = @total_args
       code.splat          = @splat_index
       code.block_index    = @block_index
+      code.arity          = @arity
       code.local_count    = @local_count
       code.local_names    = @local_names.to_tuple if @local_names
+      code.keywords       = @keywords.to_tuple if @keywords
 
       code.stack_size     = max_stack_size
       code.file           = @file

data/lib/rubinius/compiler/generator_methods.rb

@@ -1,6 +1,6 @@
 # *** This file is generated by InstructionParser ***
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   module GeneratorMethods
       def noop
         @stream << 0

data/lib/rubinius/compiler/locals.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   class Compiler
     module LocalVariables
       def variables

data/lib/rubinius/compiler/printers.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   class Compiler
     class Printer < Stage
       def initialize

data/lib/rubinius/compiler/stages.rb

@@ -1,6 +1,6 @@
 # -*- encoding: us-ascii -*-
 
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   class Compiler
     Stages = { }
 
@@ -134,7 +134,7 @@ module Rubinius::ToolSets.current::ToolSet
     end
 
     # AST -> symbolic bytecode
-    class Generator < Stage
+    class Bytecode < Stage
       stage :bytecode
       next_stage Encoder
 
@@ -144,7 +144,7 @@ module Rubinius::ToolSets.current::ToolSet
         super
         @variable_scope = nil
         compiler.generator = self
-        @processor = ToolSet::Generator
+        @processor = Generator
       end
 
       def run
@@ -214,7 +214,7 @@ module Rubinius::ToolSets.current::ToolSet
     # source file -> AST
     class FileParser < Parser
       stage :file
-      next_stage Generator
+      next_stage Bytecode
 
       def input(file, line=1)
         @file = file
@@ -229,7 +229,7 @@ module Rubinius::ToolSets.current::ToolSet
     # source string -> AST
     class StringParser < Parser
       stage :string
-      next_stage Generator
+      next_stage Bytecode
 
       def input(string, name="(eval)", line=1)
         @input = string
@@ -244,7 +244,7 @@ module Rubinius::ToolSets.current::ToolSet
 
     class EvalParser < StringParser
       stage :eval
-      next_stage Generator
+      next_stage Bytecode
 
       def should_cache?
         @output.should_cache?

data/lib/rubinius/compiler/version.rb

@@ -1,5 +1,5 @@
-module Rubinius::ToolSets.current::ToolSet
+module CodeTools
   class Compiler
-    VERSION = "2.1.1"
+    VERSION = "2.2.0"
   end
 end

data/rubinius-compiler.gemspec

@@ -1,10 +1,9 @@
 # coding: utf-8
-require 'rubinius/toolset'
 require './lib/rubinius/compiler/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "rubinius-compiler"
-  spec.version       = Rubinius::ToolSets.current::ToolSet::Compiler::VERSION
+  spec.version       = CodeTools::Compiler::VERSION
   spec.authors       = ["Brian Shirai"]
   spec.email         = ["brixen@gmail.com"]
   spec.description   = %q{Rubinius bytecode compiler.}
@@ -20,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubinius-toolset", "~> 2.2"
   spec.add_development_dependency "rubinius-processor", "~> 2.0"
   spec.add_development_dependency "rubinius-ast", "~> 2.0"
   spec.add_development_dependency "rubinius-bridge", "~> 1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-compiler
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubinius-toolset
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rubinius-processor
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +131,6 @@ files:
 - lib/rubinius/compiler/locals.rb
 - lib/rubinius/compiler/opcodes.rb
 - lib/rubinius/compiler/printers.rb
-- lib/rubinius/compiler/runtime.rb
 - lib/rubinius/compiler/stages.rb
 - lib/rubinius/compiler/version.rb
 - rubinius-compiler.gemspec

data/lib/rubinius/compiler/runtime.rb

@@ -1,72 +0,0 @@
-# -*- encoding: us-ascii -*-
-
-module Rubinius::ToolSets.current::ToolSet
-  module Compiler::Runtime
-    def self.matches_when(array, receiver)
-      array.each { |x| return true if x === receiver }
-      false
-    end
-
-    def self.unwrap_block_arg(arg)
-      if arg.size == 1
-        elem = arg.at(0)
-        return elem if elem.kind_of?(Array)
-      end
-
-      arg
-    end
-
-    def self.find_constant_for_op_asign_or(name, scope)
-      name = Rubinius::Type.coerce_to_constant_name name
-
-      current, constant = scope.module, undefined
-
-      while current
-        if entry = current.constant_table.lookup(name)
-          constant = entry.constant
-          constant = constant.call if constant.kind_of?(Autoload)
-          return constant
-        end
-
-        current = current.direct_superclass
-      end
-
-      if instance_of?(Module)
-        if entry = Object.constant_table.lookup(name)
-          constant = entry.constant
-          constant = constant.call if constant.kind_of?(Autoload)
-          return constant
-        end
-      end
-
-      nil
-    end
-
-    def self.get_flip_flop(scope, index)
-      scope.flip_flops ||= {}
-      scope.flip_flops[index]
-    end
-
-    def self.set_flip_flop(scope, index, value)
-      scope.flip_flops ||= {}
-      scope.flip_flops[index] = value
-    end
-
-    def self.rbx_marshal_constant
-      name
-    end
-
-    def self.get_encoding(name)
-      if defined?(Encoding)
-        Encoding.find name
-      else
-        name
-      end
-    end
-
-    def self.pre_exe
-      yield
-    end
-  end
-end
-