Migrate pegparser to mx layout and JUnit 4

Author: msimacek

docs/contributor/DEV_TASKS.md

@@ -53,17 +53,3 @@ Follow these steps to update HPy.
       - Adding `GraalHPyContextFunction` implementations for the new APIs
       - Updating the `createMembers` method to assign the appropriate
         implementations to the context members
-
-### Updating pegparser
-
-The Python PEG parser is tracked as a separate repository as well and merged
-with git-subtree. This is irrelevant for external contributors, but just for
-reference, this is how we merge back and forth:
-
-    git subtree pull --prefix graalpython/com.oracle.graal.python.pegparser [pegparser-git-url] master
-    git subtree push --prefix graalpython/com.oracle.graal.python.pegparser [pegparser-git-url] master
-
-Generally this work, it can happen that the two repos become a bit inconsistent
-and git-subtree gives up, but then we can fix the trees manually with a `git
-subtree pull` and then `git subtree split` and pushing the split commit to the
-pegparser repo.

graalpython/com.oracle.graal.python.pegparser/src/test/java/com/oracle/graal/python/pegparser/AssignmentTests.java renamed to graalpython/com.oracle.graal.python.pegparser.test/src/com/oracle/graal/python/pegparser/AssignmentTests.java

@@ -41,15 +41,15 @@
 
 package com.oracle.graal.python.pegparser;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public class AssignmentTests extends ParserTestBase {
 
     @Test
     public void assignment01() throws Exception {
         checkTreeResult("a = 1");
     }
-    
+
     @Test
     public void assignmentWithTypeComment01() throws Exception {
         checkTreeResult("a = 1 # type: int");
@@ -99,7 +99,7 @@ public void assignment09() throws Exception {
     public void assignment10() throws Exception {
         checkTreeResult("i, j, k = x = a");
     }
-    
+
     @Test
     public void assignment11() throws Exception {
         checkScopeAndTree("def fn():\n  a.b.c.d = 1222");
@@ -176,28 +176,29 @@ public void augassign14() throws Exception {
                         "def _method(*args, **keywords):\n" +
                                         "    cls_or_self, *rest = args");
     }
+
 //
-//    @Test
-//    public void nonLocal01() throws Exception {
-//        checkSyntaxErrorMessage(
-//                        "def outer():\n" +
-//                                        "  x = 'local in outer'\n" +
-//                                        "  def inner():\n" +
-//                                        "    x = 10\n" +
-//                                        "    nonlocal x\n" +
-//                                        "  inner()\n",
-//                        "SyntaxError: name 'x' is assigned to before nonlocal declaration");
-//    }
+// @Test
+// public void nonLocal01() throws Exception {
+// checkSyntaxErrorMessage(
+// "def outer():\n" +
+// " x = 'local in outer'\n" +
+// " def inner():\n" +
+// " x = 10\n" +
+// " nonlocal x\n" +
+// " inner()\n",
+// "SyntaxError: name 'x' is assigned to before nonlocal declaration");
+// }
 //
-//    @Test
-//    public void annotationType01() throws Exception {
-//        checkTreeResult("j: int");
-//    }
+// @Test
+// public void annotationType01() throws Exception {
+// checkTreeResult("j: int");
+// }
 //
-//    @Test
-//    public void annotationType02() throws Exception {
-//        checkScopeAndTree("def fn():\n" + "  index : int = 0\n");
-//    }
+// @Test
+// public void annotationType02() throws Exception {
+// checkScopeAndTree("def fn():\n" + " index : int = 0\n");
+// }
 //
     @Test
     public void annotationType03() throws Exception {

graalpython/com.oracle.graal.python.pegparser/src/test/java/com/oracle/graal/python/pegparser/AtomsTests.java renamed to graalpython/com.oracle.graal.python.pegparser.test/src/com/oracle/graal/python/pegparser/AtomsTests.java

@@ -5,8 +5,7 @@
  */
 package com.oracle.graal.python.pegparser;
 
-import org.junit.jupiter.api.Test;
-
+import org.junit.Test;
 
 public class AtomsTests extends ParserTestBase {