From a84e778e79b30ee9f9314fcb11eda2ba36196248 Mon Sep 17 00:00:00 2001 From: Will Hawkins Date: Thu, 30 Apr 2026 18:41:01 -0400 Subject: [PATCH] Make Formatter Happy Signed-off-by: Will Hawkins --- Sources/P4Compiler/Declarations.swift | 18 +++++++++++++----- Sources/P4Compiler/Walker.swift | 8 +++++--- Sources/P4Lang/Control.swift | 12 ++++++++---- Sources/P4Runtime/Control.swift | 12 ++++++++---- Sources/P4Runtime/Runtime.swift | 11 ++++++++--- 5 files changed, 42 insertions(+), 19 deletions(-) diff --git a/Sources/P4Compiler/Declarations.swift b/Sources/P4Compiler/Declarations.swift index d5286e8..f8d604f 100644 --- a/Sources/P4Compiler/Declarations.swift +++ b/Sources/P4Compiler/Declarations.swift @@ -708,7 +708,9 @@ extension TableKeys: Compilable { if !errors.isEmpty { return .Error( - ErrorOnNode(node: node, withError: "Error(s) parsing table key: " + ErrorOnNode( + node: node, + withError: "Error(s) parsing table key: " + (errors.map { error in return "\(error.msg)" }.joined(separator: ";")))) @@ -740,10 +742,12 @@ extension TableActionsProperty: Compilable { result: current_node, thing: walker.getNext(), or: Result<(TableActionsProperty, CompilerContext)>.Error( ErrorOnNode( - node: node, withError: "Missing table actions declaration component in control declaration")) + node: node, + withError: "Missing table actions declaration component in control declaration")) ) - let (actions, errors) = walker.try_map(n: node.childCount - 1, onlyNamed: true) { current_node in + let (actions, errors) = walker.try_map(n: node.childCount - 1, onlyNamed: true) { + current_node in switch Identifier.Compile(node: current_node, withContext: context) { case .Ok(let listed_action): switch context.types.lookup(identifier: listed_action) { @@ -761,7 +765,9 @@ extension TableActionsProperty: Compilable { if !errors.isEmpty { return .Error( - ErrorOnNode(node: node, withError: "Error(s) parsing table actions: " + ErrorOnNode( + node: node, + withError: "Error(s) parsing table actions: " + (errors.map { error in return "\(error.msg)" }.joined(separator: ";")))) @@ -808,7 +814,9 @@ extension TablePropertyList: Compilable { if !errors.isEmpty { return .Error( - ErrorOnNode(node: node, withError: "Error(s) parsing property list: " + ErrorOnNode( + node: node, + withError: "Error(s) parsing property list: " + (errors.map { error in return "\(error.msg)" }.joined(separator: ";")))) diff --git a/Sources/P4Compiler/Walker.swift b/Sources/P4Compiler/Walker.swift index a9cf8f8..97c5a87 100644 --- a/Sources/P4Compiler/Walker.swift +++ b/Sources/P4Compiler/Walker.swift @@ -52,7 +52,9 @@ public struct Walker { return Result.Ok(()) } - public func try_map(n: Int, onlyNamed: Bool = false, todo: (Node) -> Result) -> ([T], [Error]) { + public func try_map( + n: Int, onlyNamed: Bool = false, todo: (Node) -> Result + ) -> ([T], [Error]) { var errors: [Error] = Array() var results: [T] = Array() @@ -62,8 +64,8 @@ public struct Walker { continue } switch todo(currentChild) { - case .Ok(let r): results.append(r) - case .Error(let e): errors.append(e) + case .Ok(let r): results.append(r) + case .Error(let e): errors.append(e) } } return (results, errors) diff --git a/Sources/P4Lang/Control.swift b/Sources/P4Lang/Control.swift index dcbcd5b..ab19578 100644 --- a/Sources/P4Lang/Control.swift +++ b/Sources/P4Lang/Control.swift @@ -78,7 +78,8 @@ public struct Action: CustomStringConvertible, P4DataType, P4DataValue { public var name: Identifier public init( - named name: Identifier = Identifier(name: ""), withParameters parameters: ParameterList = ParameterList([]), + named name: Identifier = Identifier(name: ""), + withParameters parameters: ParameterList = ParameterList([]), withBody body: BlockStatement? = .none ) { self.name = name @@ -187,8 +188,9 @@ public struct Table: CustomStringConvertible { /// compared to the entries and the match is assocated with an action /// that is invoked when the match occurs! - public func update(addEntry entry: (P4Value, TypedIdentifier)) -> Table{ - return Table(withName: self.name, withPropertyList: self.properties, withEntries: self.entries + [entry]) + public func update(addEntry entry: (P4Value, TypedIdentifier)) -> Table { + return Table( + withName: self.name, withPropertyList: self.properties, withEntries: self.entries + [entry]) } } @@ -277,7 +279,9 @@ public struct Control: P4DataType, P4DataValue, Equatable, CustomStringConvertib public func updateTable(addEntry entry: (P4Value, TypedIdentifier)) -> Control { let table = self.table.update(addEntry: entry) - return Control(named: self.name, withParameters: self.parameters, withTable: table, withActions: self.actions, withApply: self.apply) + return Control( + named: self.name, withParameters: self.parameters, withTable: table, + withActions: self.actions, withApply: self.apply) } public func def() -> any P4DataValue { diff --git a/Sources/P4Runtime/Control.swift b/Sources/P4Runtime/Control.swift index b1b2006..5b874a5 100644 --- a/Sources/P4Runtime/Control.swift +++ b/Sources/P4Runtime/Control.swift @@ -55,7 +55,7 @@ extension Control: LibraryCallable { // Skip those with mismatching types. if !val.type().eq(key_val.type()) { - continue; + continue } /// ASSUME: All matches are exact. @@ -80,9 +80,13 @@ extension Control: LibraryCallable { return (.Ok(P4TableHitMissValue.Miss), control_execution) } - switch Call(body: call_body, withArguments: arguments, withParameters: self.parameters, inExecution: control_execution) { - case (.Ok(let r), let updated_execution): return (r, updated_execution) - case (.Error(let e), let updated_execution): return (P4TableHitMissValue.Miss, updated_execution.setError(error: e)) + switch Call( + body: call_body, withArguments: arguments, withParameters: self.parameters, + inExecution: control_execution) + { + case (.Ok(let r), let updated_execution): return (r, updated_execution) + case (.Error(let e), let updated_execution): + return (P4TableHitMissValue.Miss, updated_execution.setError(error: e)) } } } diff --git a/Sources/P4Runtime/Runtime.swift b/Sources/P4Runtime/Runtime.swift index 91974b5..1c4573e 100644 --- a/Sources/P4Runtime/Runtime.swift +++ b/Sources/P4Runtime/Runtime.swift @@ -35,7 +35,9 @@ public struct Runtime>: CustomStringConvertible { } /// Create a parser runtime from a P4 program - public static func create(program: P4Lang.Program) -> Result> { + public static func create( + program: P4Lang.Program + ) -> Result> { return Runtime.create(program: program, withGlobalValues: .none) } @@ -44,7 +46,9 @@ public struct Runtime>: CustomStringConvertible { ) -> Result> { return switch program.starting_parser() { case .Ok(let parser): - .Ok(P4Runtime.Runtime(callable: parser, withGlobalValues: initial)) + .Ok( + P4Runtime.Runtime( + callable: parser, withGlobalValues: initial)) case .Error(let error): .Error(error) } } @@ -52,7 +56,8 @@ public struct Runtime>: CustomStringConvertible { public static func create( control: P4Lang.Control, withGlobalValues initial: VarValueScopes? ) -> Result> { - return .Ok(P4Runtime.Runtime(callable: control, withGlobalValues: initial)) + return .Ok( + P4Runtime.Runtime(callable: control, withGlobalValues: initial)) } /// Run a P4 parser with no arguments