jruby · Mar 9, 2015 · Mar 9, 2015 · Mar 9, 2015 · Mar 9, 2015 · Mar 9, 2015
diff --git a/lib/ruby/truffle/mri/tsort.rb b/lib/ruby/truffle/mri/tsort.rb
@@ -0,0 +1 @@
+require_relative '../../stdlib/tsort'
diff --git a/spec/truffle/tags/core/kernel/__method___tags.txt b/spec/truffle/tags/core/kernel/__method___tags.txt
@@ -1,6 +1,3 @@
-fails:Kernel.__method__ returns the current method, even when aliased
-fails:Kernel.__method__ returns the original name when aliased method
-fails:Kernel.__method__ returns the caller from blocks too
 fails:Kernel.__method__ returns the caller from define_method too
 fails:Kernel.__method__ returns the caller from block inside define_method too
 fails:Kernel.__method__ returns method name even from eval

diff --git a/spec/truffle/tags/core/module/protected_instance_methods_tags.txt b/spec/truffle/tags/core/module/protected_instance_methods_tags.txt
@@ -1,7 +1,4 @@
 fails:Module#protected_instance_methods returns a list of protected methods in module and its ancestors
-fails:Module#protected_instance_methods when passed false as a parameter, should return only methods defined in that module
 fails:Module#protected_instance_methods default list should be the same as passing true as an argument
-fails:Module#protected_instance_methods when not passed an argument returns a unique list for a class including a module
-fails:Module#protected_instance_methods when not passed an argument returns a unique list for a subclass
 fails:Module#protected_instance_methods when passed true returns a unique list for a class including a module
 fails:Module#protected_instance_methods when passed true returns a unique list for a subclass
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/classify_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/classify_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/collect_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/collect_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/constructor_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/constructor_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/delete_if_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/delete_if_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/difference_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/difference_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/divide_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/divide_tags.txt
@@ -1,4 +1,2 @@
-fails:Set#divide divides self into a set of subsets based on the blocks return values
-fails:Set#divide yields each Object to the block
 fails:Set#divide when passed a block with an arity of 2 divides self into a set of subsets based on the blocks return values
 fails:Set#divide when passed a block with an arity of 2 yields each two Object to the block
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/each_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/each_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/enumerable/to_set_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/enumerable/to_set_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/eql_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/eql_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/equal_value_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/equal_value_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/exclusion_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/exclusion_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/flatten_merge_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/flatten_merge_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/flatten_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/flatten_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/hash_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/hash_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/initialize_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/initialize_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/inspect_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/inspect_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/keep_if_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/keep_if_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/map_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/map_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/merge_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/merge_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/minus_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/minus_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/plus_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/plus_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/pretty_print_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/pretty_print_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/reject_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/reject_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/replace_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/replace_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/select_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/select_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/add_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/add_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/append_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/append_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/classify_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/classify_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/clear_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/clear_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/collect_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/collect_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/constructor_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/constructor_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/delete_if_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/delete_if_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/delete_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/delete_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/difference_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/difference_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/divide_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/divide_tags.txt
@@ -1,4 +1,2 @@
-fails:SortedSet#divide divides self into a set of subsets based on the blocks return values
-fails:SortedSet#divide yields each Object in self in sorted order
 fails:SortedSet#divide when passed a block with an arity of 2 divides self into a set of subsets based on the blocks return values
 fails:SortedSet#divide when passed a block with an arity of 2 yields each two Objects to the block
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/each_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/each_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/empty_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/empty_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/eql_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/eql_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/equal_value_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/equal_value_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/exclusion_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/exclusion_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/flatten_merge_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/flatten_merge_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/flatten_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/flatten_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/hash_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/hash_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/include_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/include_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/initialize_copy_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/initialize_copy_tags.txt
@@ -1,2 +1 @@
-fails:SortedSet#initialize_copy is private
 fails:SortedSet#initialize_copy replaces all elements of self with the elements of the passed SortedSet
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/initialize_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/initialize_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/inspect_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/inspect_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/intersection_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/intersection_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/keep_if_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/keep_if_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/length_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/length_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/map_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/map_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/member_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/member_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/merge_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/merge_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/minus_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/minus_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/plus_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/plus_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/pretty_print_cycle_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/pretty_print_cycle_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/pretty_print_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/pretty_print_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/proper_subset_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/proper_subset_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/proper_superset_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/proper_superset_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/reject_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/reject_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/replace_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/replace_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/select_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/select_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/size_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/size_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/subset_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/subset_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/subtract_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/subtract_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/superset_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/superset_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/to_a_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/to_a_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/union_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/sortedset/union_tags.txt
diff --git a/spec/truffle/tags/rubysl/rubysl-set/spec/union_tags.txt b/spec/truffle/tags/rubysl/rubysl-set/spec/union_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -217,7 +217,7 @@ public abstract static class CompareNode extends CoreMethodNode {
 
         public CompareNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            equalNode = SameOrEqualNodeFactory.create(context, sourceSection, new RubyNode[] { null, null });
+            equalNode = SameOrEqualNodeFactory.create(context, sourceSection, new RubyNode[]{null, null});
         }
 
         public CompareNode(CompareNode prev) {
@@ -1264,6 +1264,25 @@ public Object loop(VirtualFrame frame) {
         }
     }
 
+    @CoreMethod(names = "__method__", needsSelf = false)
+    public abstract static class MethodNameNode extends CoreMethodNode {
+
+        public MethodNameNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public MethodNameNode(MethodNameNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public RubySymbol methodName(VirtualFrame frame) {
+            notDesignedForCompilation();
+            return getContext().getSymbolTable().getSymbol(RubyCallStack.getCallingMethod(frame).getSharedMethodInfo().getName());
+        }
+
+    }
+
     @CoreMethod(names = "method", required = 1)
     public abstract static class MethodNode extends CoreMethodNode {
 

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
@@ -1361,6 +1361,44 @@ public RubyModule privateClassMethod(RubyModule module, Object... args) {
         }
     }
 
+    @CoreMethod(names = "protected_instance_methods", optional = 1)
+    public abstract static class ProtectedInstanceMethodsNode extends CoreMethodNode {
+
+        public ProtectedInstanceMethodsNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public ProtectedInstanceMethodsNode(ProtectedInstanceMethodsNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public RubyArray protectedInstanceMethods(RubyModule module, UndefinedPlaceholder argument) {
+            return protectedInstanceMethods(module, false);
+        }
+
+        @Specialization
+        public RubyArray protectedInstanceMethods(RubyModule module, boolean includeAncestors) {
+            notDesignedForCompilation();
+
+            final RubyArray array = new RubyArray(getContext().getCoreLibrary().getArrayClass());
+            final List<InternalMethod> methods = new ArrayList<>(module.getMethods().values());
+
+            if (includeAncestors) {
+                for (RubyModule parent : module.parentAncestors()) {
+                    methods.addAll(parent.getMethods().values());
+                }
+            }
+            for (InternalMethod method : methods) {
+                if (method.getVisibility() == Visibility.PROTECTED){
+                    RubySymbol m = getContext().newSymbol(method.getName());
+                    array.slowPush(m);
+                }
+            }
+            return array;
+        }
+    }
+
     @CoreMethod(names = "private_instance_methods", optional = 1)
     public abstract static class PrivateInstanceMethodsNode extends CoreMethodNode {
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:SortedSet#initialize_copy is private
		fails:SortedSet#initialize_copy replaces all elements of self with the elements of the passed SortedSet