diff --git a/Sources/Common/Error.swift b/Sources/Common/Error.swift index db5fe0f..5e34a02 100644 --- a/Sources/Common/Error.swift +++ b/Sources/Common/Error.swift @@ -70,7 +70,7 @@ public struct ErrorWithLocation: Errorable, Equatable, CustomStringConvertible { public struct Errors: Errorable, CustomStringConvertible { public func format(_ formatter: any Formattable) -> String { - self.errors.map() { error in + self.errors.map { error in error.format(formatter) }.joined(separator: "\n") } diff --git a/Sources/P4Compiler/Parser.swift b/Sources/P4Compiler/Parser.swift index 109d1e4..10f1e3d 100644 --- a/Sources/P4Compiler/Parser.swift +++ b/Sources/P4Compiler/Parser.swift @@ -169,11 +169,12 @@ public struct Parser { current_context = updated_context parsed_s.append(parsed_statement) case .Error(let e): - errors = if let errors = errors { - errors.append(error: e) - } else { - e - } + errors = + if let errors = errors { + errors.append(error: e) + } else { + e + } } } @@ -255,11 +256,12 @@ public struct Parser { parsed_s = state_statements current_context = updated_context case .Error(let error): - errors = if let errors = errors { - errors.append(error: error) - } else { - error - } + errors = + if let errors = errors { + errors.append(error: error) + } else { + error + } } walker.next() } diff --git a/Sources/P4Compiler/Program.swift b/Sources/P4Compiler/Program.swift index 8c3ac63..d84d324 100644 --- a/Sources/P4Compiler/Program.swift +++ b/Sources/P4Compiler/Program.swift @@ -90,11 +90,12 @@ public struct Program { break case .Error(let e): found_parser = true - errors = if let errors = errors { - errors.append(error: e) - } else { - e - } + errors = + if let errors = errors { + errors.append(error: e) + } else { + e + } break } }