summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Brunet <charles.brunet@optelgroup.com>2025-05-01 14:41:43 -0400
committerEli Schwartz <eschwartz93@gmail.com>2025-05-05 18:42:55 -0400
commit2d22385aa40c63927d947e3c1eadc0a6e0278d46 (patch)
tree8f1ab04b652c7498795744e150f7b71f74f73231
parent6d0b01638650616e5ef7451277590fd0e69e6bb7 (diff)
downloadmeson-2d22385aa40c63927d947e3c1eadc0a6e0278d46.tar.gz
more explicit error message for unrecognized lexer token
Fixes #14415
-rw-r--r--mesonbuild/mparser.py2
-rw-r--r--test cases/failing/95 invalid option file/test.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py
index f1c60712c..d0b32e25a 100644
--- a/mesonbuild/mparser.py
+++ b/mesonbuild/mparser.py
@@ -221,7 +221,7 @@ class Lexer:
yield Token(tid, filename, curline_start, curline, col, bytespan, value)
break
if not matched:
- raise ParseException('lexer', self.getline(line_start), lineno, col)
+ raise ParseException(f'lexer: unrecognized token {self.code[loc]!r}', self.getline(line_start), lineno, col)
@dataclass
class BaseNode:
diff --git a/test cases/failing/95 invalid option file/test.json b/test cases/failing/95 invalid option file/test.json
index 073ac6717..debb4a144 100644
--- a/test cases/failing/95 invalid option file/test.json
+++ b/test cases/failing/95 invalid option file/test.json
@@ -1,7 +1,7 @@
{
"stdout": [
{
- "line": "test cases/failing/95 invalid option file/meson_options.txt:1:0: ERROR: lexer"
+ "line": "test cases/failing/95 invalid option file/meson_options.txt:1:0: ERROR: lexer: unrecognized token \"'\""
}
]
}