From 25905f5d0a2a7883bd33491997556193582c6059 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Fri, 1 Mar 2024 17:02:06 +0100 Subject: compiler: support using int flags in field conditions Commit ed571339c6ff ("pkg/compiler: support if[expr] attributes") added support for conditional fields in structs and unions. Conditions however cannot refer to flags, as in the following example: struct { f0 flags[some_flags, int32] f1 int32 (if[value[f0] & FLAG1]) } [packed] It will fail to compile with: flags does not refer to an integer This commit adds support for that syntax. Signed-off-by: Paul Chaignon --- pkg/compiler/check.go | 4 ++-- pkg/compiler/testdata/errors2.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/compiler') diff --git a/pkg/compiler/check.go b/pkg/compiler/check.go index 3f340a660..103b69eb5 100644 --- a/pkg/compiler/check.go +++ b/pkg/compiler/check.go @@ -650,8 +650,8 @@ func (comp *compiler) checkPathField(target, t *ast.Type, field *ast.Field) bool func (comp *compiler) checkExprLastField(target *ast.Type, field *ast.Field) { _, desc := comp.derefPointers(field.Type) - if desc != typeInt { - comp.error(target.Pos, "%v does not refer to an integer", field.Name.Name) + if desc != typeInt && desc != typeFlags { + comp.error(target.Pos, "%v does not refer to an integer or a flag", field.Name.Name) } } diff --git a/pkg/compiler/testdata/errors2.txt b/pkg/compiler/testdata/errors2.txt index 0f10ea278..ffb2e5bc5 100644 --- a/pkg/compiler/testdata/errors2.txt +++ b/pkg/compiler/testdata/errors2.txt @@ -470,11 +470,11 @@ conditional_fields { f3 some_nested_flags f4 int32 (if[value[f3:f1] != 0]) f5 int32 (if[value[f3:f2:f4] != 0]) ### value path f2 does not refer to a struct - f6 int32 (if[value[f3:f4] != 0]) ### f4 does not refer to an integer + f6 int32 (if[value[f3:f4] != 0]) ### f4 does not refer to an integer or a flag f7 int32 (if[value[f3:some_field] != 0]) ### value target some_field does not exist in some_nested_flags f8 int32 (if[value[f3:f5] != 0]) ### f5 has conditions, so value path cannot reference it f9 int32 (if[value[parent:a] != 0]) ### value target a does not exist in conditional_fields - f10 int32 (if[value[f3:f6] != 0]) ### f6 does not refer to an integer + f10 int32 (if[value[f3:f6] != 0]) ### f6 does not refer to an integer or a flag f11 len[f2, int32] ### f2 has conditions, so len path cannot reference it f12 union_cond_fields f13 int32:8 (if[1]) ### bitfields may not have conditions -- cgit mrf-deployment