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

Commits on Dec 29, 2014

  1. [Truffle] Added String#concat.

    @nirvdrum
    nirvdrum committed Dec 29, 2014
    Copy the full SHA
    e8d294c View commit details

  2. [Truffle] Untagged some passing String#concat specs.

    @nirvdrum
    nirvdrum committed Dec 29, 2014
    Copy the full SHA
    e822799 View commit details
Showing with 1 addition and 10 deletions.
  1. +1 −1 core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
  2. +0 −9 spec/truffle/tags/core/string/concat_tags.txt
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
View file
Original file line number Diff line number Diff line change
@@ -138,7 +138,7 @@ public int compare(RubyString a, RubyString b) {
}
}

@CoreMethod(names = "<<", required = 1)
@CoreMethod(names = { "<<", "concat" }, required = 1)
public abstract static class ConcatNode extends CoreMethodNode {

public ConcatNode(RubyContext context, SourceSection sourceSection) {
9 changes: 0 additions & 9 deletions spec/truffle/tags/core/string/concat_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
fails:String#concat concatenates the given argument to self and returns self
fails:String#concat converts the given argument to a String using to_str
fails:String#concat raises a TypeError if the given argument can't be converted to a String
fails:String#concat raises a RuntimeError when self is frozen
fails:String#concat works when given a subclass instance
fails:String#concat taints self if other is tainted
fails:String#concat untrusts self if other is untrusted
fails:String#concat with Integer concatencates the argument interpreted as a codepoint
@@ -11,16 +9,9 @@ fails:String#concat with Integer raises RangeError if the argument is an invalid
fails:String#concat with Integer raises RangeError if the argument is negative
fails:String#concat with Integer doesn't call to_int on its argument
fails:String#concat with Integer raises a RuntimeError when self is frozen
fails:String#concat when self is in an ASCII-incompatible encoding incompatible with the argument's encoding uses self's encoding if both are empty
fails:String#concat when self is in an ASCII-incompatible encoding incompatible with the argument's encoding uses self's encoding if the argument is empty
fails:String#concat when self is in an ASCII-incompatible encoding incompatible with the argument's encoding uses the argument's encoding if self is empty
fails:String#concat when self is in an ASCII-incompatible encoding incompatible with the argument's encoding raises Encoding::CompatibilityError if neither are empty
fails:String#concat when the argument is in an ASCII-incompatible encoding incompatible with self's encoding uses self's encoding if both are empty
fails:String#concat when the argument is in an ASCII-incompatible encoding incompatible with self's encoding uses self's encoding if the argument is empty
fails:String#concat when the argument is in an ASCII-incompatible encoding incompatible with self's encoding uses the argument's encoding if self is empty
fails:String#concat when the argument is in an ASCII-incompatible encoding incompatible with self's encoding raises Encoding::CompatibilityError if neither are empty
fails:String#concat when self and the argument are in different ASCII-compatible encodings uses self's encoding if both are ASCII-only
fails:String#concat when self and the argument are in different ASCII-compatible encodings uses self's encoding if the argument is ASCII-only
fails:String#concat when self and the argument are in different ASCII-compatible encodings uses the argument's encoding if self is ASCII-only
fails:String#concat when self and the argument are in different ASCII-compatible encodings raises Encoding::CompatibilityError if neither are ASCII-only
fails:String#concat when self is ASCII-8BIT and argument is US-ASCII uses ASCII-8BIT encoding