rename

Author: zhezhouzz

Src/PCompiler/CompilerCore/Backend/PChecker/PCheckerCodeGenerator.cs

@@ -255,7 +255,8 @@ private void WriteDecl(CompilationContext context, StringWriter output, IPDecl d
                     break;
 
                 case SafetyTest safety:
-                    ParamAssignment.IterateIndexDic(safety, _globalParams, indexDic => WriteSafetyTestDecl(context, output, safety, indexDic));
+                    ParamAssignment.IterateAssignments(safety, _globalParams, 
+                        assignment => WriteSafetyTestDecl(context, output, safety, assignment));
                     break;
 
                 case Interface _:
@@ -345,13 +346,14 @@ private static void WriteForeignType(CompilationContext context, StringWriter ou
             context.WriteLine(output, $"// TODO: Implement the Foreign Type {declName}");
         }
 
-        private void WriteSafetyTestDecl(CompilationContext context, StringWriter output, SafetyTest safety, Dictionary<Variable, IPExpr> dic)
+        // For normal test, the assignment is empty dictionary
+        private void WriteSafetyTestDecl(CompilationContext context, StringWriter output, SafetyTest safety, Dictionary<Variable, IPExpr> assignment)
         {
             // Console.WriteLine($"dic: {string.Join(',', dic.ToList())}");
             WriteNameSpacePrologue(context, output);
-            var name = ParamAssignment.RenameSafetyTestByAssignment(context.Names.GetNameForDecl(safety), dic);
+            var name = ParamAssignment.RenameSafetyTestByAssignment(context.Names.GetNameForDecl(safety), assignment);
             context.WriteLine(output, $"public class {name} {{");
-            WriteInitializeGlobalParams(context, output, dic);
+            WriteInitializeGlobalParams(context, output, assignment);
             WriteInitializeLinkMap(context, output, safety.ModExpr.ModuleInfo.LinkMap);
             WriteInitializeInterfaceDefMap(context, output, safety.ModExpr.ModuleInfo.InterfaceDef);
             WriteInitializeMonitorObserves(context, output, safety.ModExpr.ModuleInfo.MonitorMap.Keys);

Src/PCompiler/CompilerCore/TypeChecker/ParamAssignment.cs

@@ -52,7 +52,7 @@ private static bool Next((string, int)[] indexArr, IDictionary<string, List<IPEx
         return false;
     }
 
-    public static void IterateIndexDic(SafetyTest safety, List<Variable> globalParams, Action<Dictionary<Variable, IPExpr>> f)
+    public static void IterateAssignments(SafetyTest safety, List<Variable> globalParams, Action<Dictionary<Variable, IPExpr>> f)
     {
         // Console.WriteLine($"safety.ParamExpr.Count = {safety.ParamExpr.Count}");
         var indexArr = safety.ParamExprMap.ToList().Zip(Enumerable.Repeat(0, safety.ParamExprMap.Count), (x, y) => (x.Key, y)).ToArray();