[GR-40749] [GR-40316] AST validator

PullRequest: graalpython/2421

Author: otethal

graalpython/com.oracle.graal.python.pegparser.test/src/com/oracle/graal/python/pegparser/BasicTests.java

@@ -1033,6 +1033,11 @@ public void multipleStatements() {
         checkSyntaxErrorMessage("a = 1\nb = 1", "multiple statements found while compiling a single statement", InputType.SINGLE);
     }
 
+    @Test
+    public void lineContinuationInIndent() {
+        checkIndentationErrorMessage("\n \\\n (\\\n \\ ", "unexpected indent");
+    }
+
     private void checkScopeAndTree() throws Exception {
         File testFile = getTestFileFromTestAndTestMethod();
         checkScopeFromFile(testFile, false);

graalpython/com.oracle.graal.python.pegparser.test/src/com/oracle/graal/python/pegparser/ParserTestBase.java

@@ -148,7 +148,7 @@ public void checkSyntaxErrorMessage(String source, String expectedMessage, Input
         assertTrue("Expected Error.", errorCallback.hasErrors());
         TestErrorCallbackImpl.Error error = errorCallback.getErrors().get(0);
         assertSame("Expected SyntaxError not " + error.getType(), error.getType(), ErrorCallback.ErrorType.Syntax);
-        assertEquals("The expected message:\n\"" + expectedMessage + "\"\n was not found. The message is: \n\"" + error.getMessage() + "\"", error.getMessage(), expectedMessage);
+        assertEquals(expectedMessage, error.getMessage());
     }
 
     public void checkDeprecationWarning(String source, String expectedMessage) {
@@ -177,7 +177,7 @@ public void checkIndentationErrorMessage(String source, String expectedMessage)
         assertTrue("Expected Error.", errorCallback.hasErrors());
         TestErrorCallbackImpl.Error error = errorCallback.getErrors().get(0);
         assertSame("Expected IndentationError not " + error.getType(), error.getType(), ErrorCallback.ErrorType.Indentation);
-        assertEquals("The expected message:\n\"" + expectedMessage + "\"\n was not found. The message is: \n\"" + error.getMessage() + "\"", error.getMessage(), expectedMessage);
+        assertEquals(expectedMessage, error.getMessage());
     }
 
     public void checkTreeFromFile(File testFile, boolean goldenFileNextToTestFile) throws Exception {
@@ -188,11 +188,7 @@ public void checkTreeFromFile(File testFile, boolean goldenFileNextToTestFile) t
         File goldenFile = goldenFileNextToTestFile
                         ? new File(testFile.getParentFile(), getFileName(testFile) + GOLDEN_FILE_EXT)
                         : getGoldenFile(GOLDEN_FILE_EXT);
-        if (REGENERATE_TREE || !goldenFile.exists()) {
-            try (FileWriter fw = new FileWriter(goldenFile)) {
-                fw.write(tree);
-            }
-        }
+        writeGoldenFileIfMissing(goldenFile, tree);
         assertDescriptionMatches(tree, goldenFile);
     }
 
@@ -204,24 +200,15 @@ public void checkScopeFromFile(File testFile, boolean goldenFileNextToTestFile)
         File goldenScopeFile = goldenFileNextToTestFile
                         ? new File(testFile.getParentFile(), getFileName(testFile) + SCOPE_FILE_EXT)
                         : getGoldenFile(SCOPE_FILE_EXT);
-        if (REGENERATE_TREE || !goldenScopeFile.exists()) {
-            try (FileWriter fw = new FileWriter(goldenScopeFile)) {
-                fw.write(env.toString());
-            }
-        }
+        writeGoldenFileIfMissing(goldenScopeFile, env.toString());
         assertDescriptionMatches(env.toString(), goldenScopeFile);
     }
 
     public void checkTreeResult(String source, InputType inputType/* , Frame frame */) throws Exception {
         SSTNode resultNew = parse(source, getFileName(), inputType/* , frame */);
         String tree = printTreeToString(resultNew);
         File goldenFile = getGoldenFile(GOLDEN_FILE_EXT);
-        if (REGENERATE_TREE || !goldenFile.exists()) {
-            try (FileWriter fw = new FileWriter(goldenFile)) {
-                fw.write(tree);
-            }
-
-        }
+        writeGoldenFileIfMissing(goldenFile, tree);
         assertDescriptionMatches(tree, goldenFile);
     }
 
