jruby · May 17, 2015 · May 17, 2015 · May 17, 2015 · May 17, 2015 · May 17, 2015
diff --git a/spec/ruby/core/module/remove_method_spec.rb b/spec/ruby/core/module/remove_method_spec.rb
@@ -47,7 +47,7 @@ def method_to_remove; 2; end
     x.method_to_remove.should == 1
   end
 
-  it "requires multiple arguments" do
+  it "accepts multiple arguments" do
     Module.instance_method(:remove_method).arity.should < 0
   end
 

diff --git a/spec/truffle/tags/core/argf/argf_tags.txt b/spec/truffle/tags/core/argf/argf_tags.txt
diff --git a/spec/truffle/tags/core/argf/binmode_tags.txt b/spec/truffle/tags/core/argf/binmode_tags.txt
@@ -1,5 +1,3 @@
-fails:ARGF.binmode returns self
 fails:ARGF.binmode does not raise an error
-fails:ARGF.binmode sets the file's encoding to ASCII-8BIT
 fails:ARGF.binmode puts reading into binmode
 fails:ARGF.binmode puts alls subsequent stream reading through ARGF into binmode
diff --git a/spec/truffle/tags/core/argf/codepoints_tags.txt b/spec/truffle/tags/core/argf/codepoints_tags.txt
@@ -1,5 +1,2 @@
-fails:ARGF.codepoints is a public method
-fails:ARGF.codepoints does not require arguments
 fails:ARGF.codepoints returns self when passed a block
-fails:ARGF.codepoints returns an Enumerator when passed no block
 fails:ARGF.codepoints yields each codepoint of all streams
diff --git a/spec/truffle/tags/core/argf/each_codepoint_tags.txt b/spec/truffle/tags/core/argf/each_codepoint_tags.txt
@@ -1,5 +1,2 @@
-fails:ARGF.each_codepoint is a public method
-fails:ARGF.each_codepoint does not require arguments
 fails:ARGF.each_codepoint returns self when passed a block
-fails:ARGF.each_codepoint returns an Enumerator when passed no block
 fails:ARGF.each_codepoint yields each codepoint of all streams
diff --git a/spec/truffle/tags/core/argf/each_line_tags.txt b/spec/truffle/tags/core/argf/each_line_tags.txt
@@ -1,6 +1,3 @@
-fails:ARGF.each_line is a public method
-fails:ARGF.each_line requires multiple arguments
 fails:ARGF.each_line reads each line of files
 fails:ARGF.each_line returns self when passed a block
-fails:ARGF.each_line returns an Enumerator when passed no block
 fails:ARGF.each_line with a separator yields each separated section of all streams
diff --git a/spec/truffle/tags/core/argf/each_tags.txt b/spec/truffle/tags/core/argf/each_tags.txt
@@ -1,6 +1,3 @@
-fails:ARGF.each is a public method
-fails:ARGF.each requires multiple arguments
 fails:ARGF.each reads each line of files
 fails:ARGF.each returns self when passed a block
-fails:ARGF.each returns an Enumerator when passed no block
 fails:ARGF.each with a separator yields each separated section of all streams
diff --git a/spec/truffle/tags/core/argf/gets_tags.txt b/spec/truffle/tags/core/argf/gets_tags.txt
@@ -1,6 +1,5 @@
 fails:ARGF.gets reads one line of a file
 fails:ARGF.gets reads all lines of a file
-fails:ARGF.gets reads all lines of stdin
 fails:ARGF.gets reads all lines of two files
 fails:ARGF.gets sets $_ global variable with each line read
 fails:ARGF.gets modifies the files when in place edit mode is on

diff --git a/spec/truffle/tags/core/argf/lines_tags.txt b/spec/truffle/tags/core/argf/lines_tags.txt
@@ -1,6 +1,3 @@
-fails:ARGF.lines is a public method
-fails:ARGF.lines requires multiple arguments
 fails:ARGF.lines reads each line of files
 fails:ARGF.lines returns self when passed a block
-fails:ARGF.lines returns an Enumerator when passed no block
 fails:ARGF.lines with a separator yields each separated section of all streams
