Removing compiler changes (#789)

Co-authored-by: Christine Zhou <[email protected]>

Src/PChecker/CheckerCore/Actors/Events/Event.cs

@@ -11,7 +11,6 @@ namespace PChecker.Actors.Events
     [DataContract]
     public abstract class Event
     {
-        public int Loc { get; set; }
         public string? Sender;
         public string? Receiver;
         public string? State;

Src/PChecker/CheckerCore/PRuntime/PEvent.cs

@@ -6,15 +6,13 @@ namespace PChecker.PRuntime
 {
     public class PEvent : Event, IPrtValue
     {
-        public PEvent(int loc) : base()
+        public PEvent() : base()
         {
-            Loc = loc;
         }
 
-        public PEvent(IPrtValue payload, int loc) : base()
+        public PEvent(IPrtValue payload) : base()
         {
             Payload = payload;
-            Loc = loc;
         }
 
         public IPrtValue Payload { get; }
@@ -52,7 +50,7 @@ public override string ToString()
 
     public class PHalt : PEvent
     {
-        public PHalt(IPrtValue payload, int loc) : base(payload, loc)
+        public PHalt(IPrtValue payload) : base(payload)
         {
         }
     }

Src/PChecker/CheckerCore/PRuntime/PMachine.cs

@@ -84,7 +84,7 @@ public void TrySendEvent(PMachineValue target, Event ev, object payload = null)
             Assert(target.Permissions.Contains(ev.GetType().Name),
                 $"Event {ev.GetType().Name} is not in the permissions set of the target machine");
             var oneArgConstructor = ev.GetType().GetConstructors().First(x => x.GetParameters().Length > 0);
-            ev = (Event)oneArgConstructor.Invoke(new[] { payload , ev.Loc});
+            ev = (Event)oneArgConstructor.Invoke(new[] { payload });
 
             ev.Sender = Id.ToString();
             ev.Receiver = target.Id.ToString();
@@ -96,7 +96,7 @@ public void TryRaiseEvent(Event ev, object payload = null)
         {
             Assert(ev != null, "Machine cannot raise a null event");
             var oneArgConstructor = ev.GetType().GetConstructors().First(x => x.GetParameters().Length > 0);
-            ev = (Event)oneArgConstructor.Invoke(new[] { payload, ev.Loc });
+            ev = (Event)oneArgConstructor.Invoke(new[] { payload });
             RaiseEvent(ev);
             throw new PNonStandardReturnException { ReturnKind = NonStandardReturn.Raise };
         }
@@ -190,7 +190,7 @@ public void Announce(Event ev, object payload = null)
             }
 
             var oneArgConstructor = ev.GetType().GetConstructors().First(x => x.GetParameters().Length > 0);
-            var @event = (Event)oneArgConstructor.Invoke(new[] { payload, ev.Loc });
+            var @event = (Event)oneArgConstructor.Invoke(new[] { payload });
             var pText = payload == null ? "" : $" with payload {((IPrtValue)payload).ToEscapedString()}";
 
             Logger.WriteLine($"<AnnounceLog> '{Id}' announced event '{ev.GetType().Name}'{pText}.");
@@ -255,7 +255,7 @@ public object ToDict()
 
         public class InitializeParametersEvent : PEvent
         {
-            public InitializeParametersEvent(InitializeParameters payload) : base(payload, 0)
+            public InitializeParametersEvent(InitializeParameters payload) : base(payload)
             {
             }
         }

Src/PCompiler/CompilerCore/Backend/CSharp/CSharpCodeGenerator.cs

@@ -22,8 +22,6 @@ public class CSharpCodeGenerator : ICodeGenerator
         /// </summary>
         public bool HasCompilationStage => true;
 
-        private int _sendEventIndex = 0;
-
         public void Compile(ICompilerConfiguration job)
         {
             var csprojName = $"{job.ProjectName}.csproj";
@@ -486,8 +484,8 @@ private void WriteEvent(CompilationContext context, StringWriter output, PEvent
             var payloadType = GetCSharpType(pEvent.PayloadType, true);
             context.WriteLine(output, $"internal partial class {declName} : PEvent");
             context.WriteLine(output, "{");
-            context.WriteLine(output, $"public {declName}() : base(-1) {{}}");
-            context.WriteLine(output, $"public {declName}({payloadType} payload, int loc): base(payload, loc)" + "{ }");
+            context.WriteLine(output, $"public {declName}() : base() {{}}");
+            context.WriteLine(output, $"public {declName} ({payloadType} payload): base(payload)" + "{ }");
             context.WriteLine(output, $"public override IPrtValue Clone() {{ return new {declName}();}}");
             context.WriteLine(output, "}");
 
@@ -512,12 +510,12 @@ private void WriteMachine(CompilationContext context, StringWriter output, Machi
             var cTorType = GetCSharpType(machine.PayloadType, true);
             context.Write(output, "public class ConstructorEvent : PEvent");
             context.Write(output, "{");
-            context.Write(output, $"public ConstructorEvent({cTorType} val, int loc) : base(val, loc) {{ }}");
+            context.Write(output, $"public ConstructorEvent({cTorType} val) : base(val) {{ }}");
             context.WriteLine(output, "}");
             context.WriteLine(output);
 
             context.WriteLine(output,
-                $"protected override Event GetConstructorEvent(IPrtValue value) {{ return new ConstructorEvent(({cTorType})value, {_sendEventIndex++}); }}");
+                $"protected override Event GetConstructorEvent(IPrtValue value) {{ return new ConstructorEvent(({cTorType})value); }}");
 
             // create the constructor to initialize the sends, creates and receives list
             WriteMachineConstructor(context, output, machine);
@@ -708,7 +706,7 @@ private void WriteFunction(CompilationContext context, StringWriter output, Func
 
             var staticKeyword = isStatic ? "static " : "";
             var asyncKeyword = isAsync ? "async " : "";
-            var returnType = function.Role != FunctionRole.Scenario ? GetCSharpType(signature.ReturnType) : "int";
+            var returnType = GetCSharpType(signature.ReturnType);
 
             if (isAsync)
             {
@@ -721,10 +719,6 @@ private void WriteFunction(CompilationContext context, StringWriter output, Func
             {
                 functionParameters = "Event currentMachine_dequeuedEvent";
             }
-            else if (function.Role == FunctionRole.Scenario)
-            {
-                functionParameters = "List<Event> events";
-            }
             else
             {
                 functionParameters = string.Join(
@@ -733,7 +727,7 @@ private void WriteFunction(CompilationContext context, StringWriter output, Func
                         $"{GetCSharpType(param.Type)} {context.Names.GetNameForDecl(param)}"));
             }
 
-            if (isStatic && function.Role != FunctionRole.Scenario) // then we need to generate two versions of the function
+            if (isStatic) // then we need to generate two versions of the function
             {
                 // for machine
                 var seperator = functionParameters == "" ? "" : ", ";
@@ -789,69 +783,14 @@ private void WriteFunctionBody(CompilationContext context, StringWriter output,
                     $"{GetCSharpType(type, true)} {context.Names.GetNameForDecl(local)} = {GetDefaultValue(type)};");
             }
 
-            if (function.Role != FunctionRole.Scenario)
-            {
-                foreach (var bodyStatement in function.Body.Statements)
-                {
-                    WriteStmt(context: context, output: output, function: function, stmt: bodyStatement);
-                }
-            }
-            else
-            {
-                WriteScenario(context, output, function);
-            }
-
-
-            context.WriteLine(output, "}");
-        }
-
-        private void WriteScenario(CompilationContext context, StringWriter output, Function function)
-        {
-            int numOfStmt = function.Body.Statements.Count + 1;
-            context.WriteLine(output, $"int state = {numOfStmt};");
-            var eventPredicates = string.Join(" or ", function.Signature.ParameterEvents.Select(it => it.Name));
-            context.WriteLine(output, $"events = events.Where(it => it is {eventPredicates}).ToList();");
-            WriteConstraintsRecursive(context, output, function, 0, new HashSet<Variable>(), 0);
-            context.WriteLine(output, "return state;");
-        }
-
-        private void WriteConstraintsRecursive(CompilationContext context, StringWriter output, Function function, int index, HashSet<Variable> visitedVariables, int satisfiedConstraints)
-        {
-            if (index >= function.Signature.Parameters.Count)
-            {
-                context.WriteLine(output, "return 1;");
-                return;
-            }
-            var param = function.Signature.Parameters[index];
-            var e = function.Signature.ParameterEvents[index];
-            visitedVariables.Add(param);
-            var start = index == 0 ? "0" : $"i{index - 1} + 1";
-            var paramName = context.Names.GetNameForDecl(param);
-            context.WriteLine(output, $"for (var i{index} = {start} ; i{index} < events.Count; i{index} ++) " + "{");
-            context.WriteLine(output, $"var {paramName}_obj = events[i{index}];");
-            context.WriteLine(output, $"if ({paramName}_obj is not {e.Name}) continue;");
-            context.WriteLine(output, $"var {paramName} = ((PEvent) {paramName}_obj).Payload;");
-
             foreach (var bodyStatement in function.Body.Statements)
             {
-                if (bodyStatement is ConstraintStmt stmt)
-                {
-                    var variables = ConstraintVariableCollector.FindVariablesRecursive(stmt.Constraint);
-                    if (variables.Contains(param) && visitedVariables.IsSupersetOf(variables))
-                    {
-                        context.Write(output, $"if (!(");
-                        WriteExpr(context, output, stmt.Constraint);
-                        context.WriteLine(output, $")) continue;");
-                        satisfiedConstraints += 1;
-                        context.WriteLine(output, $"state = Math.Min({function.Body.Statements.Count - satisfiedConstraints + 1}, state);");
-                    }
-                }
+                WriteStmt(context: context, output: output, function: function, stmt: bodyStatement);
             }
-            WriteConstraintsRecursive(context, output, function, index + 1, visitedVariables, satisfiedConstraints);
+
             context.WriteLine(output, "}");
         }
 
-
         private void WriteStmt(CompilationContext context, StringWriter output, Function function, IPStmt stmt)
         {
             switch (stmt)
@@ -1240,19 +1179,9 @@ private void WriteLValue(CompilationContext context, StringWriter output, IPExpr
                     break;
 
                 case NamedTupleAccessExpr namedTupleAccessExpr:
-                    if (ExprVisitor.ReservedEventFeilds.ContainsValue(namedTupleAccessExpr.Entry))
-                    {
-                        var type = GetCSharpType(namedTupleAccessExpr.Entry.Type);
-                        context.Write(output, $"(({type}) (");
-                        WriteExpr(context, output, namedTupleAccessExpr.SubExpr);
-                        context.Write(output, $"_obj).{namedTupleAccessExpr.FieldName})");
-                    }
-                    else
-                    {
-                        context.Write(output, "((PrtNamedTuple)");
-                        WriteExpr(context, output, namedTupleAccessExpr.SubExpr);
-                        context.Write(output, $")[\"{namedTupleAccessExpr.FieldName}\"]");
-                    }
+                    context.Write(output, "((PrtNamedTuple)");
+                    WriteExpr(context, output, namedTupleAccessExpr.SubExpr);
+                    context.Write(output, $")[\"{namedTupleAccessExpr.FieldName}\"]");
                     break;
 
                 case SeqAccessExpr seqAccessExpr:
@@ -1296,9 +1225,9 @@ private void WriteExpr(CompilationContext context, StringWriter output, IPExpr p
                         context.Write(output, $"({negate}PrtValues.SafeEquals(");
                         if (PLanguageType.TypeIsOfKind(binOpExpr.Lhs.Type, TypeKind.Enum))
                         {
-                            context.Write(output, "PrtValues.Box((long) ((PrtInt)");
+                            context.Write(output, "PrtValues.Box((long) ");
                             WriteExpr(context, output, binOpExpr.Lhs);
-                            context.Write(output, ")),");
+                            context.Write(output, "),");
                         }
                         else
                         {
@@ -1308,9 +1237,9 @@ private void WriteExpr(CompilationContext context, StringWriter output, IPExpr p
 
                         if (PLanguageType.TypeIsOfKind(binOpExpr.Rhs.Type, TypeKind.Enum))
                         {
-                            context.Write(output, "PrtValues.Box((long) ((PrtInt)");
+                            context.Write(output, "PrtValues.Box((long) ");
                             WriteExpr(context, output, binOpExpr.Rhs);
-                            context.Write(output, "))");
+                            context.Write(output, ")");
                         }
                         else
                         {
@@ -1459,7 +1388,7 @@ private void WriteExpr(CompilationContext context, StringWriter output, IPExpr p
                     switch (eventName)
                     {
                         case "Halt":
-                            context.Write(output, "new PHalt(" + _sendEventIndex++ + ")");
+                            context.Write(output, "new PHalt()");
                             break;
 
                         case "DefaultEvent":
@@ -1468,7 +1397,7 @@ private void WriteExpr(CompilationContext context, StringWriter output, IPExpr p
 
                         default:
                             var payloadExpr = GetDefaultValue(eventRefExpr.Value.PayloadType);
-                            context.Write(output, $"new {eventName}({payloadExpr}, {_sendEventIndex++})");
+                            context.Write(output, $"new {eventName}({payloadExpr})");
                             break;
                     }
 

Src/PCompiler/CompilerCore/Backend/IRTransformer.cs

@@ -567,9 +567,6 @@ private List<IPStmt> SimplifyStatement(IPStmt statement)
                         condCheck.Concat(SimplifyStatement(whileStmt.Body)));
 
                     return new List<IPStmt> { new WhileStmt(location, new BoolLiteralExpr(location, true), loopBody) };
-                // We do not rewrite constraint statements for now.
-                case ConstraintStmt constraintStmt:
-                    return new List<IPStmt>() { constraintStmt };
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(statement));

Src/PCompiler/CompilerCore/Parser/PLexer.g4

@@ -70,7 +70,6 @@ MODULE         : 'module' ;
 IMPLEMENTATION : 'implementation' ;
 TEST           : 'test' ;
 REFINES        : 'refines' ;
-SCENARIO  : 'scenario' ;
 
 // module constructors
 COMPOSE        : 'compose' ;

Src/PCompiler/CompilerCore/Parser/PParser.g4

@@ -60,7 +60,6 @@ topDecl : typeDefDecl
         | namedModuleDecl
         | testDecl
         | implementationDecl
-        | scenarioDecl
         ;
 
 
@@ -108,13 +107,6 @@ funDecl : FUN name=iden LPAREN funParamList? RPAREN (COLON type)? (CREATES inter
         | FUN name=iden LPAREN funParamList? RPAREN (COLON type)? functionBody # PFunDecl
         ;
 
-scenarioDecl : SCENARIO scenarioName=iden LPAREN scenarioParamList RPAREN scenarioBody;
-
-scenarioParamList: scenarioParam (COMMA scenarioParam)*;
-scenarioParam : name=iden COLON nonDefaultEvent;
-scenarioBody : LBRACE expr (COMMA expr)* RBRACE;
-
-
 stateDecl : START? temperature=(HOT | COLD)? STATE name=iden LBRACE stateBodyItem* RBRACE ;
 
 stateBodyItem : ENTRY anonEventHandler       # StateEntry

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

@@ -15,8 +15,7 @@ public enum FunctionRole
         EventHandler = 1 << 4,
         ExitHandler = 1 << 5,
         ReceiveHandler = 1 << 6,
-        Foreign = 1 << 7,
-        Scenario = 1 << 8,
+        Foreign = 1 << 7
     }
 
     public class Function : IPDecl, IHasScope
@@ -33,8 +32,7 @@ sourceNode is PParser.AnonEventHandlerContext ||
                          sourceNode is PParser.NoParamAnonEventHandlerContext ||
                          sourceNode is PParser.ReceiveStmtContext ||
                          sourceNode is PParser.WhileStmtContext ||
-                         sourceNode is PParser.ForeachStmtContext ||
-                         sourceNode is PParser.ScenarioDeclContext);
+                         sourceNode is PParser.ForeachStmtContext);
             Name = name;
             SourceLocation = sourceNode;
             CanCreate = false;

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

@@ -7,8 +7,6 @@ namespace Plang.Compiler.TypeChecker.AST.Declarations
     public class FunctionSignature
     {
         public List<Variable> Parameters { get; } = new List<Variable>();
-        // This is only used by scenarios.
-        public List<PEvent> ParameterEvents { get; } = new();
         public IEnumerable<PLanguageType> ParameterTypes => Parameters.Select(ty => ty.Type);
         public PLanguageType ReturnType { get; set; } = PrimitiveType.Null;
     }

Src/PCompiler/CompilerCore/TypeChecker/Analyzer.cs

@@ -179,14 +179,7 @@ private static Scope BuildGlobalScope(ICompilerConfiguration config, PParser.Pro
             {
                 DeclarationVisitor.PopulateDeclarations(config.Handler, globalScope, programUnit, nodesToDeclarations);
             }
-
-            // Step 3: Assign param types for scenario events. We have do this after all events are initialized.
-            foreach (var function in globalScope.Functions)
-            {
-                ScenarioEventVisitor.PopulateEventTypes(function);
-            }
-
-
+
             return globalScope;
         }