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

Commits on Apr 26, 2018

  1. Fix a couple of syntax errors in parser.

    @enebo
    enebo committed Apr 26, 2018
    Copy the full SHA
    e445827 View commit details

  2. Removal of old isSingleton counter for isInClass.

    @enebo
    enebo committed Apr 26, 2018
    Copy the full SHA
    e3d52ba View commit details

  3. Yay. Ruby made some errors statically fail. For next,break,redo: 

      - will fail in top-level scope as SyntaxError instead of LJE
  - will fail in eval as SyntaxError (we largely did something weird)

In addition, yield will fail in toplevel scope with a SyntaxError.

This change is great but we still have an outstanding issue. We IRBuild method
bodies on demand.  So this will throw a syntaxerror much later than MRI. This
can be worked around but if we want to keep laziness we will need to mark
non-lazy methods which contain these keywords and compile those eagerly.  Also
we need to do that without rewalking the planet to look for those nodes.
    @enebo
    enebo committed Apr 26, 2018
    Copy the full SHA
    4b1279e View commit details

  4. exclude test due to us being clever :P (we lazily compile method bodies)

    @enebo
    enebo committed Apr 26, 2018
    Copy the full SHA
    ac66a74 View commit details
7 changes: 7 additions & 0 deletions core/src/main/java/org/jruby/ext/ripper/HeredocTerm.java
View file
Original file line number Diff line number Diff line change
@@ -170,6 +170,13 @@ public int parseString(RipperLexer lexer, LexerSource src) throws java.io.IOExce
if (c == '#') {
int token = lexer.peekVariableName(RipperParser.tSTRING_DVAR, RipperParser.tSTRING_DBEG);

int heredoc_line_indent = lexer.getHeredocLineIndent() ;
if (heredoc_line_indent != -1) {
if (lexer.getHeredocIndent() > heredoc_line_indent) {
lexer.setHeredocIndent(heredoc_line_indent);
}
lexer.setHeredocLineIndent(-1);
}
if (token != 0) {
return token;
} else {
7 changes: 3 additions & 4 deletions core/src/main/java/org/jruby/ext/ripper/RipperLexer.java
View file
Original file line number Diff line number Diff line change
@@ -1659,17 +1659,16 @@ private int leftBracket(boolean spaceSeen) throws IOException {
parenNest++;
int c = '[';
if (isAfterOperator()) {
setState(EXPR_ARG);

if ((c = nextc()) == ']') {
setState(EXPR_ARG);
if (peek('=')) {
nextc();
return RipperParser.tASET;
}
return RipperParser.tAREF;
}
pushback(c);
setState(getState() | EXPR_LABEL);
setState(EXPR_ARG|EXPR_LABEL);
return '[';
} else if (isBEG() || (isARG() && (spaceSeen || isLexState(lex_state, EXPR_LABELED)))) {
c = RipperParser.tLBRACK;
@@ -1708,7 +1707,7 @@ private int leftCurly() {
conditionState.stop();
cmdArgumentState.stop();
setState(EXPR_BEG);
if (c != RipperParser.tLBRACE_ARG) setState(getState() | EXPR_LABEL);
setState(c == RipperParser.tLBRACE_ARG ? EXPR_BEG : EXPR_BEG|EXPR_LABEL);
if (c != RipperParser.tLBRACE) commandStart = true;

return c;
Loading