diff --git a/spec/truffle/tags/core/argf/read_tags.txt b/spec/truffle/tags/core/argf/read_tags.txt
@@ -7,9 +7,6 @@ fails:ARGF.read reads from a single file consecutively
 fails:ARGF.read reads the contents of two files
 fails:ARGF.read reads the contents of one file and some characters from the second
 fails:ARGF.read reads across two files consecutively
-fails:ARGF.read reads the contents of stdin
-fails:ARGF.read reads a number of bytes from stdin
-fails:ARGF.read reads the contents of one file and stdin
 fails:ARGF.read reads the contents of the same file twice
 fails:ARGF.read reads the contents of a special device file
 fails:ARGF.read reads the contents of the file with default encoding
diff --git a/spec/truffle/tags/core/argf/readline_tags.txt b/spec/truffle/tags/core/argf/readline_tags.txt
@@ -1,6 +1,5 @@
 fails:ARGF.readline reads one line of a file
 fails:ARGF.readline reads all lines of a file
-fails:ARGF.readline reads all lines of stdin
 fails:ARGF.readline reads all lines of two files
 fails:ARGF.readline sets $_ global variable with each line read
 fails:ARGF.readline modifies the files when in place edit mode is on

diff --git a/spec/truffle/tags/core/argf/seek_tags.txt b/spec/truffle/tags/core/argf/seek_tags.txt
@@ -1,4 +1,3 @@
 fails:ARGF.seek sets the absolute position relative to beginning of file
 fails:ARGF.seek sets the position relative to current position in file
 fails:ARGF.seek sets the absolute position relative to end of file
-fails:ARGF.seek takes at least one argument (offset)
diff --git a/spec/truffle/tags/core/argf/skip_tags.txt b/spec/truffle/tags/core/argf/skip_tags.txt
@@ -1,4 +1,3 @@
 fails:ARGF.skip skips the current file
 fails:ARGF.skip has no effect when called twice in a row
 fails:ARGF.skip has no effect at end of stream
-fails:ARGF.skip has no effect when the current file is the last
diff --git a/spec/truffle/tags/core/argf/to_s_tags.txt b/spec/truffle/tags/core/argf/to_s_tags.txt
diff --git a/spec/truffle/tags/core/module/remove_method_tags.txt b/spec/truffle/tags/core/module/remove_method_tags.txt
diff --git a/spec/truffle/tags/library/ipaddr/hton_tags.txt b/spec/truffle/tags/library/ipaddr/hton_tags.txt
@@ -0,0 +1,2 @@
+fails:IPAddr#hton converts IPAddr to network byte order
+fails:IPAddr#new_ntoh creates a new IPAddr using hton notation
diff --git a/spec/truffle/tags/library/ipaddr/new_tags.txt b/spec/truffle/tags/library/ipaddr/new_tags.txt
@@ -1 +1,4 @@
 fails:IPAddr#new initializes IPAddr ipv4 mapped address with subnet mask
+fails:IPAddr#new initializes IPAddr ipv4 address
+fails:IPAddr#new initializes IPAddr ipv4 address with / subnet notation
+fails:IPAddr#new initializes IPAddr ipv4 address with subnet mask
diff --git a/spec/truffle/truffle.mspec b/spec/truffle/truffle.mspec
@@ -51,7 +51,10 @@ class MSpecScript
     # "^spec/ruby/core/string/gsub_spec.rb",
 
     # require etc, linux only spec
