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

Commits on May 8, 2015

  1. Updated Helpers#encodeParameterList to work with any INameNode.

    @nirvdrum
    nirvdrum committed May 8, 2015
    Copy the full SHA
    ff737e9 View commit details

  2. Replaced Strings with chars.

    @nirvdrum
    nirvdrum committed May 8, 2015
    Copy the full SHA
    87481db View commit details
Showing with 9 additions and 8 deletions.
  1. +9 −8 core/src/main/java/org/jruby/runtime/Helpers.java
17 changes: 9 additions & 8 deletions core/src/main/java/org/jruby/runtime/Helpers.java
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
import org.jruby.ast.Node;
import org.jruby.ast.OptArgNode;
import org.jruby.ast.UnnamedRestArgNode;
import org.jruby.ast.types.INameNode;
import org.jruby.ast.util.ArgsUtil;
import org.jruby.ast.RequiredKeywordArgumentValueNode;
import org.jruby.common.IRubyWarnings.ID;
@@ -2512,7 +2513,7 @@ public static String encodeParameterList(ArgsNode argsNode) {
if (preNode instanceof MultipleAsgnNode) {
builder.append("nil");
} else {
builder.append("q").append(((ArgumentNode)preNode).getName());
builder.append('q').append(((ArgumentNode)preNode).getName());
}
}
}
@@ -2521,7 +2522,7 @@ public static String encodeParameterList(ArgsNode argsNode) {
for (Node optNode : argsNode.getOptArgs().childNodes()) {
if (added) builder.append(';');
added = true;
builder.append("o");
builder.append('o');
if (optNode instanceof OptArgNode) {
builder.append(((OptArgNode)optNode).getName());
} else if (optNode instanceof LocalAsgnNode) {
@@ -2539,7 +2540,7 @@ public static String encodeParameterList(ArgsNode argsNode) {
if (restArg instanceof UnnamedRestArgNode) {
if (((UnnamedRestArgNode) restArg).isStar()) builder.append("R");
} else {
builder.append("r").append(restArg.getName());
builder.append('r').append(restArg.getName());
}
}

@@ -2550,7 +2551,7 @@ public static String encodeParameterList(ArgsNode argsNode) {
if (postNode instanceof MultipleAsgnNode) {
builder.append("nil");
} else {
builder.append("q").append(((ArgumentNode)postNode).getName());
builder.append('q').append(((ArgumentNode)postNode).getName());
}
}
}
@@ -2561,9 +2562,9 @@ public static String encodeParameterList(ArgsNode argsNode) {
if (added) builder.append(';');
added = true;
if (isRequiredKeywordArgumentValueNode(asgnNode)) {
builder.append("K").append(((DAsgnNode) asgnNode).getName());
builder.append('K').append(((INameNode) asgnNode).getName());
} else {
builder.append("k").append(((DAsgnNode) asgnNode).getName());
builder.append('k').append(((INameNode) asgnNode).getName());
}
}
}
@@ -2572,14 +2573,14 @@ public static String encodeParameterList(ArgsNode argsNode) {
if (argsNode.getKeyRest() != null) {
if (added) builder.append(';');
added = true;
builder.append("e").append(argsNode.getKeyRest().getName());
builder.append('e').append(argsNode.getKeyRest().getName());
}


if (argsNode.getBlock() != null) {
if (added) builder.append(';');
added = true;
builder.append("b").append(argsNode.getBlock().getName());
builder.append('b').append(argsNode.getBlock().getName());
}

if (!added) {