[GR-23325] make test_print pass

qunaibit · qunaibit · commit 346f0b4ca1ec · 2020-11-13T23:15:46.000Z
PullRequest: graalpython/1393
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_print.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_print.txt
@@ -1,6 +1,9 @@
 *graalpython.lib-python.3.test.test_print.TestPrint.test_print
 *graalpython.lib-python.3.test.test_print.TestPrint.test_print_flush
 *graalpython.lib-python.3.test.test_print.TestPy2MigrationHint.test_normal_string
+*graalpython.lib-python.3.test.test_print.TestPy2MigrationHint.test_stream_redirection_hint_for_py2_migration
+*graalpython.lib-python.3.test.test_print.TestPy2MigrationHint.test_string_in_loop_on_same_line
 *graalpython.lib-python.3.test.test_print.TestPy2MigrationHint.test_string_with_excessive_whitespace
+*graalpython.lib-python.3.test.test_print.TestPy2MigrationHint.test_string_with_leading_whitespace
 *graalpython.lib-python.3.test.test_print.TestPy2MigrationHint.test_string_with_semicolon
 *graalpython.lib-python.3.test.test_print.TestPy2MigrationHint.test_string_with_soft_space
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java
@@ -27,6 +27,7 @@
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.IndentationError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TabError;
+import static com.oracle.graal.python.nodes.BuiltinNames.PRINT;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__PACKAGE__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.SyntaxError;
 
@@ -796,29 +797,25 @@ public RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, Node loc
         instance.setAttribute("text", section.isAvailable() ? source.getCharacters(section.getStartLine()) : PNone.NONE);
         instance.setAttribute("lineno", section.getStartLine());
         instance.setAttribute("offset", section.getStartColumn());
