hawkinsw/gp4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Formatter Happy

Browse Source 
Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
This commit is contained in:
Will Hawkins
2026-04-20 16:29:59 -04:00
parent a24571222b
commit 99d3d2bace
5 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Common/Execution.swift
-2
View File
@@ -15,8 +15,6 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
public typealias ExecuteStatementResultHandler = (ControlFlow, ProgramExecution) -> ( public typealias ExecuteStatementResultHandler = (ControlFlow, ProgramExecution) -> (
ControlFlow, ProgramExecution ControlFlow, ProgramExecution
) )
Sources/Common/Protocols.swift
+2 -2
View File
@@ -59,12 +59,12 @@ public protocol ProgramExecutionEvaluator {
func ExecuteStatement( func ExecuteStatement(
_ statements: [EvaluatableStatement], handleResult handler: ExecuteStatementResultHandler, _ statements: [EvaluatableStatement], handleResult handler: ExecuteStatementResultHandler,
inExecution execution: ProgramExecution, inExecution execution: ProgramExecution,
) -> (ControlFlow, ProgramExecution); ) -> (ControlFlow, ProgramExecution)
func ExecuteStatement( func ExecuteStatement(
_ statement: EvaluatableStatement, handleResult handler: ExecuteStatementResultHandler, _ statement: EvaluatableStatement, handleResult handler: ExecuteStatementResultHandler,
inExecution execution: ProgramExecution inExecution execution: ProgramExecution
) -> (ControlFlow, ProgramExecution); ) -> (ControlFlow, ProgramExecution)
func EvaluateExpression( func EvaluateExpression(
_ expression: EvaluatableExpression, inExecution execution: ProgramExecution, _ expression: EvaluatableExpression, inExecution execution: ProgramExecution,
Sources/P4Runtime/Common.swift
+2 -2
View File
@@ -33,7 +33,8 @@ public func Call<T>(
let arg_idx = argument.index let arg_idx = argument.index
let arg_value = argument.argument let arg_value = argument.argument
//let maybe_argument_value = arg_value.evaluate(execution: called_execution) //let maybe_argument_value = arg_value.evaluate(execution: called_execution)
let maybe_argument_value = called_execution.evaluator.EvaluateExpression(arg_value, inExecution: called_execution) let maybe_argument_value = called_execution.evaluator.EvaluateExpression(
arg_value, inExecution: called_execution)
guard case (.Ok(let argument_value), let updated_execution) = maybe_argument_value else { guard case (.Ok(let argument_value), let updated_execution) = maybe_argument_value else {
return ( return (
.Error(Error(withMessage: "Cannot evaluate argument \(arg_idx): \(argument)")), .Error(Error(withMessage: "Cannot evaluate argument \(arg_idx): \(argument)")),
@@ -83,4 +84,3 @@ public func Call<T>(
} }
return (.Ok(call_result), updated_execution.replaceScopes(inout_scopes)) return (.Ok(call_result), updated_execution.replaceScopes(inout_scopes))
} }
Sources/P4Runtime/Expressions.swift
+20 -10
View File
@@ -33,12 +33,14 @@ extension SelectExpression: EvaluatableExpression {
switch execution.evaluator.EvaluateExpression(self.selector, inExecution: execution) { switch execution.evaluator.EvaluateExpression(self.selector, inExecution: execution) {
case (.Ok(let selector_value), let updated_execution): case (.Ok(let selector_value), let updated_execution):
for sce in self.case_expressions { for sce in self.case_expressions {
if case (.Ok(let kse), let updated_execution) = updated_execution.evaluator.EvaluateExpression( if case (.Ok(let kse), let updated_execution) = updated_execution.evaluator
.EvaluateExpression(
sce.key, inExecution: updated_execution), sce.key, inExecution: updated_execution),
kse.eq(selector_value) kse.eq(selector_value)
{ {
//let result = sce.evaluate(execution: updated_execution) //let result = sce.evaluate(execution: updated_execution)
let result = updated_execution.evaluator.EvaluateExpression(sce, inExecution: updated_execution) let result = updated_execution.evaluator.EvaluateExpression(
sce, inExecution: updated_execution)
return result return result
} }
} }
@@ -212,13 +214,15 @@ extension BinaryOperatorExpression: EvaluatableExpression {
public func evaluate(execution: ProgramExecution) -> (Result<P4Value>, ProgramExecution) { public func evaluate(execution: ProgramExecution) -> (Result<P4Value>, ProgramExecution) {
let updated_execution = execution let updated_execution = execution
//let maybe_evaluated_left = self.left.evaluate(execution: updated_execution) //let maybe_evaluated_left = self.left.evaluate(execution: updated_execution)
let maybe_evaluated_left = updated_execution.evaluator.EvaluateExpression(self.left, inExecution: updated_execution) let maybe_evaluated_left = updated_execution.evaluator.EvaluateExpression(
self.left, inExecution: updated_execution)
guard case (.Ok(let evaluated_left), let updated_execution) = maybe_evaluated_left else { guard case (.Ok(let evaluated_left), let updated_execution) = maybe_evaluated_left else {
return maybe_evaluated_left return maybe_evaluated_left
} }
//let maybe_evaluated_right = self.right.evaluate(execution: updated_execution) //let maybe_evaluated_right = self.right.evaluate(execution: updated_execution)
let maybe_evaluated_right = updated_execution.evaluator.EvaluateExpression(self.right, inExecution: updated_execution) let maybe_evaluated_right = updated_execution.evaluator.EvaluateExpression(
self.right, inExecution: updated_execution)
guard case (.Ok(let evaluated_right), let updated_execution) = maybe_evaluated_right else { guard case (.Ok(let evaluated_right), let updated_execution) = maybe_evaluated_right else {
return maybe_evaluated_right return maybe_evaluated_right
} }
@@ -235,13 +239,15 @@ extension ArrayAccessExpression: EvaluatableExpression {
public func evaluate(execution: ProgramExecution) -> (Result<P4Value>, ProgramExecution) { public func evaluate(execution: ProgramExecution) -> (Result<P4Value>, ProgramExecution) {
let updated_execution = execution let updated_execution = execution
//let maybe_name = self.name.evaluate(execution: updated_execution) //let maybe_name = self.name.evaluate(execution: updated_execution)
let maybe_name = updated_execution.evaluator.EvaluateExpression(self.name, inExecution: updated_execution) let maybe_name = updated_execution.evaluator.EvaluateExpression(
self.name, inExecution: updated_execution)
guard case (.Ok(let name), let updated_execution) = maybe_name else { guard case (.Ok(let name), let updated_execution) = maybe_name else {
return maybe_name return maybe_name
} }
//let maybe_indexor = self.indexor.evaluate(execution: updated_execution) //let maybe_indexor = self.indexor.evaluate(execution: updated_execution)
let maybe_indexor = updated_execution.evaluator.EvaluateExpression(self.indexor, inExecution: updated_execution) let maybe_indexor = updated_execution.evaluator.EvaluateExpression(
self.indexor, inExecution: updated_execution)
guard case (.Ok(let indexor), let updated_execution) = maybe_indexor else { guard case (.Ok(let indexor), let updated_execution) = maybe_indexor else {
return maybe_indexor return maybe_indexor
} }
@@ -271,7 +277,8 @@ extension ArrayAccessExpression: EvaluatableLValueExpression {
let updated_execution = execution let updated_execution = execution
//let maybe_value = self.name.evaluate(execution: updated_execution) //let maybe_value = self.name.evaluate(execution: updated_execution)
let maybe_value = updated_execution.evaluator.EvaluateExpression(self.name, inExecution: updated_execution) let maybe_value = updated_execution.evaluator.EvaluateExpression(
self.name, inExecution: updated_execution)
guard case (.Ok(let value), let updated_execution) = maybe_value else { guard case (.Ok(let value), let updated_execution) = maybe_value else {
return .Error( return .Error(
Error(withMessage: "\(self.name) cannot be evaluated: \(maybe_value.0.error()!)")) Error(withMessage: "\(self.name) cannot be evaluated: \(maybe_value.0.error()!)"))
@@ -282,7 +289,8 @@ extension ArrayAccessExpression: EvaluatableLValueExpression {
// Now, get the indexor! // Now, get the indexor!
//let maybe_indexor_value = self.indexor.evaluate(execution: updated_execution) //let maybe_indexor_value = self.indexor.evaluate(execution: updated_execution)
let maybe_indexor_value = updated_execution.evaluator.EvaluateExpression(self.indexor, inExecution: updated_execution) let maybe_indexor_value = updated_execution.evaluator.EvaluateExpression(
self.indexor, inExecution: updated_execution)
guard case (.Ok(let indexor_value), let updated_execution) = maybe_indexor_value else { guard case (.Ok(let indexor_value), let updated_execution) = maybe_indexor_value else {
return Result.Error( return Result.Error(
Error(withMessage: "\(self.indexor) cannot be evaluated: \(maybe_indexor_value.0.error()!)") Error(withMessage: "\(self.indexor) cannot be evaluated: \(maybe_indexor_value.0.error()!)")
@@ -349,7 +357,8 @@ extension FieldAccessExpression: EvaluatableExpression {
let updated_execution = execution let updated_execution = execution
//let maybe_struct = self.strct.evaluate(execution: updated_execution) //let maybe_struct = self.strct.evaluate(execution: updated_execution)
let maybe_struct = updated_execution.evaluator.EvaluateExpression(self.strct, inExecution: updated_execution) let maybe_struct = updated_execution.evaluator.EvaluateExpression(
self.strct, inExecution: updated_execution)
guard case (.Ok(let strct), let updated_execution) = maybe_struct else { guard case (.Ok(let strct), let updated_execution) = maybe_struct else {
return maybe_struct return maybe_struct
} }
@@ -384,7 +393,8 @@ extension FieldAccessExpression: EvaluatableLValueExpression {
let updated_execution = execution let updated_execution = execution
// First, evaluate strct_id and make sure that it names a struct. // First, evaluate strct_id and make sure that it names a struct.
//let maybe_value = self.strct.evaluate(execution: updated_execution) //let maybe_value = self.strct.evaluate(execution: updated_execution)
let maybe_value = updated_execution.evaluator.EvaluateExpression(self.strct, inExecution: updated_execution) let maybe_value = updated_execution.evaluator.EvaluateExpression(
self.strct, inExecution: updated_execution)
guard case (.Ok(let value), let updated_execution) = maybe_value else { guard case (.Ok(let value), let updated_execution) = maybe_value else {
return .Error( return .Error(
Error(withMessage: "\(self.strct) cannot be evaluated: \(maybe_value.0.error()!)")) Error(withMessage: "\(self.strct) cannot be evaluated: \(maybe_value.0.error()!)"))
Sources/P4Runtime/Parser.swift
+2 -1
View File
@@ -22,7 +22,8 @@ extension ParserAssignmentStatement: EvaluatableStatement {
public func evaluate(execution: ProgramExecution) -> (ControlFlow, ProgramExecution) { public func evaluate(execution: ProgramExecution) -> (ControlFlow, ProgramExecution) {
let updated_execution = execution let updated_execution = execution
//let result = self.value.evaluate(execution: updated_execution) //let result = self.value.evaluate(execution: updated_execution)
let result = updated_execution.evaluator.EvaluateExpression(self.value, inExecution: updated_execution) let result = updated_execution.evaluator.EvaluateExpression(
self.value, inExecution: updated_execution)
guard case (.Ok(let value), let updated_execution) = result else { guard case (.Ok(let value), let updated_execution) = result else {
return (ControlFlow.Error, execution.setError(error: result.0.error()!)) return (ControlFlow.Error, execution.setError(error: result.0.error()!))
} }