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

Refactor Parsing -> Compiling

Browse Source 
Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
This commit is contained in:
Will Hawkins
2026-03-02 08:25:29 -05:00
parent cfe78a9b29
commit 6dba17c97a
21 changed files with 550 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/P4Runtime/Parser.swift
+1 -10
View File
@@ -41,10 +41,6 @@ public struct ParserStateDirectTransition: ParserStateInstance {
var program = program.exit_scope()
program = program.enter_scope()
for local_element in currrent_state.local_elements {
program = local_element.evaluate(execution: program)
}
for statement in currrent_state.statements {
program = statement.evaluate(execution: program)
}
@@ -88,12 +84,7 @@ public struct ParserStateSelectTransition: ParserStateInstance {
var program = program.exit_scope()
program = program.enter_scope()
// First, evaluate the local elements.
for local_element in currrent_state.local_elements {
program = local_element.evaluate(execution: program)
}
// Then, evaluate the statements.
// First, evaluate the statements.
for statement in currrent_state.statements {
program = statement.evaluate(execution: program)
}
Sources/P4Runtime/Program.swift
+3 -3
View File
@@ -41,13 +41,13 @@ extension VariableDeclarationStatement: EvaluatableStatement {
extension ConditionalStatement: EvaluatableStatement {
public func evaluate(execution: ProgramExecution) -> ProgramExecution {
guard case .Ok(let initial_value) = self.condition.evaluate(execution: execution) else {
guard case .Ok(let evaluated_condition) = self.condition.evaluate(execution: execution) else {
return execution.setError(error: Error(withMessage: "Could not evaluate \(self.condition)"))
}
if !initial_value.type().eq(rhs: P4Boolean.create()) {
if !evaluated_condition.type().eq(rhs: P4Boolean.create()) {
return execution.setError(error: Error(withMessage: "Condition expression is not a Boolean"))
}
if initial_value.eq(rhs: P4BooleanValue.init(withValue: true)) {
if evaluated_condition.eq(rhs: P4BooleanValue.init(withValue: true)) {
let execution = execution.enter_scope()
var result = self.thenn.evaluate(execution: execution)
result = result.exit_scope()