[GR-23271] Correctly raise SyntaxError when trying to assign to None

PullRequest: graalpython/963

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/AssignmentTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -167,36 +167,6 @@ public void augassign14() throws Exception {
                                         "    cls_or_self, *rest = args");
     }
 
-    @Test
-    public void assignToLiteral01() throws Exception {
-        checkSyntaxErrorMessage("1 = 1", "SyntaxError: can't assign to literal");
-    }
-
-    @Test
-    public void assignToLiteral02() throws Exception {
-        checkSyntaxErrorMessage("1.1 = 1", "SyntaxError: can't assign to literal");
-    }
-
-    @Test
-    public void assignToLiteral03() throws Exception {
-        checkSyntaxErrorMessage("'' = 1", "SyntaxError: can't assign to literal");
-    }
-
-    @Test
-    public void assignToLiteral04() throws Exception {
-        checkSyntaxErrorMessage("f'' = 1", "SyntaxError: can't assign to literal");
-    }
-
-    @Test
-    public void assignToLiteral05() throws Exception {
-        checkSyntaxErrorMessage("'' f'' = 1", "SyntaxError: can't assign to literal");
-    }
-
-    @Test
-    public void assignToKeyword01() throws Exception {
-        checkSyntaxErrorMessage("True = 1", "SyntaxError: can't assign to keyword");
-    }
-
     @Test
     public void nonLocal01() throws Exception {
         checkSyntaxErrorMessage(

graalpython/com.oracle.graal.python.test/src/tests/test_parser.py

@@ -127,3 +127,34 @@ def test_annotation_scope():
     def foo(object: object):
         pass
     assert foo.__annotations__['object'] == object
+
+
+def test_cannot_assign():
+    import sys
+    if sys.implementation.version.minor >= 8:
+        def assert_raise(s, msg):
+            try:
+                compile("%s = 1" % s, "", "single")
+            except SyntaxError as e:
+                assert msg in str(e), str(e)
+            else:
+                assert False
+            try:
+                compile("with foo as %s:\n pass" % s, "", "single")
+            except SyntaxError as e:
+                assert msg in str(e), str(e)
+            else:
+                assert False
+        assert_raise("None", "cannot assign to None")
+        assert_raise("1", "cannot assign to literal")
+        assert_raise("1.1", "cannot assign to literal")
+        assert_raise("{1}", "cannot assign to set display")
+        assert_raise("{1: 2}", "cannot assign to dict display")
+        assert_raise("1.2j", "cannot assign to literal")
+        assert_raise("...", "cannot assign to Ellipsis")
+        assert_raise("True", "cannot assign to True")
+        assert_raise("False", "cannot assign to False")
+        assert_raise("b''", "cannot assign to literal")
+        assert_raise("''", "cannot assign to literal")
+        assert_raise("f''", "cannot assign to f-string expression")
+        assert_raise("(None,)", "cannot assign to None")

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_with.txt

@@ -44,3 +44,6 @@
 *NonexceptionalTestCase.testInlineGeneratorSyntax
 *NonexceptionalTestCase.testNestedSingleStatements
 *NonexceptionalTestCase.testUnboundGenerator
+testAssignmentToNoneError
+testAssignmentToTupleOnlyContainingNoneError
+testAssignmentToTupleContainingNoneError

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

@@ -330,7 +330,7 @@ locals
 	(
 		NEWLINE
 		| simple_stmt
-		| compound_stmt NEWLINE
+		| compound_stmt
 	)
 	{ $result = new BlockSSTNode(getArray(start, SSTNode[].class), getStartIndex($ctx),  getLastIndex($ctx)); }
 	{