Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3719d63cd1c7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 17279c74e2bf
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Jun 1, 2015

  1. [Truffle] Full Module#alias_method.

    @eregon
    eregon committed Jun 1, 2015
    Copy the full SHA
    7ac4c61 View commit details

  2. [Truffle] Fix shadowed variable warning.

    @eregon
    eregon committed Jun 1, 2015
    Copy the full SHA
    17279c7 View commit details
6 changes: 0 additions & 6 deletions spec/truffle/tags/core/module/alias_method_tags.txt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
View file
Original file line number Diff line number Diff line change
@@ -286,7 +286,7 @@ public Object compare(VirtualFrame frame, RubyModule self, RubyBasicObject other

}

@CoreMethod(names = "alias_method", required = 2)
@CoreMethod(names = "alias_method", required = 2, visibility = Visibility.PRIVATE)
@NodeChildren({
@NodeChild(type = RubyNode.class, value = "module"),
@NodeChild(type = RubyNode.class, value = "newName"),
8 changes: 7 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
View file
Original file line number Diff line number Diff line change
@@ -325,7 +325,13 @@ public void alias(Node currentNode, String newName, String oldName) {
throw new RaiseException(getContext().getCoreLibrary().noMethodErrorOnModule(oldName, this, currentNode));
}

addMethod(currentNode, method.withName(newName));
InternalMethod aliasMethod = method.withName(newName);

if (ModuleOperations.isMethodPrivateFromName(newName)) {
aliasMethod = aliasMethod.withVisibility(Visibility.PRIVATE);
}

addMethod(currentNode, aliasMethod);
}

@TruffleBoundary
8 changes: 4 additions & 4 deletions truffle/src/main/ruby/core/rubinius/common/regexp.rb
View file
Original file line number Diff line number Diff line change
@@ -122,12 +122,12 @@ def self.union(*patterns)

str = "".encode(enc)
sep = "|".encode(enc)
patterns.each_with_index do |pat, idx|
patterns.each_with_index do |pattern, idx|
str << sep if idx != 0
if pat.kind_of? Regexp
str << pat.to_s
if pattern.kind_of? Regexp
str << pattern.to_s
else
str << Regexp.quote(StringValue(pat))
str << Regexp.quote(StringValue(pattern))
end
end