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

Refactor Parser States

Browse Source 
Refactor the class hierarchy for parser states so that
there is a parser state that acts more like a type and
one that acts more like a value (the latter, then, serves
as the base class for the other instantiated parser states).

Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
This commit is contained in:
Will Hawkins
2026-03-30 05:16:48 -04:00
parent fda9858680
commit 7c9ecc2438
21 changed files with 199 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/P4Runtime/Parser.swift
+4 -4
View File
@@ -118,11 +118,11 @@ extension ParserStateSelectTransition: EvaluatableParserState {
}
extension Parser: ParserExecution {
public func execute(execution: ProgramExecution) -> (ParserState, ProgramExecution) {
public func execute(execution: ProgramExecution) -> (InstantiatedParserState, ProgramExecution) {
var execution = execution.enter_scope()
execution = execution.declare(identifier: accept.state().state, withValue: accept)
execution = execution.declare(identifier: reject.state().state, withValue: reject)
execution = execution.declare(identifier: AsInstantiatedParserState(accept.state()).state, withValue: accept)
execution = execution.declare(identifier: AsInstantiatedParserState(reject.state()).state, withValue: reject)
// Add initial values to the global scope
if let initial = execution.initial_values() {
@@ -148,6 +148,6 @@ extension Parser: ParserExecution {
while !current_state.done() && !execution.hasError() {
(current_state, execution) = current_state.execute(program: execution)
}
return (current_state.state(), execution)
return (AsInstantiatedParserState(current_state.state()), execution)
}
}