From f1feb4845f50588ecf4db5282a3e85365b77bed7 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 11 Nov 2026 20:14:03 +0900 Subject: internal/rosa/azalea: include position in token error Position information was not fully populated when this was first implemented. The lack of any position information keeps the user guessing. This change includes position information in the error and formats it as part of the error message. Signed-off-by: Ophestra --- internal/rosa/azalea/azalea.go | 24 ++++++++++++++-------- internal/rosa/azalea/azalea_test.go | 40 +++++++++++++++++++++++++++++++++---- 2 files changed, 52 insertions(+), 12 deletions(-) diff --git a/internal/rosa/azalea/azalea.go b/internal/rosa/azalea/azalea.go index d97b6f7d..d6100b1b 100644 --- a/internal/rosa/azalea/azalea.go +++ b/internal/rosa/azalea/azalea.go @@ -30,11 +30,14 @@ var idents = [...]bool{ } // TokenError describes an unexpected token. -type TokenError [2]rune +type TokenError struct { + Data [2]rune + Pos scanner.Position +} func (e TokenError) Error() string { - return "expected " + scanner.TokenString(e[0]) + - ", found " + scanner.TokenString(e[1]) + return e.Pos.String() + ": expected " + scanner.TokenString(e.Data[0]) + + ", found " + scanner.TokenString(e.Data[1]) } // ExprError is an unexpected token encountered while parsing an expression. @@ -61,10 +64,15 @@ type parser struct { // scan advances the underlying scanner to the next token, storing its result. func (p *parser) scan() rune { p.tok = p.s.Scan(); return p.tok } +// panicToken panics with a [TokenError]. +func (p *parser) panicToken(expects rune) { + panic(TokenError{[2]rune{expects, p.tok}, p.s.Pos()}) +} + // expects panics with [TokenError] for an unexpected tok. func (p *parser) expects(expects rune) { if p.tok != expects { - panic(TokenError{expects, p.tok}) + p.panicToken(expects) } } @@ -272,7 +280,7 @@ func (p *parser) parseExpr() (any, scanner.Position) { break default: - panic(TokenError{scanner.Ident, p.tok}) + p.panicToken(scanner.Ident) } arg := Arg{K: []Ident{Ident(p.s.TokenText())}} @@ -290,7 +298,7 @@ func (p *parser) parseExpr() (any, scanner.Position) { case scanner.Ident: if delim { - panic(TokenError{',', p.tok}) + p.panicToken(',') } delim = true arg.K = append(arg.K, Ident(p.s.TokenText())) @@ -308,7 +316,7 @@ func (p *parser) parseExpr() (any, scanner.Position) { p.scanAs('=') default: - panic(TokenError{'=', p.tok}) + p.panicToken('=') } p.scan() arg.V = p.parseVal() @@ -370,7 +378,7 @@ func (p *parser) parseExpr() (any, scanner.Position) { panic(ExprError(scanner.EOF)) default: if delim { - panic(TokenError{',', p.tok}) + p.panicToken(',') } delim = true break diff --git a/internal/rosa/azalea/azalea_test.go b/internal/rosa/azalea/azalea_test.go index 7cae6de5..07f1629b 100644 --- a/internal/rosa/azalea/azalea_test.go +++ b/internal/rosa/azalea/azalea_test.go @@ -23,10 +23,34 @@ func TestParse(t *testing.T) { err error }{ {"invalid", "}", nil, ExprError('}')}, - {"bad sep", "f{v?}", nil, TokenError{'=', '?'}}, - {"bad ident", "f{9}", nil, TokenError{scanner.Ident, scanner.Int}}, + {"bad sep", "f{v?}", nil, TokenError{ + Data: [2]rune{'=', '?'}, + Pos: scanner.Position{ + Filename: "bad_sep.az", + Offset: 4, + Line: 1, + Column: 5, + }, + }}, + {"bad ident", "f{9}", nil, TokenError{ + Data: [2]rune{scanner.Ident, scanner.Int}, + Pos: scanner.Position{ + Filename: "bad_ident.az", + Offset: 3, + Line: 1, + Column: 4, + }, + }}, {"share bad sep", "f { v,,v = v; }", nil, ExprError(',')}, - {"share missing sep", "f { v v }", nil, TokenError{',', scanner.Ident}}, + {"share missing sep", "f { v v }", nil, TokenError{ + Data: [2]rune{',', scanner.Ident}, + Pos: scanner.Position{ + Filename: "share_missing_sep.az", + Offset: 7, + Line: 1, + Column: 8, + }, + }}, {"ident", `v`, []any{Ident("v")}, nil}, {"concat", `f { v = v+"\xfd"+p{}+9; }`, []any{Func{ @@ -75,7 +99,15 @@ func TestParse(t *testing.T) { Array{{String("\x00")}}, }, nil}, {"missing array value", `[ "\x00", , v ]`, nil, ExprError(',')}, - {"missing array delimiter", `[ v0 v1 ]`, nil, TokenError{',', scanner.Ident}}, + {"missing array delimiter", `[ v0 v1 ]`, nil, TokenError{ + Data: [2]rune{',', scanner.Ident}, + Pos: scanner.Position{ + Filename: "missing_array_delimiter.az", + Offset: 7, + Line: 1, + Column: 8, + }, + }}, {"truncated array", `[ "\x00"`, nil, ExprError(scanner.EOF)}, -- cgit v1.3.1