Parser refers to "symbol"s, "label"s, and "local label"s, not "identifier"s (#1652)

This better matches how the lexed tokens are discussed in rgbasm(5)
This commit is contained in:
Rangi
2025-02-06 18:01:33 +01:00
committed by GitHub
parent d9d381cb62
commit 4c916b8da8
8 changed files with 74 additions and 94 deletions

View File

@@ -5,7 +5,7 @@ error: anon-label-bad.asm(6):
error: anon-label-bad.asm(9):
syntax error, unexpected anonymous label
error: anon-label-bad.asm(10):
syntax error, unexpected anonymous label, expecting label or identifier or local identifier
syntax error, unexpected anonymous label, expecting symbol or label or local label
error: anon-label-bad.asm(22):
syntax error, unexpected ::
error: Assembly aborted (5 errors)!

View File

@@ -1,7 +1,7 @@
error: def-scoped.asm(10):
syntax error, unexpected local identifier, expecting identifier
syntax error, unexpected local label, expecting symbol
error: def-scoped.asm(13):
syntax error, unexpected local identifier, expecting identifier
syntax error, unexpected local label, expecting symbol
error: def-scoped.asm(16):
syntax error, unexpected local identifier, expecting identifier
syntax error, unexpected local label, expecting symbol
error: Assembly aborted (3 errors)!

View File

@@ -1,5 +1,5 @@
error: error-recovery.asm(3):
syntax error, unexpected number
error: error-recovery.asm(5) -> error-recovery.asm::REPT~1(7):
syntax error, unexpected identifier
syntax error, unexpected symbol
error: Assembly aborted (2 errors)!

View File

@@ -1,15 +1,15 @@
error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25):
syntax error, unexpected local identifier, expecting identifier
syntax error, unexpected local label, expecting symbol
while expanding symbol "VAR_DEF"
error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(26):
syntax error, unexpected local identifier, expecting identifier
syntax error, unexpected local label, expecting symbol
error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(29):
Interpolated symbol "sizeof_.something" does not exist
error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25):
syntax error, unexpected label, expecting identifier
syntax error, unexpected label, expecting symbol
while expanding symbol "VAR_DEF"
error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26):
syntax error, unexpected label, expecting identifier
syntax error, unexpected label, expecting symbol
error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):
Invalid format spec 'sizeof_'
error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29):

View File

@@ -9,9 +9,9 @@ error: null-outside-string.asm(4):
error: null-outside-string.asm(6):
Begun line continuation, but encountered character 'X'
error: null-outside-string.asm(6):
syntax error, unexpected identifier
syntax error, unexpected symbol
error: null-outside-string.asm(7):
Begun line continuation, but encountered character 'X'
error: null-outside-string.asm(7):
syntax error, unexpected identifier
syntax error, unexpected symbol
error: Assembly aborted (8 errors)!

View File

@@ -1,5 +1,5 @@
error: syntax-error-lexer-mode.asm(7):
syntax error, unexpected af
error: syntax-error-lexer-mode.asm(11):
syntax error, unexpected af, expecting identifier
syntax error, unexpected af, expecting symbol
error: Assembly aborted (2 errors)!