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

compiler, runtime: Refactor Errors

Browse Source 
Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
This commit is contained in:
Will Hawkins
2026-05-04 10:34:07 -04:00
parent b49ec104e9
commit 168d48fa7c
16 changed files with 456 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Common/Execution.swift
+3 -3
View File
@@ -152,7 +152,7 @@ public typealias ExpressionInterloper = (EvaluatableExpression, Result<P4Value>,
open class ProgramExecution: CustomStringConvertible {
public var scopes: VarValueScopes = VarValueScopes()
var globalValues: VarValueScopes?
var error: Error?
var error: (any Errorable)?
var debug: DebugLevel = DebugLevel.Error
public let evaluator: ProgramExecutionEvaluator
@@ -182,11 +182,11 @@ open class ProgramExecution: CustomStringConvertible {
return self.error != nil
}
public func getError() -> Error? {
public func getError() -> (any Errorable)? {
return self.error
}
public func setError(error: Error) -> ProgramExecution {
public func setError(error: any Errorable) -> ProgramExecution {
let npe = ProgramExecution(copy: self)
npe.error = error
return npe
Sources/Common/Protocols.swift
+13
View File
@@ -70,6 +70,19 @@ public protocol ProgramExecutionEvaluator {
) -> (Result<P4Value>, ProgramExecution)
}
public protocol Errorable: CustomStringConvertible {
func format() -> String
func msg() -> String
func append(error: any Errorable) -> any Errorable
func eq(_ rhs: any Errorable) -> Bool
}
extension Errorable {
public func eq(_ rhs: any Errorable) -> Bool {
return self.msg() == rhs.msg()
}
}
extension ProgramExecutionEvaluator {
public func ExecuteStatements(
_ statements: [EvaluatableStatement], inExecution execution: ProgramExecution
Sources/Common/Result.swift
+178
View File
@@ -0,0 +1,178 @@
// p4rse, Copyright 2026, Will Hawkins
//
// This file is part of p4rse.
//
// This file is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
public struct Error: Errorable, Equatable, CustomStringConvertible {
public func format() -> String {
return self.description
}
public func msg() -> String {
return self._msg
}
public func append(error: any Errorable) -> any Errorable {
return Errors(self, error)
}
let _msg: String
public init(withMessage msg: String) {
self._msg = msg
}
public var description: String {
return self._msg
}
}
public struct ErrorWithLocation: Errorable, Equatable, CustomStringConvertible {
public func format() -> String {
return self.description
}
public func msg() -> String {
return self.description
}
public func append(error: any Errorable) -> any Errorable {
return Errors(self, error)
}
let _msg: String
let location: SourceLocation
public init(sourceLocation location: SourceLocation, withError msg: String) {
self._msg = msg
self.location = location
}
public var description: String {
return "\(self.location): \(self._msg)"
}
}
public struct Errors: Errorable, CustomStringConvertible {
public func format() -> String {
return self.description
}
public func msg() -> String {
return self.description
}
public func append(error: any Errorable) -> any Errorable {
return Errors(self.errors + [error])
}
public var description: String {
return self.errors.map() { error in
return error.msg()
}.joined(separator: ";")
}
public let errors: [any Errorable]
init(_ errors: [any Errorable]) {
self.errors = errors
}
public init(_ e1: any Errorable, _ e2: any Errorable) {
self.errors = [e1, e2]
}
}
public struct ErrorWithLabel: Errorable {
let label: String
let error: any Errorable
public init(_ label: String, _ error: any Errorable) {
self.label = label
self.error = error
}
public func format() -> String {
return self.description
}
public func msg() -> String {
return self.description
}
public func append(error: any Errorable) -> any Errorable {
return Errors(self, error)
}
public var description: String {
return "\(self.label): \(self.error.msg())"
}
}
public enum Result<OKT>: Equatable {
case Ok(OKT)
case Error(any Errorable)
public static func == (lhs: Result, rhs: Result) -> Bool {
switch (lhs, rhs) {
case (Ok, Ok):
return true
case (Error(let le), Error(let re)):
return le.eq(re)
default:
return false
}
}
public func ok() -> Bool {
switch self {
case .Ok(_): true
case .Error(_): false
}
}
public func error() -> (any Errorable)? {
if case Result.Error(let e) = self {
return e
}
return nil
}
public func map<T>(block: (OKT) -> Result<T>) -> Result<T> {
switch self {
case .Ok(let ok): return block(ok)
case .Error(let e): return .Error(e)
}
}
public func map_err(block: (any Errorable) -> Result) -> Result {
switch self {
case .Ok(let ok): return .Ok(ok)
case .Error(let e): return block(e)
}
}
}
extension Result: CustomStringConvertible where OKT: CustomStringConvertible {
public var description: String {
switch self {
case Result.Error(let e):
return e.format()
case Result.Ok(let o):
return "Ok: \(o)"
}
}
}
Sources/Common/Support.swift
+16 -61
View File
@@ -15,6 +15,20 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
public struct SourceLocation: Equatable, CustomStringConvertible {
public let start: Int
public let extent: Int
public init(_ start: Int, _ extent: Int) {
self.start = start
self.extent = extent
}
public var description: String {
return "{\(self.start), \(self.extent)}"
}
}
public enum DebugLevel {
case Trace
case Verbose
@@ -61,18 +75,6 @@ public enum DebugLevel {
}
}
public struct Error: Equatable, CustomStringConvertible {
public private(set) var msg: String
public init(withMessage msg: String) {
self.msg = msg
}
public var description: String {
return self.msg
}
}
public struct Nothing: CustomStringConvertible {
public var description: String {
return "Nothing"
@@ -81,64 +83,17 @@ public struct Nothing: CustomStringConvertible {
public init() {}
}
public enum Result<OKT>: Equatable {
case Ok(OKT)
case Error(Error)
public static func == (lhs: Result, rhs: Result) -> Bool {
switch (lhs, rhs) {
case (Ok, Ok):
return true
case (Error(let le), Error(let re)):
return le.msg == re.msg
default:
return false
}
}
public func ok() -> Bool {
switch self {
case .Ok(_): true
case .Error(_): false
}
}
public func error() -> Error? {
if case Result.Error(let e) = self {
return e
}
return nil
}
public func map<T>(block: (OKT) -> Result<T>) -> Result<T> {
switch self {
case .Ok(let ok): return block(ok)
case .Error(let e): return .Error(e)
}
}
}
extension Result: CustomStringConvertible where OKT: CustomStringConvertible {
public var description: String {
switch self {
case Result.Error(let e):
return e.msg
case Result.Ok(let o):
return "Ok: \(o)"
}
}
}
public func Map<T, U>(input: T, block: (T) -> U) -> U {
return block(input)
}
@freestanding(expression) public macro RequireOkResult<T>(_: Result<T>) -> Bool =
#externalMacro(module: "Macros", type: "RequireResult")
@freestanding(expression) public macro RequireErrorResult<T>(_: Error, _: Result<T>) -> Bool =
@freestanding(expression) public macro RequireErrorResult<T>(_: any Errorable, _: Result<T>) -> Bool =
#externalMacro(module: "Macros", type: "RequireErrorResult")
@freestanding(expression) public macro UseOkResult<T>(_: Result<T>) -> T =
#externalMacro(module: "Macros", type: "UseOkResult")
@freestanding(expression) public macro UseErrorResult<T>(_: Result<T>) -> Error =
@freestanding(expression) public macro UseErrorResult<T>(_: Result<T>) -> any Errorable =
#externalMacro(module: "Macros", type: "UseErrorResult")
@freestanding(codeItem) public macro RequireNodeType<N, T>(
node: N, type: String, nice_type_name: String