Ensure consistent mapping of C actions to Java actions

Author: otethal

graalpython/com.oracle.graal.python.pegparser.generator/pegjava/java_generator.py

@@ -203,7 +203,7 @@ def visit_Alt(self, node):
                 types.discard("Token*") # heuristic. when tokens are in there, they are usually dropped
             if len(types) == 2:
                 # might be a pair for gathering
-                typ1, typ2 = sorted(types)
+                typ1, typ2 = sorted(types, key=lambda x: x.count('*'))
                 if (f"{typ1}*" == typ2 or
                     typ2.startswith(f"asdl_{typ1.replace('_ty', '')}_seq")):
                     types = {typ2.replace("**", "*")}
@@ -605,7 +605,7 @@ def generate(self, filename: str) -> None:
                 if rule.left_recursive:
                     self.print("// Left-recursive")
                 self.visit(rule)
-                
+
         self._generate_lookahead_methods()
         for todo in getattr(self, "_type_conversions", {}).keys():
             self.print(todo)

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/BasicTests/call09.tast

@@ -3,4 +3,5 @@ Module[0, 12]
         Target: Name[0, 3] Value: "foo"
         Args:
             Starred[4, 11]
+                 Context: Load
                  Expr: Name[5, 11] Value: "mylist"

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/BasicTests/call10.tast

@@ -3,6 +3,8 @@ Module[0, 23]
         Target: Name[0, 3] Value: "foo"
         Args:
             Starred[4, 12]
+                 Context: Load
                  Expr: Name[5, 12] Value: "mylist1"
             Starred[14, 22]
+                 Context: Load
                  Expr: Name[15, 22] Value: "mylist2"

graalpython/com.oracle.graal.python.pegparser.test/testData/parser/goldenFiles/ClassDefTests/classDef08.tast

@@ -24,6 +24,7 @@ Module[0, 128]
                     Target: Name[109, 113] Value: "self"
                     Args:
                         Starred[114, 119]
+                             Context: Load
                              Expr: Name[115, 119] Value: "args"
                     KWArgs:
                         KeywordTy[121, 127]

graalpython/com.oracle.graal.python.pegparser/src/com/oracle/graal/python/pegparser/NodeFactory.java

@@ -123,10 +123,6 @@ default ExprTy.Name createVariable(String name, int startOffset, int endOffset)
 
     public ExprTy createSet(ExprTy[] values, int startOffset, int endOffset);
 
-    default ExprTy createStarred(ExprTy value, int startOffset, int endOffset) {
-        return createStarred(value, null, startOffset, endOffset);
-    }
-
     public ExprTy createStarred(ExprTy value, ExprContext context, int startOffset, int endOffset);
 
     public KeywordTy createKeyword(String arg, ExprTy value, int startOffset, int endOffset);