rubinius-melbourne 2.0.0.19 → 2.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2707b9089a094027e673782a2482aa761cfd2c40
-  data.tar.gz: 2e3242f6ef0e6105da433a42919f4c3888a92a6c
+  metadata.gz: b66e13de74897f9ce250c9cc03854b5480e213ba
+  data.tar.gz: a3a1a4673bd4180440e30721f24e47349ec6a272
 SHA512:
-  metadata.gz: be76d146a72a79ddabd411636c4824d93e91e21f72a9171163bde48e34c7827fa895e815645a9e7f341ab4ad801ef3670d7fa55bbcb1e5ed1777307d9dd7f8eb
-  data.tar.gz: ca634acf9f7bfcebb04f5a28c44e9879cc6f2225a50c1a337afb9ffd605e053041d3b43945436dcf04facc8dc48dc6e00cb1b309c0aaf1acf95efce77a1ebf84
+  metadata.gz: 75897ae8e978ad3a8f18e4294fda365b0056b7408761db2d14fce91427ce06136dd20a9664af38104a0e2abbfbcdf5d74a94b1a202d1e26ab8b704b8e19dcb01
+  data.tar.gz: 5ddd5b9db0e47cab21cd29fb5aead3fa646ec370660668829baf10056b862aec7ee41eaa879ad1a4977a52a64ec2026d40a855d75e88fb93d0f79db88e25337a

data/.gitignore

@@ -20,3 +20,4 @@ test/version_tmp
 tmp
 .rbx
 Makefile
+namespace.h

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+env:
+  - MELBOURNE_SPEC_VERSION=1 RUBYLIB=lib:.
+  - MELBOURNE_SPEC_VERSION=1 RUBYLIB=.
+script: bundle exec mspec spec
+rvm:
+  - 2.0.0
+  - rbx-2
+matrix:
+  exclude:
+    - rvm: ruby-head
+      env: MELBOURNE_SPEC_VERSION=1 RUBYLIB=lib:.
+    - rvm: rbx-2
+      env: MELBOURNE_SPEC_VERSION=1 RUBYLIB=.

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rubinius-melbourne.gemspec
 gemspec
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+end

data/Rakefile

@@ -1,2 +1,33 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require "redcard"
+
+if RedCard.check :rubinius
+  namespace :spec do
+    desc "Build the parser extension"
+    task :build do
+      Dir.chdir "ext/rubinius/melbourne" do
+        ruby "-v extconf.rb"
+        ruby "-e 'system %[make && make install]'"
+      end
+    end
+
+    desc "Load the perser into the Spec ToolSet"
+    task :toolset do
+      Rubinius::ToolSet.start
+      require "rubinius/melbourne"
+      Rubinius::ToolSet.finish :spec
+    end
+  end
+
+  dependencies = %w[spec:build spec:toolset]
+else
+  dependencies = []
+end
+
+desc "Run the specs"
+task :spec => dependencies do
+  sh "mspec spec"
+end
+
+task :default => :spec

data/ext/rubinius/melbourne/extconf.rb

@@ -14,13 +14,20 @@ require File.expand_path("../../../../lib/rubinius/melbourne/version", __FILE__)
 path = File.expand_path "../namespace.h", __FILE__
 File.open path, "wb" do |f|
   version = Rubinius::ToolSet.current::TS::Melbourne::VERSION
+
+  if ENV["MELBOURNE_SPEC_VERSION"]
+    # Alter the version to not match any possible loaded version
+    version = version.split(".").map { |x| x + 1 }.join(".")
+  end
+
   melbourne = "melbourne_#{version.gsub(/\./, "_")}"
+
   f.puts "#define MELBOURNE                 #{melbourne}"
   f.puts "#define MELBOURNE_FILE_TO_AST     #{melbourne}_file_to_ast"
   f.puts "#define MELBOURNE_STRING_TO_AST   #{melbourne}_string_to_ast"
 end
 
-unless File.exists? "Makefile" and
+unless File.exist? "Makefile" and
     File.mtime("Makefile") > File.mtime(__FILE__)
   cxx = ENV["CXX"] || RbConfig::CONFIG["CXX"] || "g++"
   cxxflags = "#{ENV["CXXFLAGS"] || ENV["CPPFLAGS"] ||
