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

Refactor Names of Scope Types

Browse Source 
Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
This commit is contained in:
Will Hawkins
2026-03-20 04:23:53 -04:00
parent 6a9a138afe
commit f0d816b99f
12 changed files with 144 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Common/Compiler.swift
+12 -2
View File
@@ -15,5 +15,15 @@
// 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 typealias TypeScope = Scope<P4Type>
public typealias TypeScopes = Scopes<P4Type>
/// A scope that resolves variable identifiers to their types.
public typealias VarTypeScope = Scope<P4Type>
/// Scopes that resolve variable identifiers to their types.
public typealias VarTypeScopes = Scopes<P4Type>
/// A scope that resolves type identifiers to their types.
public typealias TypeTypeScope = Scope<P4Type>
/// Scopes that resolve type identifiers to their types.
public typealias TypeTypeScopes = Scopes<P4Type>
Sources/Common/Execution.swift
+9 -6
View File
@@ -16,8 +16,8 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
open class ProgramExecution: CustomStringConvertible {
public var scopes: ValueScopes = ValueScopes()
let initialValues: ValueScopes?
public var scopes: VarValueScopes = VarValueScopes()
let initialValues: VarValueScopes?
var error: Error?
var debug: DebugLevel = DebugLevel.Error
@@ -25,7 +25,7 @@ open class ProgramExecution: CustomStringConvertible {
initialValues = .none
}
public init(withGlobalValues values: ValueScopes) {
public init(withGlobalValues values: VarValueScopes) {
initialValues = values
}
@@ -88,10 +88,13 @@ open class ProgramExecution: CustomStringConvertible {
return new_pe
}
public func initial_values() -> ValueScopes? {
public func initial_values() -> VarValueScopes? {
return self.initialValues
}
}
public typealias ValueScope = Scope<P4Value>
public typealias ValueScopes = Scopes<P4Value>
/// A scope that resolves variable identifiers to their values.
public typealias VarValueScope = Scope<P4Value>
/// Scopes that resolves variable identifiers to their values.
public typealias VarValueScopes = Scopes<P4Value>
Sources/P4Compiler/Compiler.swift
+9 -9
View File
@@ -42,15 +42,15 @@ public func ErrorOnNode(node: Node, withError error: String) -> Error {
/// Context for compilation.
public struct CompilerContext {
let names: LexicalScopes
let types: LexicalScopes
let names: VarTypeScopes
let types: TypeTypeScopes
public init(withNames _names: LexicalScopes) {
public init(withNames _names: VarTypeScopes) {
names = _names
types = LexicalScopes()
types = TypeTypeScopes()
}
public init(withNames _names: LexicalScopes, withTypes _types: LexicalScopes) {
public init(withNames _names: VarTypeScopes, withTypes _types: TypeTypeScopes) {
names = _names
types = _types
}
@@ -59,9 +59,9 @@ public struct CompilerContext {
///
/// Create a new compiler context based on the current with the same types and new names.
///
/// - Parameter names: a ``LexicalScopes`` with the updated names for the newly created compiler context.
/// - Parameter names: a ``TypeScopes`` with the updated names for the newly created compiler context.
/// - Returns: A new compiler context based on the current with the same types and new names.
public func update(newNames names: LexicalScopes) -> CompilerContext {
public func update(newNames names: VarTypeScopes) -> CompilerContext {
return CompilerContext(withNames: names, withTypes: self.types)
}
@@ -69,9 +69,9 @@ public struct CompilerContext {
///
/// Create a new compiler context based on the current with the same names and new types.
///
/// - Parameter types: a ``LexicalScopes`` with the updated types for the newly created compiler context.
/// - Parameter types: a ``TypeScopes`` with the updated types for the newly created compiler context.
/// - Returns: A new compiler context based on the current with the same names and new types.
public func update(newTypes types: LexicalScopes) -> CompilerContext {
public func update(newTypes types: TypeTypeScopes) -> CompilerContext {
return CompilerContext(withNames: self.names, withTypes: types)
}
Sources/P4Compiler/LexicalScopes.swift
-21
View File
@@ -1,21 +0,0 @@
// 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/>.
import Common
public typealias LexicalScope = Scope<P4Type>
public typealias LexicalScopes = Scopes<P4Type>
Sources/P4Compiler/Program.swift
+13 -4
View File
@@ -24,11 +24,15 @@ import TreeSitterP4
public struct Program {
public static func Compile(_ source: String) -> Result<P4Lang.Program> {
return Program.Compile(source, withGlobalTypes: .none)
return Program.Compile(source, withGlobalInstances: .none, withGlobalTypes: .none)
}
public static func Compile(_ source: String, withGlobalInstances globalInstances: VarTypeScopes) -> Result<P4Lang.Program> {
return Program.Compile(source, withGlobalInstances: globalInstances, withGlobalTypes: .none)
}
public static func Compile(
_ source: String, withGlobalTypes globalTypes: LexicalScopes?
_ source: String, withGlobalInstances globalInstances: VarTypeScopes?, withGlobalTypes globalTypes: TypeTypeScopes?
) -> Result<P4Lang.Program> {
let maybe_parser = ConfigureP4Parser()
@@ -47,13 +51,18 @@ public struct Program {
var program = P4Lang.Program()
// Set up a context for parsing.
var compilation_context = CompilerContext(withNames: LexicalScopes().enter())
var compilation_context = CompilerContext(withNames: VarTypeScopes().enter())
var errors: [Error] = Array()
// If the caller gave any global instances, add them here.
if let globalInstances = globalInstances {
compilation_context = compilation_context.update(newNames: globalInstances)
}
// If the caller gave any global types, add them here.
if let globalTypes = globalTypes {
compilation_context = compilation_context.update(newNames: globalTypes)
compilation_context = compilation_context.update(newTypes: globalTypes)
}
result?.rootNode?.enumerateNamedChildren { declaration_node in
Sources/P4Runtime/Expressions.swift
+9 -39
View File
@@ -52,36 +52,6 @@ extension SelectExpression: EvaluatableExpression {
}
}
extension P4StringValue: EvaluatableExpression {
public func evaluate(execution: Common.ProgramExecution) -> Common.Result<any Common.P4Value> {
return .Ok(self)
}
}
extension P4BooleanValue: EvaluatableExpression {
public func evaluate(execution: Common.ProgramExecution) -> Common.Result<any Common.P4Value> {
return .Ok(self)
}
}
extension P4StructValue: EvaluatableExpression {
public func evaluate(execution: Common.ProgramExecution) -> Common.Result<any Common.P4Value> {
return .Ok(self)
}
}
extension P4IntValue: EvaluatableExpression {
public func evaluate(execution: Common.ProgramExecution) -> Common.Result<any Common.P4Value> {
return .Ok(self)
}
}
extension P4ArrayValue: EvaluatableExpression {
public func evaluate(execution: Common.ProgramExecution) -> Common.Result<any Common.P4Value> {
return .Ok(self)
}
}
// Variables are evaluatable because they can be looked up by identifiers.
extension TypedIdentifier: EvaluatableExpression {
public func type() -> any Common.P4Type {
@@ -96,8 +66,8 @@ extension TypedIdentifier: EvaluatableExpression {
// Variables are evaluatable because they can be looked up by identifiers.
extension TypedIdentifier: EvaluatableLValueExpression {
public func set(
to: any Common.P4Value, inScopes scopes: Common.ValueScopes, duringExecution execution: ProgramExecution
) -> Common.Result<(Common.ValueScopes, P4Value)> {
to: any Common.P4Value, inScopes scopes: Common.VarValueScopes, duringExecution execution: ProgramExecution
) -> Common.Result<(Common.VarValueScopes, P4Value)> {
if case .Error(let e) = scopes.lookup(identifier: self) {
return .Error(e)
}
@@ -105,7 +75,7 @@ extension TypedIdentifier: EvaluatableLValueExpression {
return .Ok((scopes.set(identifier: self, withValue: to), to))
}
public func check(to: any Common.EvaluatableExpression, inScopes scopes: Common.TypeScopes) -> Result<()> {
public func check(to: any Common.EvaluatableExpression, inScopes scopes: Common.VarTypeScopes) -> Result<()> {
guard case .Ok(let type) = scopes.lookup(identifier: self) else {
return .Error(Error(withMessage: "Cannot assign to identifier not in scope"))
}
@@ -175,8 +145,8 @@ extension ArrayAccessExpression: EvaluatableExpression {
extension ArrayAccessExpression: EvaluatableLValueExpression {
public func set(
to: any Common.P4Value, inScopes scopes: Common.ValueScopes, duringExecution execution: ProgramExecution
) -> Common.Result<(Common.ValueScopes, P4Value)> {
to: any Common.P4Value, inScopes scopes: Common.VarValueScopes, duringExecution execution: ProgramExecution
) -> Common.Result<(Common.VarValueScopes, P4Value)> {
// For purposes of documentation, assume the field access expression we are evaluating is
// (strct_id)[indexor] = new_value
// where strct_id expands to
@@ -213,7 +183,7 @@ extension ArrayAccessExpression: EvaluatableLValueExpression {
}
public func check(
to: any Common.EvaluatableExpression, inScopes scopes: Common.TypeScopes
to: any Common.EvaluatableExpression, inScopes scopes: Common.VarTypeScopes
) -> Common.Result<()> {
if !self.type.value_type().eq(rhs: to.type()) {
@@ -249,8 +219,8 @@ extension FieldAccessExpression: EvaluatableExpression {
extension FieldAccessExpression: EvaluatableLValueExpression {
public func set(
to: any Common.P4Value, inScopes scopes: Common.ValueScopes, duringExecution execution: ProgramExecution
) -> Common.Result<(Common.ValueScopes, P4Value)> {
to: any Common.P4Value, inScopes scopes: Common.VarValueScopes, duringExecution execution: ProgramExecution
) -> Common.Result<(Common.VarValueScopes, P4Value)> {
// For purposes of documentation, assume the field access expression we are evaluating is
// (strct_id).field_id = new_field_value
// where strct_id expands to
@@ -282,7 +252,7 @@ extension FieldAccessExpression: EvaluatableLValueExpression {
}
public func check(
to: any Common.EvaluatableExpression, inScopes scopes: Common.TypeScopes
to: any Common.EvaluatableExpression, inScopes scopes: Common.VarTypeScopes
) -> Common.Result<()> {
if !self.field.type.eq(rhs:to.type()) {
Sources/P4Runtime/Runtime.swift
+3 -3
View File
@@ -22,14 +22,14 @@ import P4Lang
public struct ParserRuntime: CustomStringConvertible {
public var parser: Parser
let initialValues: ValueScopes?
let initialValues: VarValueScopes?
init(parser: Parser) {
self.parser = parser
self.initialValues = .none
}
init(parser: Parser, withInitialValues initial: ValueScopes?) {
init(parser: Parser, withInitialValues initial: VarValueScopes?) {
self.parser = parser
self.initialValues = initial
}
@@ -40,7 +40,7 @@ public struct ParserRuntime: CustomStringConvertible {
}
public static func create(
program: P4Lang.Program, withInitialValues initial: ValueScopes?
program: P4Lang.Program, withInitialValues initial: VarValueScopes?
) -> Result<ParserRuntime> {
return switch program.starting_parser() {
case .Ok(let parser):