runtime: Refactor ExecutionEvaluator

Move as much of the common functionality of executing a block of statements into a common area as possible. Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
2026-04-23 06:05:35 -04:00
parent 99d3d2bace
commit a2d6aa0e28
3 changed files with 74 additions and 67 deletions
@@ -20,22 +20,21 @@ import P4Lang

 extension BlockStatement: EvaluatableStatement {
  public func evaluate(execution: ProgramExecution) -> (ControlFlow, ProgramExecution) {
-    return execution.evaluator.ExecuteStatement(
-      self.statements,
-      handleResult: { (cf, execution) in
-        switch cf {
-        case ControlFlow.Return(let value): return (ControlFlow.Return(value), execution)
-        case ControlFlow.Next: return (cf, execution)
-        case ControlFlow.Error: return (ControlFlow.Error, execution)
-        default:
-          return (
-            ControlFlow.Error,
-            execution.setError(
-              error: Error(withMessage: "Invalid control flow \(cf) in block statement"))
-          )
-        }
-      },
-      inExecution: execution)
+    return execution.evaluator.ExecuteStatements(
+      self.statements, inExecution: execution
+    ) { (cf, execution) in
+      switch cf {
+      case ControlFlow.Return(let value): return (ControlFlow.Return(value), execution)
+      case ControlFlow.Next: return (cf, execution)
+      case ControlFlow.Error: return (ControlFlow.Error, execution)
+      default:
+        return (
+          ControlFlow.Error,
+          execution.setError(
+            error: Error(withMessage: "Invalid control flow \(cf) in block statement"))
+        )
+      }
+    }
  }
 }