p-org · ankushdesai · Jul 22, 2025 · Jun 11, 2024 · Jun 11, 2024 · Jun 12, 2024
diff --git a/.github/workflows/macosci.yml b/.github/workflows/macosci.yml
@@ -24,4 +24,10 @@ jobs:
     - name: Build
       run: dotnet build --configuration Release
     - name: Test
-      run: dotnet test --configuration Release
+      run: dotnet test --configuration Release --blame-crash --blame-hang --blame-hang-timeout 300s --logger:"console;verbosity=detailed"
+    - name: Upload Test Results
+      uses: actions/upload-artifact@v4
+      if: always()  # This ensures it runs even after test failure
+      with:
+        name: test-results
+        path: Tst/UnitTests/TestResults/**/*.xml
diff --git a/Src/PChecker/CheckerCore/Checker.cs b/Src/PChecker/CheckerCore/Checker.cs
@@ -51,6 +51,11 @@ public static void Run(CheckerConfiguration configuration)
             switch (configuration.Mode)
             {
                 case CheckerMode.BugFinding:
+                    if (configuration.ListTestCases)
+                    {
+                        TestingProcess.FetchTestCases(configuration);
+                        break;
+                    }
                     TestingProcess.Create(configuration).Run();
                     break;
                 case CheckerMode.PEx:

diff --git a/Src/PChecker/CheckerCore/SystematicTesting/TestingEngine.cs b/Src/PChecker/CheckerCore/SystematicTesting/TestingEngine.cs
@@ -176,28 +176,8 @@ public static TestingEngine Create(CheckerConfiguration checkerConfiguration) =>
         /// <summary>
         /// Creates a new systematic testing engine.
         /// </summary>
-        public static TestingEngine Create(CheckerConfiguration checkerConfiguration, Assembly assembly)
+        private static TestingEngine Create(CheckerConfiguration checkerConfiguration, Assembly assembly)
         {
-            if (checkerConfiguration.ListTestCases)
-            {
-                try
-                {
-                    var testMethods = TestMethodInfo.GetAllTestMethodsFromAssembly(assembly);
-                    Console.Out.WriteLine($".. List of test cases (total {testMethods.Count})");
-
-                    foreach (var mi in testMethods)
-                    {
-                        Console.Out.WriteLine($"{mi.DeclaringType.Name}");
-                    }
-
-                    Environment.Exit(0);
-                }
-                catch
-                {
-                    Error.ReportAndExit($"Failed to list test methods from assembly '{assembly.FullName}'");
-                }
-            }
-
             TestMethodInfo testMethodInfo = null;
             try
             {
@@ -891,7 +871,7 @@ private T Activate<T>(string assemblyQualifiedName)
         /// <summary>
         /// Loads and returns the specified assembly.
         /// </summary>
-        private static Assembly LoadAssembly(string assemblyFile)
+        public static Assembly LoadAssembly(string assemblyFile)
         {
             Assembly assembly = null;
 

diff --git a/Src/PChecker/CheckerCore/Testing/TestingProcess.cs b/Src/PChecker/CheckerCore/Testing/TestingProcess.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
+using PChecker.IO.Debugging;
 using PChecker.SystematicTesting;
 using PChecker.Utilities;
 
@@ -99,6 +101,26 @@ private async Task RunAsync()
             }
         }
 
+        public static void FetchTestCases(CheckerConfiguration checkerConfiguration)
+        {
+            Assembly assembly = TestingEngine.LoadAssembly(checkerConfiguration.AssemblyToBeAnalyzed);
+            try
+            {
+                var testMethods = TestMethodInfo.GetAllTestMethodsFromAssembly(assembly);
+                Console.Out.WriteLine($".. List of test cases (total {testMethods.Count})");
+
+                foreach (var mi in testMethods)
+                {
+                    Console.Out.WriteLine($"{mi.DeclaringType.Name}");
+                }
+            }
+            catch
+            {
+                Error.ReportAndExit($"Failed to list test methods from assembly '{assembly.FullName}'");
+            }
+
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TestingProcess"/> class.
         /// </summary>

diff --git a/Src/PCompiler/CompilerCore/Backend/PChecker/PCheckerCodeGenerator.cs b/Src/PCompiler/CompilerCore/Backend/PChecker/PCheckerCodeGenerator.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.Design;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -21,7 +22,8 @@ public class PCheckerCodeGenerator : ICodeGenerator
         /// This compiler has a compilation stage.
         /// </summary>
         public bool HasCompilationStage => true;
-        private static List<Variable> _globalParams = [];
+        [ThreadStatic]
+        private static List<Variable> _globalParams;
 
         private string GetGlobalParamAndLocalVariableName(CompilationContext context, Variable v)
         {

diff --git a/Src/PCompiler/CompilerCore/Parser/PParser.g4 b/Src/PCompiler/CompilerCore/Parser/PParser.g4
@@ -243,10 +243,11 @@ modExpr : LPAREN modExpr RPAREN												  # ParenModuleExpr
 bindExpr : (mName=iden | mName=iden RARROW iName=iden) ;
 
 namedModuleDecl : MODULE name=iden ASSIGN modExpr SEMI ;
-seqLiteralBody : primitive
-             | seqLiteral 
-             | primitive (COMMA primitive)+ 
+seqPrimitive : BoolLiteral
+             | IntLiteral
+             | SUB IntLiteral
              ;
+seqLiteralBody : seqPrimitive (COMMA seqPrimitive)* ;
 seqLiteral : LBRACK seqLiteralBody RBRACK;
 paramBody : name=iden IN value=seqLiteral
           | name=iden IN value=seqLiteral (COMMA names=iden IN value=seqLiteral)+

diff --git a/Src/PCompiler/CompilerCore/TypeChecker/DeclarationVisitor.cs b/Src/PCompiler/CompilerCore/TypeChecker/DeclarationVisitor.cs
@@ -60,7 +60,6 @@ public override object VisitGlobalParamDecl(PParser.GlobalParamDeclContext conte
         {
             // COLON type
             var variableType = ResolveType(context.type());
-            // Console.WriteLine("variableType:" + variableType);
 
             // VAR idenList
             foreach (var t in context.idenList()._names)
@@ -423,7 +422,6 @@ public override object VisitVarDecl(PParser.VarDeclContext context)
             for (var i = 0; i < varNameCtxs.Count; i++)
             {
                 var variable = (Variable) nodesToDeclarations.Get(varNameCtxs[i]);
-                // Console.WriteLine("Local Variable:" + variable.Name);
                 CheckGlobalParamsRedeclare(variable);
                 variable.Type = variableType;
                 variables[i] = variable;

diff --git a/Src/PCompiler/CompilerCore/TypeChecker/ExprVisitor.cs b/Src/PCompiler/CompilerCore/TypeChecker/ExprVisitor.cs
@@ -508,8 +508,6 @@ public override IPExpr VisitPrimitive(PParser.PrimitiveContext context)
             if (context.iden() != null)
             {
                 var symbolName = context.iden().GetText();
-                // Console.WriteLine("Looking up " + symbolName);
-                // Console.WriteLine("Table: " + String.Join(", ", table.GetVariables().Select(x =>x.Name).ToArray()));
                 if (table.Lookup(symbolName, out Variable variable))
                 {
                     return new VariableAccessExpr(context, variable);

diff --git a/Src/PCompiler/CompilerCore/TypeChecker/ParamAssignment.cs b/Src/PCompiler/CompilerCore/TypeChecker/ParamAssignment.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using Plang.Compiler.TypeChecker.AST;
 using Plang.Compiler.TypeChecker.AST.Declarations;
+using Plang.Compiler.TypeChecker.AST.Expressions;
 
 namespace Plang.Compiler.TypeChecker;
 
@@ -110,6 +111,11 @@ private static Dictionary<Variable, IPExpr> IndexDic2Dic(List<Variable> globalPa
         foreach (var (k, i) in indexDic)
         {
             var values = paramExprDic[k];
+            if (!globalParams.Any(v => v.Name == k))
+            {
+                throw new Exception($"Variable name '{k}' not found in globalParams. " +
+                                    $"GlobalParams are: [{string.Join(", ", globalParams.Select(v => v.Name))}]");
+            }
             var variable = globalParams.First(v => v.Name == k);
             if (i >= values.Count) throw new ArgumentException("Index out of range in global variable config.");
             dic[variable] = values[i];
@@ -119,8 +125,18 @@ private static Dictionary<Variable, IPExpr> IndexDic2Dic(List<Variable> globalPa
 
     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}";
+        var postfix = string.Join("__", Dic2StrDic(dic).Select(p => $"{p.Key}_{MangleExprForName(p.Value)}"));
+        return string.IsNullOrEmpty(postfix) ? name : $"{name}___{postfix}";
+    }
+
+    private static string MangleExprForName(IPExpr expr)
+    {
+        return expr switch
+        {
+            IntLiteralExpr intLit => intLit.Value < 0 ? $"neg{Math.Abs(intLit.Value)}" : intLit.Value.ToString(),
+            BoolLiteralExpr boolLit => boolLit.Value ? "true" : "false",
+            _ => throw new NotImplementedException($"Unhandled param expr type: {expr.GetType().Name}")
+        };
     }
 
     private static bool Next((string, int)[] indexArr, IDictionary<string, List<IPExpr>> globalParams)

diff --git a/Src/PCompiler/CompilerCore/TypeChecker/ParamVisitor.cs b/Src/PCompiler/CompilerCore/TypeChecker/ParamVisitor.cs
@@ -41,26 +41,62 @@ public override IPExpr VisitSeqLiteral([NotNull] PParser.SeqLiteralContext conte
             return Visit(context.seqLiteralBody());
         }
 
-        public override IPExpr VisitSeqLiteralBody([NotNull] PParser.SeqLiteralBodyContext context)
+        public override IPExpr VisitSeqPrimitive(PParser.SeqPrimitiveContext context)
         {
-            if (context.primitive() != null)
+            if (context.BoolLiteral() != null)
+            {
+                return new BoolLiteralExpr(context, context.BoolLiteral().GetText().Equals("true"));
+            }
+
+            if (context.SUB() != null && context.IntLiteral() != null)
+            {
+                int value = -int.Parse(context.IntLiteral().GetText());
+                return new IntLiteralExpr(context, value);
+            }
+
+            if (context.IntLiteral() != null)
+            {
+                int value = int.Parse(context.IntLiteral().GetText());
+                return new IntLiteralExpr(context, value);
+            }
+
+            throw handler.InternalError(context, new Exception("Unrecognized seqPrimitive input"));
+        }
+
+        public override IPExpr VisitSeqLiteralBody(PParser.SeqLiteralBodyContext context)
+        {
+            var values = context.seqPrimitive().Select(p =>
             {
-                var values = context.primitive().Select(Visit).ToList();
-                if (values.Count == 0) return new SeqLiteralExpr(context, values, PrimitiveType.Int);
-                // Console.WriteLine($"value[0] = {values[0].GetType()}");
-                var type = values[0].Type;
-                foreach (var v in values.Where(v => !v.Type.Equals(type)))
+                var expr = Visit(p) as IPExpr;
+                if (expr is null)
                 {
-                    throw handler.TypeMismatch(v.SourceLocation, v.Type, type);
+                    throw handler.InternalError(p, new Exception("Visit returned null for a seqPrimitive."));
                 }
-                return new SeqLiteralExpr(context, values, new SequenceType(type));
-
-            } 
-            if (context.seqLiteral() != null)
+                return expr;
+            }).ToList();
+
+            var baseType = values[0].Type;
+            var seenIntValues = new HashSet<int>();
+
+            foreach (var v in values)
             {
-                return Visit(context.seqLiteral());
+                if (!v.Type.Equals(baseType))
+                {
+                    throw handler.TypeMismatch(v.SourceLocation, v.Type, baseType);
+                }
+
+                if (v is IntLiteralExpr intLiteral && !seenIntValues.Add(intLiteral.Value))
+                {
+                    throw handler.InternalError(
+                        context,
+                        new Exception(
+                            $"Invalid parameter list: Duplicate integer value '{intLiteral.Value}' found. " +
+                            $"All test values must be unique (e.g., [2, 2] is not allowed)."
+                        ));
+                }
             }
-            throw handler.InternalError(context, new ArgumentOutOfRangeException(nameof(context), "unknown primitive literal"));
+
+            return new SeqLiteralExpr(context, values, new SequenceType(baseType));
         }
 
         public override IPExpr VisitPrimitive(PParser.PrimitiveContext context)

diff --git a/Src/PCompiler/PCommandLine/CommandLine.cs b/Src/PCompiler/PCommandLine/CommandLine.cs
@@ -17,7 +17,7 @@ public static class CommandLine
 
         private static readonly object ConsoleLock = new object();
 
-        private static void Main(string[] args)
+        public static void Main(string[] args)
         {
             // Save these so we can force output to happen even if TestingProcess has re-routed it.
             StdOut = Console.Out;

diff --git a/Src/PEx/src/test/java/pex/TestPEx.java b/Src/PEx/src/test/java/pex/TestPEx.java
@@ -187,7 +187,11 @@ Collection<DynamicTest> loadTests(String testDirPath) {
             pathKeys.sort(String.CASE_INSENSITIVE_ORDER);
 
             if (testDir.contains("Correct")) {
+
                 for (String key : pathKeys) {
+                    if (key.contains("ParamTest")) {
+                        continue;
+                    }
                     runDynamicTest(0, paths.get(key), key, dynamicTests);
                 }
             } else if (testDir.contains("DynamicError")) {

diff --git a/Tst/CorrectLogs/bugs2/Main.coverage.txt → Tst/CorrectLogs/bugs2/bug2.coverage.txt b/Tst/CorrectLogs/bugs2/Main.coverage.txt → Tst/CorrectLogs/bugs2/bug2.coverage.txt
diff --git a/Tst/CorrectLogs/bugs2/Main_0_0.trace.json → Tst/CorrectLogs/bugs2/bug2_0_0.trace.json b/Tst/CorrectLogs/bugs2/Main_0_0.trace.json → Tst/CorrectLogs/bugs2/bug2_0_0.trace.json
@@ -1,15 +1,4 @@
-[
-  {
-    "type": "CreateStateMachine",
-    "details": {
-      "log": "Main(1) was created by task \u00272\u0027.",
-      "id": "Main(1)",
-      "payload": "null",
-      "clock": {
-        "Main(1)": 1
-      }
-    }
-  },
+ [
   {
     "type": "StateTransition",
     "details": {

diff --git a/Tst/CorrectLogs/bugs2/Main_0_0.txt → Tst/CorrectLogs/bugs2/bug2_0_0.txt b/Tst/CorrectLogs/bugs2/Main_0_0.txt → Tst/CorrectLogs/bugs2/bug2_0_0.txt
@@ -1,5 +1,3 @@
-<TestLog> Running test 'DefaultImpl'.
-<CreateLog> Main(1) was created by task '2'.
 <StateLog> Main(1) enters state 'S'.
 <RaiseLog> 'Main(1)' raised event 'x with payload (<a,3,>)' in state 'S'.
 <RaiseLog> 'Main(1)' raised event 'a with payload (3)' in state 'S'.