core/odin: support field tags on bit_field fields

Fixes #4044
This commit is contained in:
Laytan Laats
2024-08-11 20:59:54 +02:00
parent 26fa3aca44
commit f0840ed24e
3 changed files with 25 additions and 3 deletions

View File

@@ -861,6 +861,7 @@ Bit_Field_Field :: struct {
name: ^Expr,
type: ^Expr,
bit_size: ^Expr,
tag: tokenizer.Token,
comments: ^Comment_Group,
}

View File

@@ -2832,11 +2832,17 @@ parse_operand :: proc(p: ^Parser, lhs: bool) -> ^ast.Expr {
expect_token(p, .Or)
bit_size := parse_expr(p, true)
tag: tokenizer.Token
if p.curr_tok.kind == .String {
tag = expect_token(p, .String)
}
field := ast.new(ast.Bit_Field_Field, name.pos, bit_size)
field.name = name
field.type = type
field.bit_size = bit_size
field.tag = tag
append(&fields, field)

View File

@@ -1,8 +1,12 @@
package test_core_odin_parser
import "base:runtime"
import "core:fmt"
import "core:log"
import "core:odin/ast"
import "core:odin/parser"
import "base:runtime"
import "core:odin/tokenizer"
import "core:testing"
@test
@@ -34,7 +38,7 @@ Foo :: bit_field uint {}
Foo :: bit_field uint {hello: bool | 1}
Foo :: bit_field uint {
hello: bool | 1,
hello: bool | 1 ` + "`fmt:\"-\"`" + `,
hello: bool | 5,
}
@@ -48,6 +52,17 @@ Foo :: bit_field uint {
}
p := parser.default_parser()
p.err = proc(pos: tokenizer.Pos, format: string, args: ..any) {
message := fmt.tprintf(format, ..args)
log.errorf("%s(%d:%d): %s", pos.file, pos.line, pos.column, message)
}
p.warn = proc(pos: tokenizer.Pos, format: string, args: ..any) {
message := fmt.tprintf(format, ..args)
log.warnf("%s(%d:%d): %s", pos.file, pos.line, pos.column, message)
}
ok := parser.parse_file(&p, &file)
testing.expect(t, ok, "bad parse")
}
}