@@ -261,12 +248,20 @@ public void checkScopeResult(String source, InputType inputType) throws Exceptio
         ModTy mod = parse(source, "<module>", inputType);
         File goldenScopeFile = getGoldenFile(SCOPE_FILE_EXT);
         ScopeEnvironment env = ScopeEnvironment.analyze(mod, errorCallback, EMPTY_FUTURE);
-        if (REGENERATE_TREE || !goldenScopeFile.exists()) {
-            try (FileWriter fw = new FileWriter(goldenScopeFile)) {
-                fw.write(env.toString());
+        writeGoldenFileIfMissing(goldenScopeFile, env.toString());
+        assertDescriptionMatches(env.toString(), goldenScopeFile);
+    }
+
+    private static void writeGoldenFileIfMissing(File goldenFile, String contents) throws IOException {
+        if (REGENERATE_TREE || !goldenFile.exists()) {
+            if (System.getenv("CI") != null) {
+                fail("Missing golden file " + goldenFile);
+            } else {
+                try (FileWriter fw = new FileWriter(goldenFile)) {
+                    fw.write(contents);
+                }
             }
         }
-        assertDescriptionMatches(env.toString(), goldenScopeFile);
     }
 
 // public void checkSSTNodeOffsets(SSTNode node) {
@@ -281,17 +276,7 @@ protected String printTreeToString(SSTNode node) {
     }
 
     protected void assertDescriptionMatches(String actual, File goldenFile) throws Exception {
-        if (!goldenFile.exists()) {
-            if (!goldenFile.createNewFile()) {
-                fail("Cannot create file " + goldenFile.getAbsolutePath());
-            }
-            try (FileWriter fw = new FileWriter(goldenFile)) {
-                fw.write(actual);
-            }
-            fail("Created generated golden file " + goldenFile.getAbsolutePath() + "\nPlease re-run the test.");
-        }
         String expected = readFile(goldenFile);
-
         assertDescriptionMatches(actual, expected, goldenFile.getName());
     }
 

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/AtomsTests/atomByte.tast

@@ -0,0 +1,2 @@
+Module[0, 4]
+    BYTES[0, 4] Value: <unprintable value>

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/AtomsTests/atomDict.tast

@@ -0,0 +1,5 @@
+Module[0, 6]
+    Dict[0, 6]
+        Values:
+            Key: LONG[1, 2] Value: 1
+            Val: LONG[4, 5] Value: 2

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/AtomsTests/atomDictcomp.tast

@@ -0,0 +1,13 @@
+Module[0, 23]
+    DictComp[0, 23]
+        Key: Tuple[1, 5]
+            Values:
+                Name[2, 3] Value: "a"
+        Value: Name[7, 8] Value: "b"
+        ComprehensionTy[10, 22]
+            Target: 
+                Tuple[14, 17] Context: Store
+                    Values:
+                        Name[14, 15] Value: "a" Store
+                        Name[16, 17] Value: "b" Store
+            Iterator: Name[21, 22] Value: "y"

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/AtomsTests/atomEllipsis.tast

@@ -0,0 +1,2 @@
+Module[0, 3]
+    ELLIPSIS[0, 3] Value: null

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/AtomsTests/atomFString.tast

@@ -0,0 +1,7 @@
+Module[0, 9]
+    JoinedStr[0, 9]
+         Values:
+            RAW[2, 3] Value: "a"
+            FormattedValue[4, 7]
+                Value: Name[1, 2] Value: "b"
+                Conversion: 114

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/AtomsTests/atomFStringMultiline.tast

@@ -0,0 +1,12 @@
+Module[0, 45]
+    JoinedStr[0, 45]
+         Values:
+            RAW[4, 15] Value: "First line."
+            FormattedValue[16, 27]
+                Value: 
+                    BinOp[5, 12]
+                        Op: Add
+                        LHS: Name[5, 7] Value: "v1"
+                        RHS: Name[10, 12] Value: "v2"
+                Conversion: -1
+            RAW[28, 42] Value: "\nAnother line."

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/AtomsTests/atomFalse.tast

@@ -0,0 +1,2 @@
+Module[0, 5]
+    BOOLEAN[0, 5] Value: false

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/AtomsTests/atomGenerator.tast

@@ -0,0 +1,9 @@
+Module[0, 17]
+    GeneratorExp[0, 17]
+        Element: 
+            Tuple[1, 5]
+                Values:
+                    Name[2, 3] Value: "a"
+        ComprehensionTy[6, 16]
+            Target: Name[10, 11] Value: "a" Store
+            Iterator: Name[15, 16] Value: "b"