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

Commits on Apr 27, 2018

  1. Fix recent grammar error in spec:ruby:fast not parsing some test code.

    @enebo
    enebo committed Apr 27, 2018
    Copy the full SHA
    14a3c65 View commit details

  2. Whoops...

    @enebo
    enebo committed Apr 27, 2018
    Copy the full SHA
    033d277 View commit details

  3. Fix 3 old parsing warnings with new isSpace which matches MRIs more c… 

    …losely.

Punt on a new parse error which is super trivial (we just give different
  syntax error string).
    @enebo
    enebo committed Apr 27, 2018
    Copy the full SHA
    c4a4a10 View commit details
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/ext/ripper/RipperLexer.java
View file
Original file line number Diff line number Diff line change
@@ -1254,7 +1254,7 @@ private int at() throws IOException {
result = RipperParser.tIVAR;
}

if (c == EOF || Character.isSpaceChar(c)) {
if (c == EOF || isSpace(c)) {
if (result == RipperParser.tIVAR) {
compile_error("`@' without identifiers is not allowed as an instance variable name");
}
@@ -1478,7 +1478,7 @@ private int dollar() throws IOException {
return identifierToken(last_state, RipperParser.tGVAR, ("$" + (char) c).intern());
default:
if (!isIdentifierChar(c)) {
if (c == EOF || Character.isSpaceChar(c)) {
if (c == EOF || isSpace(c)) {
compile_error("`$' without identifiers is not allowed as a global variable name");
} else {
pushback(c);
Loading