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: 638de887ef56
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 54abab9d2ee8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 13, 2016

  1. Copy the full SHA
    e6c25d8 View commit details
  2. Copy the full SHA
    54abab9 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 tool/jt.rb
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ module Utilities

def self.truffle_version
File.foreach("#{JRUBY_DIR}/truffle/pom.rb") do |line|
if /'truffle\.version' => '(\d+\.\d+|\h+-SNAPSHOT)'/ =~ line
if /'truffle\.version' => '(\d+\.\d+(?:-SNAPSHOT)?|\h+-SNAPSHOT)'/ =~ line
break $1
end
end
Original file line number Diff line number Diff line change
@@ -3136,7 +3136,7 @@ public DynamicObject string_escape(DynamicObject string) {

}

@Primitive(name = "string_find_character")
@Primitive(name = "string_find_character", lowerFixnumParameters = 0)
@ImportStatic(StringGuards.class)
public static abstract class StringFindCharacterNode extends PrimitiveArrayArgumentsNode {