rubinius-compiler 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5acab156c744b74d3701a97ce2a936ed5a626e4
-  data.tar.gz: 01b7e1db56052cc7f8959251505415f955772ad8
+  metadata.gz: 5ce7bfe87d566ab6ce14b3394c0f73c684ec7296
+  data.tar.gz: 2d164dc5242d6c385ea3d0b156c37c77d545b387
 SHA512:
-  metadata.gz: fd08452cfd3e40636214c3db841365131ad15cafb2aa15e1517b0ae33add7aceb82e34a8f67da2bf504682a33a96b61bac1052fd94b3731ba6705ba29f6d02dd
-  data.tar.gz: 2324f6df47926b6e38818e482083b0305ab0031c7c92094c98f944c2b67fe0ef369573c633bbe49db5e692c26a4be8bcd5446389bc541a1225a2e619e4214573
+  metadata.gz: 95d55cdba119ed0403f6f5b8cbfacabbdfe14f17f0a04fcac1edf130335d125a52c7b2829199f35c9a3e9490c901d557a185584816352d0e0f71d88783a240b6
+  data.tar.gz: 54f4932a5a13faf06119fd393fa5e63b5f625e3a17da25410bd3e37eb14ef57efbe36e3f34c38b5c3d2c0a51afd60f51812e81bcb7fe07799e3347e25a514082

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+env:
+  - RUBYLIB=lib:.
+before_install: gem install rubinius-toolset
+script: mspec -r spec/spec_helper spec
+rvm:
+  - 2.1.0
+  - rbx-2

data/lib/rubinius/compiler/compiled_file.rb

@@ -1,4 +1,4 @@
-# -*- encoding: us-ascii -*-
+# -*- encoding: ascii-8bit -*-
 
 module Rubinius::ToolSets.current::ToolSet
   ##
@@ -137,13 +137,13 @@ module Rubinius::ToolSets.current::ToolSet
           enc = unmarshal_data
           count = next_string.to_i
           str = next_bytes count
-          str.force_encoding enc if enc and defined?(Encoding)
+          str.force_encoding enc if enc
           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)
+          str.force_encoding enc if enc
           return str.to_sym
         when 99  # ?c
           count = next_string.to_i
@@ -170,7 +170,7 @@ module Rubinius::ToolSets.current::ToolSet
         when 69  # ?E
           count = next_string.to_i
           name = next_bytes count
-          return Encoding.find(name) if defined?(Encoding)
+          return Encoding.find(name)
         when 77  # ?M
           version = next_string.to_i
           if version != 1
@@ -238,6 +238,26 @@ module Rubinius::ToolSets.current::ToolSet
 
       private :next_bytes
 
+      ##
+      # A helper function to force strings to ASCII-8BIT encoding. This is
+      # needed because Ruby's encoding system causes the result of a UTF-8
+      # string interpolated in a file (like this one) with a ASCII-8BIT
+      # encoding magic comment to be UTF-8. In other words, given the
+      # following script:
+      #
+      #   # -*- encoding: ascii-8bit -*s
+      #
+      #   x = "❤"
+      #   s = "abc #{x}"
+      #
+      # the string, s, will have UTF-8 encoding, NOT ASCII-8BIT encoding.
+
+      def b(val)
+        val.force_encoding Encoding::ASCII_8BIT
+      end
+
+      private :b
+
       ##
       # For object +val+, return a String represetation.
 
@@ -250,40 +270,20 @@ module Rubinius::ToolSets.current::ToolSet
         when NilClass
           "n\n"
         when Fixnum, Bignum
-          "I\n#{val.to_s(16)}\n"
+          b "I\n#{val.to_s(16)}\n"
         when String
-          if defined?(Encoding)
-            # We manually construct the Encoding data to avoid recursion
-            # marshaling an Encoding name as a String.
-            name = val.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
-
-          "s\n#{enc_name}#{val.bytesize}\n#{val}\n"
+          name = val.encoding.name
+          enc_name = "E\n#{name.bytesize}\n#{name}\n"
+          b "s\n#{enc_name}#{val.bytesize}\n#{val}\n"
         when Symbol
           s = val.to_s
-          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"
+          name = s.encoding.name
+          enc_name = "E\n#{name.bytesize}\n#{name}\n"
+          b "x\n#{enc_name}#{s.bytesize}\n#{s}\n"
         when Rubinius::Tuple
           str = "p\n#{val.size}\n"
           val.each do |ele|
