rubinius-compiler 2.0.1 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c558f3859bda208baa71099d5ec085fa853d45e4
-  data.tar.gz: a6428c0622f9f8dddd0e27da64fbb7bfc8190557
+  metadata.gz: a8770864e11b10b91210d89d9278f223f8471fd3
+  data.tar.gz: 380f6ba72280272efeed19dd29317b702a358bce
 SHA512:
-  metadata.gz: 73ae2ad2e56e7c881296c09e28528831d068d3f612b18cab52d5de1c0bdf8e6bbfabb77a12ed80f472680bd05fdbedca2d69452550a03c59a0203d35c3f2ed17
-  data.tar.gz: 33212cd87c6820c5fe30609e757f7ecd1fb68b5bbcb94fd2b1e8d522280f361512de50868060d76e03ac9097d8e40ae1c8f76b4d4bd6805719664514f58a30b5
+  metadata.gz: a213cb2271866445a8c951ae8769c68cc75d8b87c0ce25575d5364f29bd91d0319b764b6f3779c1827c268a90d6d8ed59709572505208aa3dfdee00a044bf1a1
+  data.tar.gz: 308bbb4be99788c507e5e193d293e1268613cacbd2b37739085b8c8fe38f665953c752291fe61522027010ae50059ddf857b504efa759cddc2159b391feefcdb

data/lib/rubinius/compiler/compiled_file.rb

@@ -140,8 +140,10 @@ module Rubinius::ToolSet.current::TS
           str.force_encoding enc if enc and defined?(Encoding)
           return str
         when 120 # ?x
+          enc = unmarshal_data
           count = next_string.to_i
           str = next_bytes count
+          str.force_encoding enc if enc and defined?(Encoding)
           return str.to_sym
         when 99  # ?c
           count = next_string.to_i
@@ -264,7 +266,18 @@ module Rubinius::ToolSet.current::TS
           "s\n#{enc_name}#{val.bytesize}\n#{val}\n"
         when Symbol
           s = val.to_s
-          "x\n#{s.bytesize}\n#{s}\n"
+          if defined?(Encoding)
+            # We manually construct the Encoding data to avoid recursion
+            # marshaling an Encoding name as a String.
+            name = s.encoding.name
+            enc_name = "E\n#{name.bytesize}\n#{name}\n"
+          else
+            # The kernel code is all US-ASCII. When building melbourne for 1.8
+            # Ruby, we fake a bunch of encoding stuff so force US-ASCII here.
+            enc_name = "E\n8\nUS-ASCII\n"
+          end
+
+          "x\n#{enc_name}#{s.bytesize}\n#{s}\n"
         when Rubinius::Tuple
           str = "p\n#{val.size}\n"
           val.each do |ele|

data/lib/rubinius/compiler/printers.rb

@@ -56,7 +56,7 @@ module Rubinius::ToolSet.current::TS
         puts "Stack size:  #{code.stack_size}"
         literals = code.literals.collect do |literal|
           case literal
-          when CompiledCode
+          when Rubinius::CompiledCode
             "<compiled code>"
           else
             literal.inspect

data/lib/rubinius/compiler/version.rb

@@ -1,5 +1,5 @@
 module Rubinius::ToolSet.current::TS
   module Compiler
-    VERSION = "2.0.1"
+    VERSION = "2.0.4"
   end
 end

data/rubinius-compiler.gemspec

@@ -17,8 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.0"
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-compiler
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.4
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-10-02 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: Rubinius bytecode compiler.
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -74,12 +74,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -89,3 +89,4 @@ signing_key:
 specification_version: 4
 summary: Rubinius bytecode compiler.
 test_files: []
+has_rdoc: