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: 427c7866d967
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2090571fc8ee
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 22, 2014

  1. [Truffle] - Handles empty string on String#capitalize and String#capi… 

    …talize!
    @lucasallan
    lucasallan committed Dec 22, 2014

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    cceec43 View commit details

  2. Merge branch 'master' of github.com:jruby/jruby

    @lucasallan
    lucasallan committed Dec 22, 2014
    Copy the full SHA
    2090571 View commit details
Showing with 15 additions and 10 deletions.
  1. +15 −10 core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
25 changes: 15 additions & 10 deletions core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
View file
Original file line number Diff line number Diff line change
@@ -1212,11 +1212,14 @@ public CapitalizeBangNode(CapitalizeBangNode prev) {
public RubyString capitalizeBang(RubyString string) {
notDesignedForCompilation();
String javaString = string.toString();
String head = javaString.substring(0, 1).toUpperCase();
String tail = javaString.substring(1, javaString.length()).toLowerCase();

string.set(ByteList.create((head + tail)));
return string;
if (javaString.isEmpty()) {
return string;
} else {
String head = javaString.substring(0, 1).toUpperCase();
String tail = javaString.substring(1, javaString.length()).toLowerCase();
string.set(ByteList.create((head + tail)));
return string;
}
}
}

@@ -1234,12 +1237,14 @@ public CapitalizeNode(CapitalizeNode prev) {
@Specialization
public RubyString capitalize(RubyString string) {
notDesignedForCompilation();

String javaString = string.toString();
String head = javaString.substring(0, 1).toUpperCase();
String tail = javaString.substring(1, javaString.length()).toLowerCase();

return string.getContext().makeString(head + tail);
if (javaString.isEmpty()) {
return string;
} else {
String head = javaString.substring(0, 1).toUpperCase();
String tail = javaString.substring(1, javaString.length()).toLowerCase();
return string.getContext().makeString(head + tail);
}
}

}