-            data = marshal(ele)
-            data.force_encoding(str.encoding) if defined?(Encoding)
-            str.append data
+            str.append marshal(ele)
           end
           str
         when Float

data/lib/rubinius/compiler/version.rb

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

data/rubinius-compiler.gemspec

@@ -19,4 +19,10 @@ 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"
+  spec.add_development_dependency "redcard", "~> 1.0"
 end

data/spec/alias_spec.rb

@@ -0,0 +1,39 @@
+describe "An Alias node" do
+  alias_both = lambda do |g|
+    g.push_scope
+    g.push_literal :y
+    g.push_literal :x
+    g.send :alias_method, 2, true
+  end
+
+  relates "alias :y :x" do
+    compile(&alias_both)
+  end
+
+  relates "alias y x" do
+    compile(&alias_both)
+  end
+
+  relates <<-ruby do
+      alias :"y\#{1}" :"x\#{2}"
+    ruby
+
+    compile do |g|
+      g.push_scope
+
+      g.push_literal "y"
+      g.push 1
+      g.meta_to_s
+      g.string_build 2
+      g.send :to_sym, 0, true
+
+      g.push_literal "x"
+      g.push 2
+      g.meta_to_s
+      g.string_build 2
+      g.send :to_sym, 0, true
+
+      g.send :alias_method, 2, true
+    end
+  end
+end

data/spec/and_spec.rb

@@ -0,0 +1,44 @@
+describe "An And node" do
+  relates "(a and b)" do
+    compile do |g|
+      g.push :self
+      g.send :a, 0, true
+      g.dup
+
+      lhs_true = g.new_label
+      g.gif lhs_true
+
+      g.pop
+      g.push :self
+      g.send :b, 0, true
+
+      lhs_true.set!
+    end
+  end
+
+  relates "() and a" do
+    compile do |g|
+      f = g.new_label
+      g.push :nil
+      g.dup
+      g.gif f
+      g.pop
+      g.push :self
+      g.send :a, 0, true
+      f.set!
+    end
+  end
+
+  relates "a and ()" do
+    compile do |g|
+      f = g.new_label
+      g.push :self
+      g.send :a, 0, true
+      g.dup
+      g.gif f
+      g.pop
+      g.push :nil
+      f.set!
+    end
+  end
+end

data/spec/array_spec.rb

@@ -0,0 +1,110 @@
+describe "An Array node" do
+  relates '[1, :b, "c"]' do
+    compile do |g|
+      g.push 1
+      g.push_literal :b
+      g.push_literal "c"
+      g.string_dup
+      g.make_array 3
+    end
+  end
+
+  relates "%w[a b c]" do
+    compile do |g|
+      g.push_literal "a"
+      g.string_dup
+      g.push_literal "b"
+      g.string_dup
+      g.push_literal "c"
+      g.string_dup
+      g.make_array 3
+    end
+  end
+
+  relates '%w[a #{@b} c]' do
+    compile do |g|
+      g.push_literal "a"
+      g.string_dup
+
+      g.push_literal "\#{@b}"
+      g.string_dup
+
+      g.push_literal "c"
+      g.string_dup
+      g.make_array 3
+    end
+  end
+
+  relates "%W[a b c]" do
+    compile do |g|
+      g.push_literal "a"
+      g.string_dup
+      g.push_literal "b"
+      g.string_dup
+      g.push_literal "c"
+      g.string_dup
+      g.make_array 3
+    end
+  end
+
+  relates '%W[a #{@b} c]' do
+    compile do |g|
+      g.push_literal "a"
+      g.string_dup
+
+      g.push_ivar :@b
+      g.meta_to_s
+      g.string_build 1
+
+      g.push_literal "c"
+      g.string_dup
+      g.make_array 3
+    end
+  end
+
+  relates "[*[1]]" do
+    compile do |g|
+      g.push 1
+      g.make_array 1
+    end
+  end
+
+  relates "[*1]" do
+    compile do |g|
+      g.push 1
+      g.cast_array
+    end
+  end
+
+  relates "[[*1]]" do
+    compile do |g|
+      g.push 1
+      g.cast_array
+      g.make_array 1
+    end
+  end
+
+  relates "[1, *2]" do
+    compile do |g|
+      g.push 1
+      g.make_array 1
+
+      g.push 2
+      g.cast_array
+
+      g.send :+, 1
+    end
+  end
+
+  relates "[1, *c()]" do
+    # TODO
+  end
+
+  relates <<-ruby do
+      x = [2]
+      [1, *x]
+    ruby
+
+    # TODO
+  end
+end

