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

Fix Bug In Struct Field Initialization

Browse Source 
Fields were not given default values when a struct was declared
without initializers.

Also, cleanup code in the helper function for binary operations
on struct instances.

Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
This commit is contained in:
Will Hawkins
2026-03-27 03:50:54 -04:00
parent cd26d1d22c
commit 4d787394cd
7 changed files with 133 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/P4Compiler/Expression.swift
+11 -11
View File
@@ -255,33 +255,33 @@ extension SelectExpression: CompilableExpression {
))
}
var kses: [SelectCaseExpression] = Array()
var kses_errors: [Error] = Array()
var sces: [SelectCaseExpression] = Array()
var sces_errors: [Error] = Array()
select_body_node.enumerateNamedChildren { current_node in
let maybe_parsed_kse = SelectCaseExpression.compile(
let maybe_parsed_cse = SelectCaseExpression.compile(
node: current_node, withContext: context)
if case .Ok(let parsed_kse) = maybe_parsed_kse {
let parsed_cse = parsed_kse as! SelectCaseExpression
if case .Ok(let parsed_cse) = maybe_parsed_cse {
let parsed_cse = parsed_cse as! SelectCaseExpression
switch parsed_cse.update_type(to: selector.type()) {
case .Ok(let updated_cse): kses.append(updated_cse)
case .Error(let e): kses_errors.append(ErrorOnNode(node: current_node, withError: e.msg))
case .Ok(let updated_cse): sces.append(updated_cse)
case .Error(let e): sces_errors.append(ErrorOnNode(node: current_node, withError: e.msg))
}
} else {
kses_errors.append(Error(withMessage: "\(maybe_parsed_kse.error()!)"))
sces_errors.append(Error(withMessage: "\(maybe_parsed_cse.error()!)"))
}
}
if !kses_errors.isEmpty {
if !sces_errors.isEmpty {
return .Error(
Error(
withMessage: "Error(s) parsing select cases: "
+ (kses_errors.map { error in
+ (sces_errors.map { error in
return "\(error.msg)"
}.joined(separator: ";"))))
}
return .Ok(
SelectExpression(withSelector: selector, withSelectCaseExpressions: kses),
SelectExpression(withSelector: selector, withSelectCaseExpressions: sces),
)
}
}