@@ -37,7 +44,7 @@ unless File.exists? "Makefile" and
   archincdirs = []
   incdirs.each do |x|
     dir = "#{x}/#{RbConfig::CONFIG["arch"]}"
-    archincdirs << dir if File.exists? dir
+    archincdirs << dir if File.exist? dir
   end
   incdirs.concat archincdirs
 

data/lib/rubinius/melbourne.rb

@@ -74,7 +74,7 @@ module Rubinius::ToolSet.current::TS
     end
 
     def parse_file
-      unless @name and File.exists? @name
+      unless @name and File.exist? @name
         raise Errno::ENOENT, @name.inspect
       end
 

data/lib/rubinius/melbourne/version.rb

@@ -1,5 +1,5 @@
 module Rubinius::ToolSet.current::TS
   class Melbourne
-    VERSION = "2.0.0.19"
+    VERSION = "2.0.1.0"
   end
 end

data/rubinius-melbourne.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.version       = Rubinius::ToolSet.current::TS::Melbourne::VERSION
 
-  spec.add_runtime_dependency      "rubinius-toolset"
+  spec.add_runtime_dependency     "rubinius-toolset"
 
-  spec.add_development_dependency  "mspec", "~> 1.5"
-  spec.add_development_dependency  "rake",  "~> 10.0"
+  spec.add_development_dependency "rubinius-toolset", "~> 2.0"
+  spec.add_development_dependency "redcard", "~> 1.0"
+  spec.add_development_dependency "mspec", "~> 1.5"
+  spec.add_development_dependency "rake",  "~> 10.0"
 end

data/spec/alias_spec.rb

@@ -0,0 +1,40 @@
+describe "An Alias node" do
+  relates <<-ruby do
+      class X
+        alias :y :x
+      end
+    ruby
+
+    parse do
+      [:class, :X, nil, [:scope, [:alias, [:lit, :y], [:lit, :x]]]]
+    end
+  end
+
+  relates <<-ruby do
+      class X
+        alias y x
+      end
+    ruby
+
+    parse do
+      [:class, :X, nil, [:scope, [:alias, [:lit, :y], [:lit, :x]]]]
+    end
+  end
+
+  relates <<-ruby do
+      class X
+        alias :"y\#{1}" :"x\#{2}"
+      end
+    ruby
+
+    parse do
+      [:class,
+       :X,
+       nil,
+       [:scope,
+        [:alias,
+         [:dsym, "y", [:evstr, [:lit, 1]]],
+         [:dsym, "x", [:evstr, [:lit, 2]]]]]]
+    end
+  end
+end

data/spec/and_spec.rb

@@ -0,0 +1,19 @@
+describe "An And node" do
+  relates "(a and b)" do
+    parse do
+      [:and, [:call, nil, :a, [:arglist]], [:call, nil, :b, [:arglist]]]
+    end
+  end
+
+  relates "() and a" do
+    parse do
+      [:and, [:nil], [:call, nil, :a, [:arglist]]]
+    end
+  end
+
+  relates "a and ()" do
+    parse do
+      [:and, [:call, nil, :a, [:arglist]], [:nil]]
+    end
+  end
+end

data/spec/array_spec.rb

@@ -0,0 +1,81 @@
+describe "An Array node" do
+  relates '[1, :b, "c"]' do
+    parse do
+      [:array, [:lit, 1], [:lit, :b], [:str, "c"]]
+    end
+  end
+
+  relates "%w[a b c]" do
+    parse do
+      [:array, [:str, "a"], [:str, "b"], [:str, "c"]]
+    end
+  end
+
+  relates '%w[a #{@b} c]' do
+    parse do
+      [:array, [:str, "a"], [:str, "\#{@b}"], [:str, "c"]]
+    end
+  end
+
+  relates "%W[a b c]" do
+    parse do
+      [:array,
+        [:str, "a"], [:str, "b"], [:str, "c"]]
+    end
+  end
+
+  relates '%W[a #{@b} c]' do
+    parse do
+      [:array,
+        [:str, "a"],
+        [:dstr, "", [:evstr, [:ivar, :@b]]],
+        [:str, "c"]]
+    end
+  end
+
+  relates "[*[1]]" do
+    parse do
+      [:array, [:splat, [:array, [:lit, 1]]]]
+    end
+  end
+
+  relates "[*1]" do
+    parse do
+      [:array, [:splat, [:lit, 1]]]
+    end
+  end
+
+  relates "[[*1]]" do
+    parse do
+      [:array, [:array, [:splat, [:lit, 1]]]]
+    end
+  end
+
+  relates "[1, *2]" do
+    parse do
+      [:array, [:lit, 1], [:splat, [:lit, 2]]]
+    end
+  end
+
+  relates "[1, *c()]" do
+    parse do
+      [:array, [:lit, 1], [:splat, [:call, nil, :c, [:arglist]]]]
+    end
+
+    # TODO
+  end
+
+  relates <<-ruby do
+      x = [2]
+      [1, *x]
+    ruby
+
+    parse do
+      [:block,
+       [:lasgn, :x, [:array, [:lit, 2]]],
+       [:array, [:lit, 1], [:splat, [:lvar, :x]]]]
+    end
+
+    # TODO
+  end
+end

