clean the code

Author: zhezhouzz

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

@@ -255,7 +255,7 @@ private void WriteDecl(CompilationContext context, StringWriter output, IPDecl d
                     break;
 
                 case SafetyTest safety:
-                    WriteSafetyTestDecl(context, output, safety);
+                    ParamAssignment.IterateIndexDic(safety, _globalParams, indexDic => WriteSafetyTestDecl(context, output, safety, indexDic));
                     break;
 
                 case Interface _:
@@ -344,19 +344,12 @@ private static void WriteForeignType(CompilationContext context, StringWriter ou
             var declName = foreignType.CanonicalRepresentation;
             context.WriteLine(output, $"// TODO: Implement the Foreign Type {declName}");
         }
-
-        private static string RenameSafetyTest(string name, IDictionary<string, IPExpr> indexDic)
-        {
-            var postfix = $"{string.Join("__", indexDic.ToList().Select(p => $"{p.Key}_{p.Value}"))}";
-            return postfix.Length == 0 ? name : $"{name}___{postfix}";
-        }
 
-        private void WriteSingleSafetyTestDecl(CompilationContext context, StringWriter output, SafetyTest safety, IDictionary<string, int> indexDic)
+        private void WriteSafetyTestDecl(CompilationContext context, StringWriter output, SafetyTest safety, Dictionary<Variable, IPExpr> dic)
         {
-            Console.WriteLine($"indexArr: {string.Join(',', indexDic.ToList())}");
+            // Console.WriteLine($"dic: {string.Join(',', dic.ToList())}");
             WriteNameSpacePrologue(context, output);
-            var dic = ParamAssignment.IndexDic2Dic(_globalParams, safety.ParamExprMap, indexDic);
-            var name = RenameSafetyTest(context.Names.GetNameForDecl(safety), ParamAssignment.Dic2StrDic(dic));
+            var name = ParamAssignment.RenameSafetyTestByAssignment(context.Names.GetNameForDecl(safety), dic);
             context.WriteLine(output, $"public class {name} {{");
             WriteInitializeGlobalParams(context, output, dic);
             WriteInitializeLinkMap(context, output, safety.ModExpr.ModuleInfo.LinkMap);
@@ -368,12 +361,6 @@ private void WriteSingleSafetyTestDecl(CompilationContext context, StringWriter
 
             WriteNameSpaceEpilogue(context, output);
         }
-        
-        
-        private void WriteSafetyTestDecl(CompilationContext context, StringWriter output, SafetyTest safety)
-        {
-            ParamAssignment.IterateIndexDic(safety, _globalParams, indexDic => WriteSingleSafetyTestDecl(context, output, safety, indexDic));
-        }
 
         private void WriteImplementationDecl(CompilationContext context, StringWriter output, Implementation impl)
         {

Src/PCompiler/CompilerCore/TypeChecker/AST/Declarations/SafetyTest.cs

@@ -1,7 +1,5 @@
-using System;
-using Antlr4.Runtime;
+using Antlr4.Runtime;
 using System.Collections.Generic;
-using System.Linq;
 using Plang.Compiler.TypeChecker.AST.Expressions;
 
 namespace Plang.Compiler.TypeChecker.AST.Declarations

Src/PCompiler/CompilerCore/TypeChecker/AST/Declarations/Variable.cs

@@ -18,6 +18,11 @@ public Variable(string name, ParserRuleContext sourceNode, VariableRole role)
 
         public string Name { get; }
         public ParserRuleContext SourceLocation { get; }
+        
+        public override string ToString()
+        {
+            return this.Name;
+        }
     }
 
     [Flags]

Src/PCompiler/CompilerCore/TypeChecker/ParamAssignment.cs

@@ -8,7 +8,7 @@ namespace Plang.Compiler.TypeChecker;
 
 public abstract class ParamAssignment
 {
-    public static Dictionary<string, IPExpr> Dic2StrDic(Dictionary<Variable, IPExpr> dic)
+    private static Dictionary<string, IPExpr> Dic2StrDic(Dictionary<Variable, IPExpr> dic)
     {
         var dicAux = new Dictionary<string, IPExpr>();
         foreach (var (k, i) in dic)
@@ -18,7 +18,7 @@ public static Dictionary<string, IPExpr> Dic2StrDic(Dictionary<Variable, IPExpr>
         return dicAux;
     }
 
-    public static Dictionary<Variable, IPExpr> IndexDic2Dic(List<Variable> globalParams, IDictionary<string, List<IPExpr>> paramExprDic, IDictionary<string, int> indexDic)
+    private static Dictionary<Variable, IPExpr> IndexDic2Dic(List<Variable> globalParams, IDictionary<string, List<IPExpr>> paramExprDic, IDictionary<string, int> indexDic)
     {
         var dic = new Dictionary<Variable, IPExpr>();
         foreach (var (k, i) in indexDic)
@@ -33,6 +33,12 @@ public static Dictionary<Variable, IPExpr> IndexDic2Dic(List<Variable> globalPar
         }
         return dic;
     }
+    
+    public static string RenameSafetyTestByAssignment(string name, Dictionary<Variable, IPExpr> dic)
+    {
+        var postfix = $"{string.Join("__", Dic2StrDic(dic).ToList().Select(p => $"{p.Key}_{p.Value}"))}";
+        return postfix.Length == 0 ? name : $"{name}___{postfix}";
+    }
 
     private static bool Next((string, int)[] indexArr, IDictionary<string, List<IPExpr>> globalParams)
     {
@@ -46,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<string, int>> f)
+    public static void IterateIndexDic(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();
@@ -58,7 +64,7 @@ public static void IterateIndexDic(SafetyTest safety, List<Variable> globalParam
             // Console.WriteLine($"{string.Join(',', dic.ToList())} |- {safety.AssumeExpr} = {ForceBool(Eval(dic, safety.AssumeExpr))}");
             if (!SimpleExprEval.ForceBool(SimpleExprEval.Eval(dic, safety.AssumeExpr))) continue;
             // Console.WriteLine($"indexArr: {string.Join(',', indexArr)}");
-            f(indexDic);
+            f(dic);
         } while (Next(indexArr, safety.ParamExprMap));
     }
 }