-    "^spec/ruby/core/io/advise_spec.rb"
+    "^spec/ruby/core/io/advise_spec.rb",
+
+    # Pollutes other tests
+    "^spec/ruby/core/argf/binmode_spec.rb"
   ]
 
   core += [

diff --git a/test/check_versions.sh b/test/check_versions.sh
@@ -12,7 +12,6 @@ rm -rf maven/*/target/*
 ./mvnw -Pcomplete
 ./mvnw -Pdist
 ./mvnw -Pjruby-jars
-./mvnw -Pjruby-tests
 ./mvnw -Pmain
 
 declare -a failed
@@ -62,7 +61,6 @@ function check {
 
 }
 
-check test/target/jruby-tests-$jar_version.jar 1
 check lib/target/jruby-stdlib-$jar_version.jar 8
 check maven/jruby-jars/pkg/jruby-jars-$gem_version.gem 30
 check maven/jruby-jars/lib/jruby-core-$jar_version-complete.jar 13

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -44,6 +44,7 @@
 import org.jruby.truffle.nodes.dispatch.DispatchAction;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
 import org.jruby.truffle.nodes.dispatch.MissingBehavior;
+import org.jruby.truffle.nodes.literal.ObjectLiteralNode;
 import org.jruby.truffle.nodes.methods.SetMethodDeclarationContext;
 import org.jruby.truffle.nodes.objects.*;
 import org.jruby.truffle.nodes.yield.YieldDispatchHeadNode;
@@ -1681,29 +1682,28 @@ Object removeConstant(RubyModule module, String name) {
     @CoreMethod(names = "remove_method", argumentsAsArray = true, visibility = Visibility.PRIVATE)
     public abstract static class RemoveMethodNode extends CoreMethodArrayArgumentsNode {
 
+        @Child SymbolOrToStrNode symbolOrToStrNode;
+        @Child RaiseIfFrozenNode raiseIfFrozenNode;
+
         public RemoveMethodNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
+            this.symbolOrToStrNode = SymbolOrToStrNodeGen.create(context, sourceSection, null);
+            this.raiseIfFrozenNode = new RaiseIfFrozenNode(new SelfNode(context, sourceSection));
         }
 
-        @CompilerDirectives.TruffleBoundary
         @Specialization
-        public RubyModule removeMethod(RubyModule module, Object[] args) {
+        public RubyModule removeMethod(VirtualFrame frame, RubyModule module, Object[] args) {
             for (Object arg : args) {
-                final String name;
+                final String name = symbolOrToStrNode.executeToJavaString(frame, arg);
+                raiseIfFrozenNode.execute(frame);
 
-                if (arg instanceof RubySymbol) {
-                    name = ((RubySymbol) arg).toString();
-                } else if (arg instanceof RubyString) {
-                    name = ((RubyString) arg).toString();
+                if (module.getMethods().containsKey(name)) {
+                    module.removeMethod(name);
                 } else {
-                    // TODO BF 9-APR-2015 the MRI message calls inspect for error message i think
                     CompilerDirectives.transferToInterpreter();
-                    throw new RaiseException(getContext().getCoreLibrary().typeError(" is not a symbol", this));
+                    throw new RaiseException(getContext().getCoreLibrary().nameErrorMethodNotDefinedIn(module, name, this));
                 }
-                module.removeMethod(this, name);
-
             }
-
             return module;
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/pack/parser/PackParser.java b/truffle/src/main/java/org/jruby/truffle/pack/parser/PackParser.java
@@ -76,8 +76,6 @@ public PackNode parse(PackTokenizer tokenizer, boolean inParens) {
                             throw new UnsupportedOperationException("unbalanced parens");
                         }
                     case 'C':
-                        node = writeInteger(8, nativeEndianness());
-                        break;
                     case 'c':
                         node = writeInteger(8, nativeEndianness());
                         break;

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -939,6 +939,11 @@ public RubyException nameErrorUndefinedMethod(String name, RubyModule module, No
         return nameError(String.format("undefined method `%s' for %s", name, module.getName()), name, currentNode);
     }
 
+    public RubyException nameErrorMethodNotDefinedIn(RubyModule module, String name, Node currentNode) {
+        CompilerAsserts.neverPartOfCompilation();
+        return nameError(String.format("method `%s' not defined in %s", name, module.getName()), name, currentNode);
+    }
+
     public RubyException nameErrorPrivateMethod(String name, RubyModule module, Node currentNode) {
         CompilerAsserts.neverPartOfCompilation();
         return nameError(String.format("method `%s' for %s is private", name, module.getName()), name, currentNode);

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
@@ -278,9 +278,7 @@ public void addMethod(Node currentNode, InternalMethod method) {
     }
 
     @TruffleBoundary
-    public void removeMethod(Node currentNode, String methodName) {
-        checkFrozen(currentNode);
-
+    public void removeMethod(String methodName) {
         methods.remove(methodName);
         newVersion();
     }

diff --git a/truffle/src/main/ruby/core.rb b/truffle/src/main/ruby/core.rb
@@ -109,7 +109,7 @@
 require_relative 'core/rubinius/common/proc'
 require_relative 'core/rubinius/common/enumerable'
 require_relative 'core/rubinius/common/enumerator'
-#require_relative 'core/rubinius/common/argf'
+require_relative 'core/rubinius/common/argf'
 #require_relative 'core/rubinius/common/tuple'
 require_relative 'core/rubinius/common/exception'
 require_relative 'core/rubinius/common/undefined'

diff --git a/truffle/src/main/ruby/core/rubinius/common/argf.rb b/truffle/src/main/ruby/core/rubinius/common/argf.rb
diff --git a/truffle/src/main/ruby/core/shims.rb b/truffle/src/main/ruby/core/shims.rb
@@ -50,8 +50,6 @@ def external_encoding
   end
 end
 
-ARGF = Object.new
-
 class Regexp
   def self.last_match(n = nil)
     if n

diff --git a/truffle/src/main/ruby/core/truffle/cext/require.rb b/truffle/src/main/ruby/core/truffle/cext/require.rb
@@ -6,47 +6,42 @@
 # GNU General Public License version 2
 # GNU Lesser General Public License version 2.1
 
-module Kernel
+if Truffle::CExt.supported?
 
-  if Truffle::CExt.supported?
+  # Monkey patch #require, similar to how RubyGems does, in order to load
+  # C extensions.
 
-    # Monkey patch #require, similar to how RubyGems does, in order to load
-    # C extensions.
+  def require(name)
+    puts "here!"
 
-    alias_method :truffle_cext_original_require, :require
+    # We're getting quite hacky here. A lot of C extensions are required
+    # using the format foo/foo, so we need to guess that the real name is
+    # foo from that.
 
-    def require(name)
-      # We're getting quite hacky here. A lot of C extensions are required
-      # using the format foo/foo, so we need to guess that the real name is
-      # foo from that.
-
-      if name =~ /(.+?)\/\1/
-        cext_name = $1
-      else
-        cext_name = name
-      end
+    if name =~ /(.+?)\/\1/
+      cext_name = $1
+    else
+      cext_name = name
+    end
 
-      # Look in each $JRUBY_TRUFFLE_CEXT_PATH directory for
-      # cext_name/ext/cext_name/extconf.rb
+    # Look in each $JRUBY_TRUFFLE_CEXT_PATH directory for
+    # cext_name/ext/cext_name/extconf.rb
 
-      if ENV.include? 'JRUBY_TRUFFLE_CEXT_PATH'
-        cext_path = ENV['JRUBY_TRUFFLE_CEXT_PATH'].split(':')
-      else
-        cext_path = [Dir.pwd]
-      end
+    if ENV.include? 'JRUBY_TRUFFLE_CEXT_PATH'
+      cext_path = ENV['JRUBY_TRUFFLE_CEXT_PATH'].split(':')
+    else
+      cext_path = [Dir.pwd]
+    end
 
-      cext_path.each do |dir|
-        extconf = File.join(dir, cext_name, 'ext', cext_name, 'extconf.rb')
+    cext_path.each do |dir|
+      extconf = File.join(dir, cext_name, 'ext', cext_name, 'extconf.rb')
 
-        if File.exist? extconf
-          return Truffle::CExt::load_extconf(extconf)
-        end
+      if File.exist? extconf
+        return Truffle::CExt::load_extconf(extconf)
       end
-
-      truffle_cext_original_require name
     end
-    module_function :require
 
+    Kernel.require name
   end
 
 end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fails:IPAddr#hton converts IPAddr to network byte order
		fails:IPAddr#new_ntoh creates a new IPAddr using hton notation