data/spec/attrasgn_spec.rb

@@ -0,0 +1,112 @@
+describe "An Attrasgn node" do
+  relates <<-ruby do
+      y = 0
+      42.method = y
+    ruby
+
+    parse do
+      [:block,
+       [:lasgn, :y, [:lit, 0]],
+       [:attrasgn, [:lit, 42], :method=, [:arglist, [:lvar, :y]]]]
+    end
+  end
+
+  relates "a.m = *[1]" do
+    parse do
+      [:attrasgn,
+       [:call, nil, :a, [:arglist]],
+       :m=,
+       [:arglist, [:svalue, [:splat, [:array, [:lit, 1]]]]]]
+    end
+
+    # attrasgn_splat
+  end
+
+  relates "a[*b] = c" do
+    parse do
+      [:attrasgn,
+       [:call, nil, :a, [:arglist]],
+       :[]=,
+       [:arglist,
+        [:splat, [:call, nil, :b, [:arglist]]],
+        [:call, nil, :c, [:arglist]]]]
+    end
+  end
+
+  relates "a[b, *c] = d" do
+    parse do
+      [:attrasgn,
+       [:call, nil, :a, [:arglist]],
+       :[]=,
+       [:arglist,
+        [:array,
+         [:call, nil, :b, [:arglist]],
+         [:splat, [:call, nil, :c, [:arglist]]]],
+        [:call, nil, :d, [:arglist]]]]
+    end
+  end
+
+  relates "a[b, *c] = *d" do
+    parse do
+      [:attrasgn,
+       [:call, nil, :a, [:arglist]],
+       :[]=,
+       [:arglist,
+        [:array,
+         [:call, nil, :b, [:arglist]],
+         [:splat, [:call, nil, :c, [:arglist]]]],
+        [:svalue, [:splat, [:call, nil, :d, [:arglist]]]]]]
+    end
+  end
+
+  relates "a[b, *c] = d, e" do
+    parse do
+      [:attrasgn,
+       [:call, nil, :a, [:arglist]],
+       :[]=,
+       [:arglist,
+        [:array,
+         [:call, nil, :b, [:arglist]],
+         [:splat, [:call, nil, :c, [:arglist]]]],
+        [:svalue,
+         [:array, [:call, nil, :d, [:arglist]], [:call, nil, :e, [:arglist]]]]]]
+    end
+  end
+
+  relates "a[42] = 24" do
+    parse do
+      [:attrasgn,
+       [:call, nil, :a, [:arglist]],
+       :[]=,
+       [:arglist, [:lit, 42], [:lit, 24]]]
+    end
+  end
+
+  relates "self[index, 0] = other_string" do
+    parse do
+      [:attrasgn,
+       [:self],
+       :[]=,
+       [:arglist,
+        [:call, nil, :index, [:arglist]],
+        [:lit, 0],
+        [:call, nil, :other_string, [:arglist]]]]
+    end
+  end
+
+  relates <<-ruby do
+      a = []
+      a [42] = 24
+    ruby
+
+    parse do
+      [:block,
+       [:lasgn, :a, [:array]],
+       [:attrasgn, [:lvar, :a], :[]=, [:arglist, [:lit, 42], [:lit, 24]]]]
+    end
+  end
+
+  relates "m { |a.b| }" do
+    # TODO
+  end
+end

data/spec/back_ref_spec.rb