-        String msg;
-        if (section.getCharIndex() == source.getLength()) {
-            msg = "unexpected EOF while parsing";
-        } else if (message != null) {
-            msg = (new ErrorMessageFormatter()).format(message, arguments);
-        } else {
-            msg = "invalid syntax";
-        }
-        if (section.isAvailable() && type == PythonParser.ErrorType.Generic) {
-            Matcher matcher = MISSING_PARENTHESES_PATTERN.matcher(source.getCharacters(section.getStartLine()));
+        String msg = "invalid syntax";
+        if (type == PythonParser.ErrorType.Print) {
+            CharSequence line = source.getCharacters(section.getStartLine());
+            line = line.subSequence(line.toString().lastIndexOf(PRINT), line.length());
+            Matcher matcher = MISSING_PARENTHESES_PATTERN.matcher(line);
             if (matcher.matches()) {
-                String fn = matcher.group(1);
-                if (fn.equals("print")) {
-                    String arg = matcher.group(2).trim();
-                    String maybeEnd = "";
-                    if (arg.endsWith(",")) {
-                        maybeEnd = " end=\" \"";
-                    }
-                    msg = (new ErrorMessageFormatter()).format("Missing parentheses in call to 'print'. Did you mean print(%s%s)?", arg, maybeEnd);
-                } else {
-                    msg = "Missing parentheses in call to 'exec'";
+                String arg = matcher.group(2).trim();
+                String maybeEnd = "";
+                if (arg.endsWith(",")) {
+                    maybeEnd = " end=\" \"";
                 }
+                msg = (new ErrorMessageFormatter()).format("Missing parentheses in call to 'print'. Did you mean print(%s%s)?", arg, maybeEnd);
             }
+        } else if (type == PythonParser.ErrorType.Exec) {
+            msg = "Missing parentheses in call to 'exec'";
+        } else if (section.getCharIndex() == source.getLength()) {
+            msg = "unexpected EOF while parsing";
+        } else if (message != null) {
+            msg = (new ErrorMessageFormatter()).format(message, arguments);
         }
         instance.setAttribute("msg", msg);
         throw PException.fromObject(instance, location, PythonOptions.isPExceptionWithJavaStacktrace(getLanguage()));
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java
@@ -226,7 +226,7 @@ public String getFormattedMessage(PythonObjectLibrary lib) {
     @Override
     public String toString() {
         CompilerAsserts.neverPartOfCompilation();
-        return getFormattedMessage(null);
+        return getFormattedMessage(PythonObjectLibrary.getUncached());
     }
 
     public LazyTraceback internalReifyException(PFrame.Reference curFrameInfo) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java
@@ -570,6 +570,7 @@ public abstract class ErrorMessages {
     public static final String UNSUPPORTED_OBJ_IN = "unsupported object in '%s'";
     public static final String UNSUPPORTED_OPERAND_P = "unsupported operand '%p'";
     public static final String UNSUPPORTED_OPERAND_TYPES_FOR_S_P_AND_P = "unsupported operand type(s) for %s: '%p' and '%p'";
+    public static final String UNSUPPORTED_OPERAND_TYPES_FOR_S_P_AND_P_PRINT = UNSUPPORTED_OPERAND_TYPES_FOR_S_P_AND_P + ". Did you mean \"print(<message>, file=<output_stream>)\"?";
     public static final String UNSUPPORTED_OPERAND_TYPES_FOR_S_P_P_P = "unsupported operand type(s) for %s(): '%p', '%p', '%p'";
     public static final String UNSUPPORTED_OPERAND_TYPES_FOR_S_PR_S_P_AND_P = "unsupported operand type(s) for %s or %s(): '%p' and '%p'";
     public static final String UNSUPPORTED_SIZE_WAS = "unsupported %s size; was: %d";
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryArithmetic.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryArithmetic.java
@@ -40,11 +40,13 @@
  */
 package com.oracle.graal.python.nodes.expression;
 
+import static com.oracle.graal.python.nodes.BuiltinNames.PRINT;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.Signature;
+import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
@@ -87,7 +89,7 @@ public enum BinaryArithmetic {
         this.notImplementedHandler = () -> new NotImplementedHandler() {
             @Override
             public Object execute(VirtualFrame frame, Object arg, Object arg2) {
-                throw PRaiseNode.getUncached().raise(TypeError, ErrorMessages.UNSUPPORTED_OPERAND_TYPES_FOR_S_P_AND_P, operator, arg, arg2);
+                throw PRaiseNode.getUncached().raise(TypeError, getErrorMessage(operator, arg), operator, arg, arg2);
             }
         };
     }
@@ -100,6 +102,14 @@ public String getOperator() {
         return operator;
     }
 
+    @CompilerDirectives.TruffleBoundary
+    private static String getErrorMessage(String operator, Object arg) {
+        if (operator.equals(">>") && arg instanceof PBuiltinMethod && ((PBuiltinMethod) arg).getFunction().getName().equals(PRINT)) {
+            return ErrorMessages.UNSUPPORTED_OPERAND_TYPES_FOR_S_P_AND_P_PRINT;
+        }
+        return ErrorMessages.UNSUPPORTED_OPERAND_TYPES_FOR_S_P_AND_P;
+    }
+
     /**
      * A helper root node that dispatches to {@link LookupAndCallBinaryNode} to execute the provided
      * binary operator. This node is mostly useful to use such operators from a location without a
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonErrorStrategy.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonErrorStrategy.java
@@ -40,6 +40,9 @@
  */
 package com.oracle.graal.python.parser;
 
+import static com.oracle.graal.python.nodes.BuiltinNames.EXEC;
+import static com.oracle.graal.python.nodes.BuiltinNames.PRINT;
+
 import org.antlr.v4.runtime.DefaultErrorStrategy;
 import org.antlr.v4.runtime.InputMismatchException;
 import org.antlr.v4.runtime.NoViableAltException;
@@ -78,9 +81,22 @@ static SourceSection getPosition(Source source, Exception e) {
         return source.createSection(token.getStartIndex(), Math.max(0, token.getStopIndex() - token.getStartIndex()));
     }
 
-    static ErrorType getErrorType(Exception e) {
+    static ErrorType getErrorType(Exception e, SourceSection section) {
         if (e instanceof DescriptiveBailErrorListener.EmptyRecognitionException) {
-            return ((DescriptiveBailErrorListener.EmptyRecognitionException) e).getErrorType();
+            DescriptiveBailErrorListener.EmptyRecognitionException except = ((DescriptiveBailErrorListener.EmptyRecognitionException) e);
+            ErrorType type = except.getErrorType();
+            if (section.isAvailable() && type == ErrorType.Generic) {
+                String prev = except.getPreviousToken();
+                if (prev != null) {
+                    if (prev.equals(PRINT)) {
+                        return ErrorType.Print;
+                    }
+                    if (prev.equals(EXEC)) {
+                        return ErrorType.Exec;
+                    }
+                }
+            }
+            return type;
         }
         return ErrorType.Generic;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonParserImpl.java
@@ -33,10 +33,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.interop.ExceptionType;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.Token;
@@ -67,10 +63,14 @@
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.PythonParser;
 import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
+import com.oracle.truffle.api.interop.ExceptionType;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
@@ -408,7 +408,7 @@ private static PException handleParserError(ParserErrorCallback errors, Source s
         SourceSection section = PythonErrorStrategy.getPosition(source, e);
         // from parser we are getting RuntimeExceptions
         String message = e instanceof RuntimeException && e.getMessage() != null ? e.getMessage() : "invalid syntax";
-        ErrorType errorType = PythonErrorStrategy.getErrorType(e);
+        ErrorType errorType = PythonErrorStrategy.getErrorType(e, section);
         throw errors.raiseInvalidSyntax(errorType, source, section, message);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/DescriptiveBailErrorListener.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/DescriptiveBailErrorListener.java
@@ -42,6 +42,7 @@
 
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
@@ -192,13 +193,30 @@ private static boolean isBackslash(Object offendingSymbol) {
 
     public static class EmptyRecognitionException extends RecognitionException {
         private static final long serialVersionUID = 1L;
-        private Token offendingToken;
-        private ErrorType errorType;
+        private final Token offendingToken;
+        private final ErrorType errorType;
+        private final CommonTokenStream inputStream;
 
         public EmptyRecognitionException(ErrorType errorType, String message, Recognizer<?, ?> recognizer, Token offendingToken) {
             super(message, recognizer, offendingToken.getInputStream(), null);
             this.errorType = errorType;
             this.offendingToken = offendingToken;
+            if (recognizer.getInputStream() instanceof CommonTokenStream) {
+                this.inputStream = (CommonTokenStream) recognizer.getInputStream();
+            } else {
+                this.inputStream = null;
+            }
+        }
+
+        public String getPreviousToken() {
+            if (inputStream == null) {
+                return null;
+            }
+            int previousTokenIndex = offendingToken.getTokenIndex() - 1;
+            if (previousTokenIndex >= 0) {
+                return inputStream.get(offendingToken.getTokenIndex() - 1).getText();
+            }
+            return null;
         }
 
         @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonParser.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonParser.java
@@ -93,7 +93,9 @@ public enum ParserMode {
     enum ErrorType {
         Generic,
         Indentation,
-        Tab
+        Tab,
+        Print,
+        Exec
     }
 
     public interface ParserErrorCallback {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/ErrorMessageFormatter.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/ErrorMessageFormatter.java
@@ -72,7 +72,7 @@ public class ErrorMessageFormatter {
     private static Pattern fsPattern = Pattern.compile(formatSpecifier);
 
     public String format(String format, Object... args) {
-        return format(null, format, args);
+        return format(PythonObjectLibrary.getUncached(), format, args);
     }
 
     @TruffleBoundary
@@ -128,10 +128,7 @@ private static String getMessage(Throwable exception) {
     }
 
     private static String getClassName(PythonObjectLibrary lib, Object obj) {
-        if (lib != null) {
-            return getClassNameOfClass(lib.getLazyPythonClass(obj));
-        }
-        return getClassNameOfClass(PythonObjectLibrary.getUncached().getLazyPythonClass(obj));
+        return getClassNameOfClass(lib.getLazyPythonClass(obj));
     }
 
     private static String getClassNameOfClass(Object obj) {

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ public String getFormattedMessage(PythonObjectLibrary lib) {`
`226`	`226`	`@Override`
`227`	`227`	`public String toString() {`
`228`	`228`	`CompilerAsserts.neverPartOfCompilation();`
`229`		`- return getFormattedMessage(null);`
	`229`	`+ return getFormattedMessage(PythonObjectLibrary.getUncached());`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`public LazyTraceback internalReifyException(PFrame.Reference curFrameInfo) {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public class ErrorMessageFormatter {`
`72`	`72`	`private static Pattern fsPattern = Pattern.compile(formatSpecifier);`
`73`	`73`
`74`	`74`	`public String format(String format, Object... args) {`
`75`		`- return format(null, format, args);`
	`75`	`+ return format(PythonObjectLibrary.getUncached(), format, args);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@TruffleBoundary`
`@@ -128,10 +128,7 @@ private static String getMessage(Throwable exception) {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`private static String getClassName(PythonObjectLibrary lib, Object obj) {`
`131`		`- if (lib != null) {`
`132`		`- return getClassNameOfClass(lib.getLazyPythonClass(obj));`
`133`		`- }`
`134`		`- return getClassNameOfClass(PythonObjectLibrary.getUncached().getLazyPythonClass(obj));`
	`131`	`+ return getClassNameOfClass(lib.getLazyPythonClass(obj));`
`135`	`132`	`}`
`136`	`133`
`137`	`134`	`private static String getClassNameOfClass(Object obj) {`