data/spec/attrasgn_spec.rb

@@ -0,0 +1,186 @@
+describe "An Attrasgn node" do
+  relates <<-ruby do
+      y = 0
+      42.method = y
+    ruby
+
+    compile do |g|
+      g.push 0
+      g.set_local 0
+      g.pop
+      g.push 42
+      g.push_local 0
+      g.dup
+      g.move_down 2
+      g.send :method=, 1, false
+      g.pop
+    end
+  end
+
+  relates "a.m = *[1]" do
+    # attrasgn_splat
+  end
+
+  relates "a[*b] = c" do
+    compile do |g|
+      g.push :self
+      g.send :a, 0, true
+      g.push :self
+      g.send :b, 0, true
+      g.cast_array
+      g.push :self
+      g.send :c, 0, true
+      g.dup
+      g.move_down 3
+      g.swap
+      g.push :nil
+      g.send_with_splat :[]=, 1, false, true
+      g.pop
+    end
+  end
+
+  relates "a[b, *c] = d" do
+    compile do |g|
+      g.push :self
+      g.send :a, 0, true
+      g.push :self
+      g.send :b, 0, true
+      g.make_array 1
+      g.push :self
+      g.send :c, 0, true
+      g.cast_array
+      g.send :+, 1
+      g.push :self
+      g.send :d, 0, true
+      g.dup
+      g.move_down 3
+      g.swap
+      g.push :nil
+      g.send_with_splat :[]=, 1, false, true
+      g.pop
+    end
+  end
+
+  relates "a[b, *c] = *d" do
+    compile do |g|
+      g.push :self
+      g.send :a, 0, true
+      g.push :self
+      g.send :b, 0, true
+      g.make_array 1
+      g.push :self
+      g.send :c, 0, true
+      g.cast_array
+      g.send :+, 1
+      g.push :self
+      g.send :d, 0, true
+      g.cast_array
+      g.dup
+      g.move_down 3
+      g.swap
+      g.push :nil
+      g.send_with_splat :[]=, 1, false, true
+      g.pop
+    end
+  end
+
+  relates "a[b, *c] = d, e" do
+    compile do |g|
+      g.push :self
+      g.send :a, 0, true
+      g.push :self
+      g.send :b, 0, true
+      g.make_array 1
+      g.push :self
+      g.send :c, 0, true
+      g.cast_array
+      g.send :+, 1
+      g.push :self
+      g.send :d, 0, true
+      g.push :self
+      g.send :e, 0, true
+      g.make_array 2
+      g.dup
+      g.move_down 3
+      g.swap
+      g.push :nil
+      g.send_with_splat :[]=, 1, false, true
+      g.pop
+    end
+  end
+
+  relates "a[42] = 24" do
+    compile do |g|
+      g.push :self
+      g.send :a, 0, true
+      g.push 42
+      g.push 24
+      g.dup
+      g.move_down 3
+      g.send :[]=, 2, false
+      g.pop
+    end
+  end
+
+  relates "self[index, 0] = other_string" do
+    compile do |g|
+      g.push :self
+      g.push :self
+      g.send :index, 0, true
+      g.push 0
+      g.push :self
+      g.send :other_string, 0, true
+      g.dup
+      g.move_down 4
+      g.send :[]=, 3, true
+      g.pop
+    end
+  end
+
+  relates <<-ruby do
+      a = []
+      a [42] = 24
+    ruby
+
+    compile do |g|
+      g.make_array 0
+      g.set_local 0
+      g.pop
+      g.push_local 0
+      g.push 42
+      g.push 24
+      g.dup
+      g.move_down 3
+      g.send :[]=, 2, false
+      g.pop
+    end
+  end
+
+  ruby_version_is ""..."1.9" do
+    relates "m { |a.b| }" do
+      compile do |g|
+        g.push :self
+
+        d = new_block_generator(g)
+
+        d.cast_for_single_block_arg
+
+        d.push :self
+        d.send :a, 0, true
+        d.swap
+        d.send :b=, 1, false
+        d.pop
+
+        d.push_modifiers
+        d.new_label.set!
+        d.push :nil
+        d.pop_modifiers
+        d.ret
+
+        g.create_block(d)
+
+        g.send_with_block :m, 0, true
+      end
+    end
+  end
+end