@@ -0,0 +1,11 @@
+describe "An Back_ref node" do
+  relates "[$&, $`, $', $+]" do
+    parse do
+      [:array,
+       [:back_ref, :&],
+       [:back_ref, :`],
+       [:back_ref, :"'"],
+       [:back_ref, :+]]
+    end
+  end
+end

data/spec/call_spec.rb

@@ -0,0 +1,298 @@
+describe "A Call node" do
+  relates "self.method" do
+    parse do
+      [:call, [:self], :method, [:arglist]]
+    end
+  end
+
+  relates "1.m(2)" do
+    parse do
+      [:call, [:lit, 1], :m, [:arglist, [:lit, 2]]]
+    end
+  end
+
+  relates "h(1, 2, *a)" do
+    parse do
+      [:call, nil, :h,
+       [:arglist,
+         [:lit, 1],
+         [:lit, 2],
+         [:splat, [:call, nil, :a, [:arglist]]]]]
+    end
+  end
+
+  relates <<-ruby do
+      begin
+        (1 + 1)
+      end
+    ruby
+
+    parse do
+      [:call, [:lit, 1], :+, [:arglist, [:lit, 1]]]
+    end
+  end
+
+  relates "blah(*a)" do
+    parse do
+      [:call, nil, :blah,
+        [:arglist, [:splat, [:call, nil, :a, [:arglist]]]]]
+    end
+  end
+
+  relates "a.b(&c)" do
+    parse do
+      [:call,
+       [:call, nil, :a, [:arglist]],
+       :b,
+       [:arglist, [:block_pass, [:call, nil, :c, [:arglist]]]]]
+    end
+  end
+
+  relates "a.b(4, &c)" do
+    parse do
+      [:call,
+       [:call, nil, :a, [:arglist]],
+       :b,
+       [:arglist, [:lit, 4], [:block_pass, [:call, nil, :c, [:arglist]]]]]
+    end
+  end
+
+  relates "a.b(1, 2, 3, &c)" do
+    parse do
+      [:call,
+       [:call, nil, :a, [:arglist]],
+       :b,
+       [:arglist,
+        [:lit, 1],
+        [:lit, 2],
+        [:lit, 3],
+        [:block_pass, [:call, nil, :c, [:arglist]]]]]
+    end
+  end
+
+  relates "a(&b)" do
+    parse do
+      [:call,
+       nil,
+       :a,
+       [:arglist, [:block_pass, [:call, nil, :b, [:arglist]]]]]
+    end
+  end
+
+  relates "a(4, &b)" do
+    parse do
+      [:call,
+       nil,
+       :a,
+       [:arglist, [:lit, 4], [:block_pass, [:call, nil, :b, [:arglist]]]]]
+    end
+  end
+
+  relates "a(1, 2, 3, &b)" do
+    parse do
+      [:call,
+       nil,
+       :a,
+       [:arglist,
+        [:lit, 1],
+        [:lit, 2],
+        [:lit, 3],
+        [:block_pass, [:call, nil, :b, [:arglist]]]]]
+    end
+  end
+
+  relates "define_attr_method(:x, :sequence_name, &Proc.new { |*args| nil })" do
+    parse do
+      [:call,
+       nil,
+       :define_attr_method,
+       [:arglist,
+        [:lit, :x],
+        [:lit, :sequence_name],
+        [:block_pass,
+         [:iter,
+          [:call, [:const, :Proc], :new, [:arglist]],
+          [:masgn, [:array, [:splat, [:lasgn, :args]]]],
+          [:nil]]]]]
+    end
+  end
+
+  relates "r.read_body(dest, &block)" do
+    parse do
+      [:call,
+       [:call, nil, :r, [:arglist]],
+       :read_body,
+       [:arglist,
+        [:call, nil, :dest, [:arglist]],
+        [:block_pass, [:call, nil, :block, [:arglist]]]]]
+    end
+  end
+
+  relates "o.m(:a => 1, :b => 2)" do
+    parse do
+      [:call,
+       [:call, nil, :o, [:arglist]],
+       :m,
+       [:arglist, [:hash, [:lit, :a], [:lit, 1], [:lit, :b], [:lit, 2]]]]
+    end
+  end
+
+  relates "o.m(42, :a => 1, :b => 2)" do
+    parse do
+      [:call,
+       [:call, nil, :o, [:arglist]],
+       :m,
+       [:arglist,
+        [:lit, 42],
+        [:hash, [:lit, :a], [:lit, 1], [:lit, :b], [:lit, 2]]]]
+    end
+  end
+
+  relates "o.m(42, :a => 1, :b => 2, *c)" do
+    parse do
+      [:call,
+       [:call, nil, :o, [:arglist]],
+       :m,
+       [:arglist,
+        [:lit, 42],
+        [:hash, [:lit, :a], [:lit, 1], [:lit, :b], [:lit, 2]],
+        [:splat, [:call, nil, :c, [:arglist]]]]]
+    end
+  end
+
+  relates "a (1,2,3)" do
+    parse do
+      [:call, nil, :a, [:arglist, [:lit, 1], [:lit, 2], [:lit, 3]]]
+    end
+  end
+
+  relates "o.puts(42)" do
+    parse do
+      [:call, [:call, nil, :o, [:arglist]], :puts, [:arglist, [:lit, 42]]]
+    end
+  end
+
+  relates "1.b(c)" do
+    parse do
+      [:call, [:lit, 1], :b, [:arglist, [:call, nil, :c, [:arglist]]]]
+    end
+  end
+
+  relates "(v = (1 + 1)).zero?" do
+    parse do
+      [:call,
+       [:lasgn, :v, [:call, [:lit, 1], :+, [:arglist, [:lit, 1]]]],
+       :zero?,
+       [:arglist]]
+    end
+  end
+
+  relates "-2**31" do
+    parse do
+      [:call,
+       [:call, [:lit, 2], :**, [:arglist, [:lit, 31]]],
+       :-@,
+       [:arglist]]
+    end
+  end
+
+  relates "a[]" do
+    parse do
+      [:call, [:call, nil, :a, [:arglist]], :[], [:arglist]]
+    end
+  end
+
+  relates "m(:a => 1, :b => 2)" do
+    parse do
+      [:call,
+       nil,
+       :m,
+       [:arglist, [:hash, [:lit, :a], [:lit, 1], [:lit, :b], [:lit, 2]]]]
+    end
+  end
+
+  relates "m(42, :a => 1, :b => 2)" do
+    parse do
+      [:call,
+       nil,
+       :m,
+       [:arglist, [:lit, 42], [:hash, [:lit, :a], [:lit, 1], [:lit, :b], [:lit, 2]]]]
+    end
+  end
+
+  relates "m(42, :a => 1, :b => 2, *c)" do
+    parse do
+      [:call,
+       nil,
+       :m,
+       [:arglist,
+        [:lit, 42],
+        [:hash, [:lit, :a], [:lit, 1], [:lit, :b], [:lit, 2]],
+        [:splat, [:call, nil, :c, [:arglist]]]]]
+    end
+  end
+
+  relates "m(42)" do
+    parse do
+      [:call, nil, :m, [:arglist, [:lit, 42]]]
+    end
+  end
+
+  relates "a(:b) { :c }" do
+    parse do
+      [:iter, [:call, nil, :a, [:arglist, [:lit, :b]]], nil, [:lit, :c]]
+    end
+  end
+
+  relates "a [42]" do
+    parse do
+      [:call, nil, :a, [:arglist, [:array, [:lit, 42]]]]
+    end
+  end
+
+  relates "42 if block_given?" do
+    parse do
+      [:if, [:call, nil, :block_given?, [:arglist]], [:lit, 42], nil]
+    end
+  end
+
+  relates "method" do
+    parse do
+      [:call, nil, :method, [:arglist]]
+    end
+  end
+
+  relates <<-ruby do
+      a << begin
+             b
+           rescue
+             c
+           end
+    ruby
+
+    parse do
+      [:call,
+       [:call, nil, :a, [:arglist]],
+       :<<,
+       [:arglist,
+        [:rescue,
+         [:call, nil, :b, [:arglist]],
+         [:resbody, [:array], [:call, nil, :c, [:arglist]]]]]]
+    end
+  end
+
+  relates "meth([*[1]])" do
+    parse do
+      [:call,
+        nil,
+        :meth,
+        [:arglist, [:array, [:splat, [:array, [:lit, 1]]]]]]
+    end
+  end
+
+  relates "meth(*[1])" do
+    parse do
+      [:call, nil, :meth, [:arglist, [:splat, [:array, [:lit, 1]]]]]
+    end
+  end
+end