sort frame contents in parser test output

Author: lukasstadler

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

@@ -41,7 +41,9 @@
 
 package com.oracle.graal.python.test.parser;
 
+import java.util.Collection;
 import java.util.Set;
+import java.util.TreeSet;
 
 import com.oracle.graal.python.builtins.objects.function.Signature;
 import com.oracle.graal.python.nodes.ModuleRootNode;
@@ -486,20 +488,18 @@ private void addSignature(Signature signature) {
     private void addFrameDescriptor(FrameDescriptor fd) {
         indent(level);
         sb.append("FrameDescriptor: ");
-        if (fd.getSlots().size() == 0) {
+        Set<Object> identifiers = fd.getIdentifiers();
+        if (identifiers.isEmpty()) {
             sb.append(" Empty");
             newLine();
             return;
         }
-        sb.append(fd.getSlots().size()).append(" slots [");
-        Set<Object> identifiers = fd.getIdentifiers();
-        String[] names = new String[identifiers.size()];
-        int i = 0;
-        String name;
+        sb.append(identifiers.size()).append(" slots [");
+        TreeSet<String> names = new TreeSet<>();
         for (Object identifier : identifiers) {
-            name = identifier.toString();
+            String name = identifier.toString();
             if (printTmpSlots || (!printTmpSlots && !name.startsWith("<>temp"))) {
-                names[i++] = name;
+                names.add(name);
             }
         }
         add(names);
@@ -535,6 +535,22 @@ private void add(String[] array) {
         }
     }
 
+    private void add(Collection<String> array) {
+        if (array == null || array.isEmpty()) {
+            sb.append("None");
+        } else {
+            boolean first = true;
+            for (String text : array) {
+                if (!first) {
+                    sb.append(", ");
+                } else {
+                    first = false;
+                }
+                sb.append(text);
+            }
+        }
+    }
+
     private void add(FrameSlot[] slots) {
         if (slots == null || slots.length == 0) {
             sb.append("None");

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

@@ -51,6 +51,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -1381,7 +1382,7 @@ private static void printScope(ScopeInfo scope, StringBuilder sb, int indent) {
         });
         indent(sb, indent + 1);
         sb.append("FrameDescriptor: ");
-        printSet(sb, names);
+        printSet(sb, new TreeSet<>(names));
         sb.append("\n");
         indent(sb, indent + 1);
         sb.append("CellVars: ");
@@ -1405,13 +1406,13 @@ public void compareDeSerializationAndParsing() throws Exception {
          * Processor Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz Memory 32801MB Operating System
          * Ubuntu 18.04.2 LTS the result should be : Memory times: parsing: 6,674,919,690ns (100%)
          * serialization: 435,290,014ns(+6%) deserialization: 2,220,701,051ns (-67%)
-         * 
+         *
          * Average times: parsing: 4,171,824ns (100%) serialization: 272,056ns (+6%)
          * deserialization: 1,387,938ns(-67%)
-         * 
+         *
          * Times with file operations: parsing: 6,879,809,367ns (100%) serialization:
          * 583,667,690ns(+8%) deserialization: 2,270,131,909ns (-68%)
-         * 
+         *
          * Average times: parsing: 4,299,880ns (100%) serialization: 364,792ns (+8%)
          * deserialization: 1,418,832ns(-68%)
          */

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/annotationType02.scope

@@ -5,6 +5,6 @@ Scope: []
     FreeVars: Empty
     Scope: fn
         Kind: Function
-        FrameDescriptor: [index, <return_val>]
+        FrameDescriptor: [<return_val>, index]
         CellVars: Empty
         FreeVars: Empty

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/annotationType02.tast

@@ -25,7 +25,7 @@ ModuleRootNode Name: <module 'annotationType02'> SourceSection: [0,28]`def fn():
               CelVars: None
               FreeVars: None
               NeedsCellFrame: False
-              FrameDescriptor: 2 slots [index, <return_val>]
+              FrameDescriptor: 2 slots [<return_val>, index]
               ExecutionSlots:
                 FreeVarsSlots: None
                 CellVarsSlots: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment06.scope

@@ -5,6 +5,6 @@ Scope: []
     FreeVars: Empty
     Scope: fn
         Kind: Function
-        FrameDescriptor: [a, b, c, d, <>temp4, <return_val>]
+        FrameDescriptor: [<>temp4, <return_val>, a, b, c, d]
         CellVars: Empty
         FreeVars: Empty

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment06.tast

@@ -25,7 +25,7 @@ ModuleRootNode Name: <module 'assignment06'> SourceSection: [0,29]`def fn():↵
               CelVars: None
               FreeVars: None
               NeedsCellFrame: False
-              FrameDescriptor: 6 slots [a, b, c, d, <>temp4, <return_val>]
+              FrameDescriptor: 6 slots [<>temp4, <return_val>, a, b, c, d]
               ExecutionSlots:
                 FreeVarsSlots: None
                 CellVarsSlots: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment07.scope

@@ -5,6 +5,6 @@ Scope: []
     FreeVars: Empty
     Scope: fn
         Kind: Function
-        FrameDescriptor: [a, b, c, <>temp3, <>temp4, <>temp5, <return_val>]
+        FrameDescriptor: [<>temp3, <>temp4, <>temp5, <return_val>, a, b, c]
         CellVars: Empty
         FreeVars: Empty

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment07.tast

@@ -25,7 +25,7 @@ ModuleRootNode Name: <module 'assignment07'> SourceSection: [0,29]`def fn():↵
               CelVars: None
               FreeVars: None
               NeedsCellFrame: False
-              FrameDescriptor: 7 slots [a, b, c, <>temp3, <>temp4, <>temp5, <return_val>]
+              FrameDescriptor: 7 slots [<>temp3, <>temp4, <>temp5, <return_val>, a, b, c]
               ExecutionSlots:
                 FreeVarsSlots: None
                 CellVarsSlots: None

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/augassign13.scope

@@ -5,6 +5,6 @@ Scope: []
     FreeVars: Empty
     Scope: fn
         Kind: Function
-        FrameDescriptor: [x, <return_val>]
+        FrameDescriptor: [<return_val>, x]
         CellVars: Empty
         FreeVars: Empty

graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/augassign13.tast

@@ -25,7 +25,7 @@ ModuleRootNode Name: <module 'augassign13'> SourceSection: [0,17]`def fn (): x +
               CelVars: None
               FreeVars: None
               NeedsCellFrame: False
-              FrameDescriptor: 2 slots [x, <return_val>]
+              FrameDescriptor: 2 slots [<return_val>, x]
               ExecutionSlots:
                 FreeVarsSlots: None
                 CellVarsSlots: None