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

Commits on Apr 18, 2017

  1. Passing null position should not be allowed

    @enebo
    enebo committed Apr 18, 2017
    Copy the full SHA
    8a077ff View commit details

  2. off by one hell in warnings from deprecating away from ISourcePosition

    @enebo
    enebo committed Apr 18, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ee57db8 View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 core/src/main/java/org/jruby/common/RubyWarnings.java
  2. +1 −1 core/src/main/java/org/jruby/ext/ripper/RipperParserBase.java
6 changes: 3 additions & 3 deletions core/src/main/java/org/jruby/common/RubyWarnings.java
View file
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ public boolean isVerbose() {
public void warn(ID id, ISourcePosition position, String message) {
if (!runtime.warningsEnabled()) return;

warn(id, position.getFile(), position.getLine() + 1, message);
warn(id, position.getFile(), position.getLine(), message);
}

/**
@@ -82,7 +82,7 @@ public void warn(ID id, String fileName, int lineNumber, String message) {

StringBuilder buffer = new StringBuilder(100);

buffer.append(fileName).append(':').append(lineNumber).append(": ");
buffer.append(fileName).append(':').append(lineNumber + 1).append(": ");
buffer.append("warning: ").append(message).append('\n');
IRubyObject errorStream = runtime.getGlobalVariables().get("$stderr");
errorStream.callMethod(runtime.getCurrentContext(), "write", runtime.newString(buffer.toString()));
@@ -166,7 +166,7 @@ public void warning(ID id, String message) {
@Override
@Deprecated
public void warning(ID id, ISourcePosition position, String message) {
warning(id, position.getFile(), position.getLine() + 1, message);
warning(id, position.getFile(), position.getLine(), message);
}

/**
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/ripper/RipperParserBase.java
View file
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ public IRubyObject assignable(IRubyObject name) {
return name;
}

currentScope.assign(null, javaName.intern(), null);
currentScope.assign(lexer.getPosition(), javaName.intern(), null);

return name;
}