diff --git a/Sources/P4Lang/Statement.swift b/Sources/P4Lang/Statement.swift index c52abfc..e8c82d4 100644 --- a/Sources/P4Lang/Statement.swift +++ b/Sources/P4Lang/Statement.swift @@ -37,7 +37,10 @@ public struct ConditionalStatement { self.elss = .none } - public init(condition: EvaluatableExpression, withThen thenn: EvaluatableStatement, andElse elss: EvaluatableStatement) { + public init( + condition: EvaluatableExpression, withThen thenn: EvaluatableStatement, + andElse elss: EvaluatableStatement + ) { self.condition = condition self.thenn = thenn self.elss = elss @@ -51,4 +54,4 @@ public struct BlockStatement { self.statements = statements } -} \ No newline at end of file +} diff --git a/Sources/P4Runtime/Program.swift b/Sources/P4Runtime/Program.swift index cfd4fc5..cc11b14 100644 --- a/Sources/P4Runtime/Program.swift +++ b/Sources/P4Runtime/Program.swift @@ -22,7 +22,7 @@ extension BlockStatement: EvaluatableStatement { public func evaluate(execution: ProgramExecution) -> ProgramExecution { var execution = execution for s in self.statements { - execution = s.evaluate(execution: execution) + execution = s.evaluate(execution: execution) } return execution } @@ -50,19 +50,18 @@ extension ConditionalStatement: EvaluatableStatement { if initial_value.eq(rhs: P4BooleanValue.init(withValue: true)) { let execution = execution.enter_scope() var result = self.thenn.evaluate(execution: execution) - result = result.exit_scope() + result = result.exit_scope() return result } else if let elss = self.elss { let execution = execution.enter_scope() var result = elss.evaluate(execution: execution) - result = result.exit_scope() + result = result.exit_scope() return result } return execution } } - extension ExpressionStatement: EvaluatableStatement { public func evaluate(execution: ProgramExecution) -> ProgramExecution { return execution