[GR-20784] Fix interactive multi-line continuation

PullRequest: graalpython/884

Author: qunaibit

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/DescriptiveBailErrorListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -41,11 +41,15 @@
 package com.oracle.graal.python.parser.antlr;
 
 import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
 import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
 import org.antlr.v4.runtime.misc.IntervalSet;
 
+import com.oracle.graal.python.parser.antlr.Python3Parser.Single_inputContext;
 import com.oracle.graal.python.runtime.PythonParser.PIncompleteSourceException;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 
@@ -74,6 +78,12 @@ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
                 throw handleRecognitionException;
             }
         }
+        if (isInteractive(recognizer)) {
+            PIncompleteSourceException handleRecognitionException = handleInteractiveException(recognizer, offendingSymbol);
+            if (handleRecognitionException != null) {
+                throw handleRecognitionException;
+            }
+        }
         if (offendingSymbol instanceof Token) {
             throw new RuntimeException(entireMessage, new EmptyRecognitionException(entireMessage, recognizer, (Token) offendingSymbol));
         }
@@ -87,6 +97,52 @@ private static PIncompleteSourceException handleRecognitionException(IntervalSet
         return null;
     }
 
+    private static PIncompleteSourceException handleInteractiveException(Recognizer<?, ?> recognizer, Object offendingSymbol) {
+        if (isOpened(((Python3Parser) recognizer).getTokenStream()) || isBackslash(offendingSymbol)) {
+            return new PIncompleteSourceException("", null, -1);
+        }
+        return null;
+    }
+
+    private static ParserRuleContext getRootCtx(ParserRuleContext ctx) {
+        ParserRuleContext c = ctx;
+        while (c.getParent() != null) {
+            c = c.getParent();
+        }
+        return c;
+    }
+
+    private static boolean isInteractive(Recognizer<?, ?> recognizer) {
+        if (!(recognizer instanceof Python3Parser)) {
+            return false;
+        }
+        ParserRuleContext ctx = getRootCtx(((Python3Parser) recognizer).getContext());
+        if (ctx instanceof Single_inputContext) {
+            return ((Single_inputContext) ctx).interactive;
+        }
+        return false;
+    }
+
+    /**
+     * @return true if there are an open '(', '[' or '{'.
+     */
+    private static boolean isOpened(TokenStream input) {
+        final Python3Lexer lexer = (Python3Lexer) input.getTokenSource();
+        return lexer.isOpened();
+    }
+
+    private static final int BACKSLASH = '\\';
+
+    private static boolean isBackslash(Object offendingSymbol) {
+        if (offendingSymbol instanceof Token) {
+            CharStream cs = ((Token) offendingSymbol).getInputStream();
+            if (cs.size() > 2 && cs.LA(-2) == BACKSLASH) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private static class EmptyRecognitionException extends RecognitionException {
         private static final long serialVersionUID = 1L;
         private Token offendingToken;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3.g4

@@ -51,6 +51,9 @@ tokens { INDENT, DEDENT }
   // wether we have expanded EOF to include necessary DEDENTS and a NEWLINE
   private boolean expandedEOF = false;
 
+  private boolean longQuote1 = false; // """
+  private boolean longQuote2 = false; // '''
+
   @Override
   public void emit(Token t) {
     super.setToken(t);
@@ -92,6 +95,22 @@ tokens { INDENT, DEDENT }
     return tokens.isEmpty() ? next : tokens.poll();
   }
 
+  public boolean isOpened() {
+	  return this.opened > 0 || this.longQuote1 || this.longQuote2;
+  }
+
+  private void usedQuote1() {
+	if (!this.longQuote2){
+		this.longQuote1 = !this.longQuote1;
+	}
+  }
+
+  private void usedQuote2() {
+	if (!this.longQuote1){
+		this.longQuote2 = !this.longQuote2;
+	}
+  }
+
   private Token createDedent() {
     CommonToken dedent = commonToken(Python3Parser.DEDENT, "");
     dedent.setLine(this.lastToken.getLine());
@@ -1797,6 +1816,8 @@ LEFT_SHIFT_ASSIGN : '<<=';
 RIGHT_SHIFT_ASSIGN : '>>=';
 POWER_ASSIGN : '**=';
 IDIV_ASSIGN : '//=';
+LONG_QUOTES1 : '"""' {usedQuote1();};
+LONG_QUOTES2 : '\'\'\'' {usedQuote2();};
 
 SKIP_
  : ( SPACES | COMMENT | LINE_JOINING ) -> skip

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3.interp

@@ -91,10 +91,12 @@ LEFT_SHIFT_ASSIGN=90
 RIGHT_SHIFT_ASSIGN=91
 POWER_ASSIGN=92
 IDIV_ASSIGN=93
-SKIP_=94
-UNKNOWN_CHAR=95
-INDENT=96
-DEDENT=97
+LONG_QUOTES1=94
+LONG_QUOTES2=95
+SKIP_=96
+UNKNOWN_CHAR=97
+INDENT=98
+DEDENT=99
 'def'=2
 'return'=3
 'raise'=4
@@ -177,3 +179,5 @@ DEDENT=97
 '>>='=91
 '**='=92
 '//='=93
+'"""'=94
+'\'\'\''=95