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

compiler, language, runtime: Separate Parser Type From Instances
Continuous Integration / Grammar Tests (push) Successful in 4m2s
Details
Continuous Integration / Library Format Tests (push) Successful in 5m0s
Details
Continuous Integration / Library Tests (push) Successful in 8m1s
Details

Browse Source 
In P4, parsers are considered types. Those parsers are instantiated.
The instantiated parsers are values. Previously, gp4 treated a parser
type and a parser value as identical. This PR makes that difference
clear _and_ sets the stage for the future.

TODO: Make the same distinction between control and action types and
values.

Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
This commit is contained in:
Will Hawkins
2026-05-27 05:41:23 -04:00
parent 925f20a13b
commit 61d8f601e8
36 changed files with 1058 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/P4Runtime/Expressions.swift
+7 -7
View File
@@ -24,7 +24,7 @@ extension SelectCaseExpression: EvaluatableExpression {
}
public func type() -> P4QualifiedType {
return P4QualifiedType(ParserState())
return P4QualifiedType(AnyParserState)
}
}
@@ -50,7 +50,7 @@ extension SelectExpression: EvaluatableExpression {
}
public func type() -> P4QualifiedType {
return P4QualifiedType(ParserState())
return P4QualifiedType(AnyParserState)
}
}
@@ -79,18 +79,18 @@ extension TypedIdentifier: EvaluatableLValueExpression {
}
public func check(
to: any Common.EvaluatableExpression, inScopes scopes: Common.VarTypeScopes
to: any Common.EvaluatableExpression, inScopes scopes: Common.StaticVarValueScopes
) -> Result<()> {
guard case .Ok(let type) = scopes.lookup(identifier: self) else {
return .Error(Error(withMessage: "Cannot assign to identifier not in scope"))
}
return switch type.assignableFromType(to.type()) {
return switch type.0.assignableFromType(to.type()) {
case TypeCheckResults.IncompatibleTypes:
.Error(
Error(
withMessage:
"Cannot assign value with type \(to.type()) to identifier \(self) with type \(type)"))
"Cannot assign value with type \(to.type()) to identifier \(self) with type \(type.0)"))
case TypeCheckResults.ReadOnly:
.Error(
Error(
@@ -318,7 +318,7 @@ extension ArrayAccessExpression: EvaluatableLValueExpression {
}
public func check(
to: any Common.EvaluatableExpression, inScopes scopes: Common.VarTypeScopes
to: any Common.EvaluatableExpression, inScopes scopes: Common.StaticVarValueScopes
) -> Common.Result<()> {
return switch self.type.value_type().assignableFromType(to.type()) {
@@ -426,7 +426,7 @@ extension FieldAccessExpression: EvaluatableLValueExpression {
}
public func check(
to: any Common.EvaluatableExpression, inScopes scopes: Common.VarTypeScopes
to: any Common.EvaluatableExpression, inScopes scopes: Common.StaticVarValueScopes
) -> Common.Result<()> {
return switch self.field.type().assignableFromType(to.type()) {
case TypeCheckResults.IncompatibleTypes: