Refactor Library And Start Runtime

Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
This commit is contained in:
Will Hawkins
2026-01-20 07:10:58 -05:00
parent 45a8baa323
commit 4bec71dcf4
11 changed files with 472 additions and 65 deletions
+113
View File
@@ -0,0 +1,113 @@
public struct LocalElements {
}
public struct LocalElement {
}
public struct ParserExecution {
public var state: ParserState
public init(_ state: ParserState) {
self.state = state
}
public func transition(toNextState state: ParserState) -> ParserExecution {
return ParserExecution(state)
}
}
public protocol Expression {
/// Evaluate an expression for a given execution
/// - Parameters
/// - execution: The execution context in which to evaluate the expression
/// - Returns: The value of expression
func evaluate(execution: ParserExecution) -> Value
}
public protocol ParserStatement: Sendable {
/// Evaluate a statement for a given execution
/// - Parameters
/// - execution: The execution context in which to evaluate the parser statement
/// - Returns: An updated execution after evaluating the parser statement
func evaluate(execution: ParserExecution) -> ParserExecution
}
public struct ParserTransitionStatement: ParserStatement {
public init() {}
public func evaluate(execution: ParserExecution) -> ParserExecution {
return execution
}
}
public struct ExpressionStatement: ParserStatement {
public init() {}
public func evaluate(execution: ParserExecution) -> ParserExecution {
return execution
}
}
public struct ParserState: Equatable, Sendable {
public private(set) var state_name: String
public private(set) var statements: [ParserStatement]
public private(set) var transition: ParserTransitionStatement?
public static func == (lhs: ParserState, rhs: ParserState) -> Bool {
return lhs.state_name == rhs.state_name
}
/// Construct a ParserState
public init(name: String, withStatements statements: [ParserStatement]?, withTransition transitionStatement: ParserTransitionStatement) {
state_name = name
transition = transitionStatement
self.statements = statements ?? Array()
}
func evaluate(execution: ParserExecution) -> ParserExecution {
var currentExecution = execution
for statement in statements {
currentExecution = statement.evaluate(execution: currentExecution)
}
return if let transition = transition {
execution.transition(toNextState: accept)
} else {
execution.transition(toNextState: reject)
}
}
/// (private) constructor (no transition)
///
/// accept and reject are the only final states and they are constructed internally.
init(name: String) {
state_name = name
transition = .none
statements = Array()
}
}
public struct ParserStates: Sendable {
public var states: [ParserState] = Array()
}
public let accept: ParserState = ParserState(name: "accept")
public let reject: ParserState = ParserState(name: "reject")
public struct Parser {
public var states: [ParserState] = Array()
public var count: Int {
states.count
}
public init() {}
public func findStartState() -> Optional<ParserState> {
for state in states {
if state.state_name == "start" {
return state
}
}
return .none
}
}
+4
View File
@@ -0,0 +1,4 @@
public struct Program {
public var parsers: [P4.Parser] = Array()
public init() { }
}
+40
View File
@@ -0,0 +1,40 @@
public struct Error {
public private(set) var msg: String
public init(withMessage msg: String) {
self.msg = msg
}
}
public enum Result: Equatable {
case Ok
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 struct ParserRuntime {
public init() {}
public func run(program: P4.Parser, input: P4.Packet) -> Result {
// First, find the start state.
guard var start_state = program.findStartState() else {
return Result.Error(Error(withMessage: "Could not find the start state"))
}
var execution = P4.ParserExecution(start_state)
while execution.state != P4.accept && execution.state != P4.reject {
execution = execution.state.evaluate(execution: execution)
}
return Result.Ok
}
}
+14
View File
@@ -0,0 +1,14 @@
// The Swift Programming Language
// https://docs.swift.org/swift-book
public enum ValueType {
case Boolean(Bool)
}
public struct Value {
public var value_type: ValueType
}
public class Packet {
public init() {}
}
View File
+187
View File
@@ -0,0 +1,187 @@
// The Swift Programming Language
// https://docs.swift.org/swift-book
import P4
import SwiftTreeSitter
import TreeSitterP4
extension MutableTree {
public func isError(lang: Language) -> Bool {
// TODO: Make a function.
guard
let parser_error_query = try? SwiftTreeSitter.Query(
language: lang,
data: String(
"(ERROR)"
).data(using: String.Encoding.utf8)!)
else {
return false
}
let error_qr = parser_error_query.execute(in: self)
for _ in error_qr {
return true
}
return false
}
}
let p4lang = Language(tree_sitter_p4())
public protocol ParseableParserStatement {
static func Parse(node: Node, inTree tree: MutableTree) -> P4.ParserStatement?
}
extension P4.ExpressionStatement : ParseableParserStatement{
public static func Parse(node: Node, inTree tree: MutableTree) -> P4.ParserStatement? {
return P4.ExpressionStatement()
}
}
public struct Parser {
static func ParserStatements(capture: [QueryCapture], inTree tree: MutableTree) -> [P4.ParserStatement]? {
var statements: [P4.ParserStatement] = Array()
let statementParsers = [P4.ExpressionStatement.self]
for raw_statement in capture {
var parsed_statement: Optional<P4.ParserStatement> = .none
// Iterate through statement parsers and give each one a chance.
for parser in statementParsers {
if let parsed = parser.Parse(node: raw_statement.node, inTree: tree) {
parsed_statement = parsed
}
}
if let statement = parsed_statement {
statements.append(statement)
} else {
// There were no parseable statements.
return nil
}
}
return statements
}
static func ParserTransitionStatement(node: Node, inTree tree: MutableTree) -> P4
.ParserTransitionStatement?
{
return P4.ParserTransitionStatement()
}
static func ParserState(node: Node, inTree tree: MutableTree) -> P4.ParserState? {
guard
let parser_state_query = try? SwiftTreeSitter.Query(
language: p4lang,
data: String(
"(parserState (state) (identifier) @state-name (parserStatements)? @state-statements (parserTransitionStatement) @transition)"
).data(using: String.Encoding.utf8)!)
else {
return nil
}
let qr = parser_state_query.execute(node: node, in: tree)
// TODO: Assert that there is only one value here.
for parser_declaration in qr {
let transition_capture = parser_declaration.captures(
named: "transition")
let state_name_capture = parser_declaration.captures(named: "state-name")
let statements_capture = parser_declaration.captures(named: "state-statements")
guard !state_name_capture.isEmpty,
!transition_capture.isEmpty,
let parsed_state_name = state_name_capture[0].node.text,
let transition_statement = ParserTransitionStatement(
node: transition_capture[0].node, inTree: tree)
else {
return nil
}
let parsed_statements = if !statements_capture.isEmpty {
ParserStatements(capture: statements_capture, inTree: tree)
} else {
Optional<[P4.ParserStatement]>.none
}
// TODO: Validate that there is only one!
return P4.ParserState(name: parsed_state_name, withStatements: parsed_statements, withTransition: transition_statement)
}
return nil
}
static func Parser(node: Node, inTree tree: MutableTree) -> P4.Parser? {
guard
let parser_state_query = try? SwiftTreeSitter.Query(
language: p4lang,
data: String(
"(parserStates) @parser-states"
).data(using: String.Encoding.utf8)!)
else {
return nil
}
var parser = P4.Parser()
// Build a state from each one listed.
for parser_states in parser_state_query.execute(node: node, in: tree) {
if let state = ParserState(node: parser_states.nodes[0], inTree: tree) {
parser.states.append(state)
}
}
return parser
}
public static func Program(_ source: String) -> P4.Program? {
let p = SwiftTreeSitter.Parser.init()
do {
try p.setLanguage(p4lang)
} catch {
return nil
}
// Parse and check whether it is valid.
let result = p.parse(source)
guard let tree = result,
!tree.isError(lang: p4lang)
else {
return nil
}
// Query for the parser declarations.
guard
let parser_declaration_query = try? SwiftTreeSitter.Query(
language: p4lang,
data: String(
"(parserDeclaration (parserType) (parserStates) @parser-states)"
).data(using: String.Encoding.utf8)!)
else {
return nil
}
var program: P4.Program = P4.Program()
let parser_qc = parser_declaration_query.execute(in: tree)
for parser_declaration in parser_qc {
if let parser = Parser(
node: parser_declaration.nodes[0], inTree: tree)
{
program.parsers.append(parser)
}
}
return program
}
}
-25
View File
@@ -1,25 +0,0 @@
// The Swift Programming Language
// https://docs.swift.org/swift-book
import SwiftTreeSitter
import TreeSitterP4
func parse(_ source: String) -> Optional<MutableTree> {
let p4lang = Language(tree_sitter_p4())
let p = Parser.init()
do {
try p.setLanguage(p4lang)
} catch {
return .none
}
let result = p.parse(source)
guard let tree = result else {
return .none
}
return tree
}