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

Commits on Dec 12, 2017

  1. Fixes #4882. Ripper doesn't handle private def with nested block....a… 

    …nd others.

While slowly figuring out a single-line change which fixed this issue I also
noticed several other mismatches between the two parsers.  Hopefully, at this
point, they are identical.

I also deleted a emacs turd.

RubyParser.y appears to be changed but they were minor whitespace differences
with Ripper.  I tried to make these two files a little bit easier to diff.
    @enebo
    enebo committed Dec 12, 2017
    Copy the full SHA
    509a249 View commit details

  2. Fix one regression (caused massive duplication in reported elements -… 

    …- which

seemed to just break yard but not mri tests) from last fix.  Still one more
regression to go.
    @enebo
    enebo committed Dec 12, 2017
    Copy the full SHA
    c41788f View commit details

  3. Fixes another regression from fix of #4882. In this case we would loo… 

    …k for

duplicated variables in higher level production f_opt and f_block_opt but now
that check is done at the actual variable itself.
    @enebo
    enebo committed Dec 12, 2017
    Copy the full SHA
    8e38eba View commit details
35 changes: 0 additions & 35 deletions core/src/main/java/org/jruby/ext/ripper/#RipperParserState.java#
View file

This file was deleted.

10 changes: 5 additions & 5 deletions core/src/main/java/org/jruby/ext/ripper/RipperLexer.java
View file
Original file line number Diff line number Diff line change
@@ -338,7 +338,7 @@ public int tokenize_ident(int result) {
String value = createTokenString();

if (!isLexState(last_state, EXPR_DOT|EXPR_FNAME) && parser.getCurrentScope().isDefined(value) >= 0) {
setState(EXPR_END|EXPR_LABEL);
setState(EXPR_END);
}

identValue = value.intern();
@@ -1194,10 +1194,9 @@ private int yylex() throws IOException {
}

private int identifierToken(int last_state, int result, String value) {

if (result == RipperParser.tIDENTIFIER && !isLexState(last_state, EXPR_DOT) &&
if (result == RipperParser.tIDENTIFIER && !isLexState(last_state, EXPR_DOT|EXPR_FNAME) &&
parser.getCurrentScope().isDefined(value) >= 0) {
setState(EXPR_END);
setState(EXPR_END|EXPR_LABEL);
}

identValue = value.intern();
@@ -1575,8 +1574,8 @@ private int identifier(int c, boolean commandState) throws IOException {

int result = 0;

String tempVal;
last_state = lex_state;
String tempVal;
if (lastBangOrPredicate) {
result = RipperParser.tFID;
tempVal = createTokenString();
@@ -1598,6 +1597,7 @@ private int identifier(int c, boolean commandState) throws IOException {
}
}
tempVal = createTokenString();

if (result == 0 && Character.isUpperCase(tempVal.charAt(0))) {
result = RipperParser.tCONSTANT;
} else {
Loading