From 4b915a9f7882e271ed537fd37449e2fd46f07f05 Mon Sep 17 00:00:00 2001 From: Erez Shinan Date: Sat, 30 Mar 2019 23:18:28 +0300 Subject: [PATCH] Style improvements to errors --- lark/lexer.py | 2 +- lark/parsers/xearley.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lark/lexer.py b/lark/lexer.py index e6e9e9e..82a04e8 100644 --- a/lark/lexer.py +++ b/lark/lexer.py @@ -171,7 +171,7 @@ class _Lex: break else: - allowed = [v for m, tfi in lexer.mres for v in tfi.values()] + allowed = {v for m, tfi in lexer.mres for v in tfi.values()} raise UnexpectedCharacters(stream, line_ctr.char_pos, line_ctr.line, line_ctr.column, allowed=allowed, state=self.state) diff --git a/lark/parsers/xearley.py b/lark/parsers/xearley.py index 37ad3f9..4ab3ba9 100644 --- a/lark/parsers/xearley.py +++ b/lark/parsers/xearley.py @@ -111,7 +111,7 @@ class Parser(BaseParser): del delayed_matches[i+1] # No longer needed, so unburden memory if not next_set and not delayed_matches and not next_to_scan: - raise UnexpectedCharacters(stream, i, text_line, text_column, {item.expect for item in to_scan}, set(to_scan)) + raise UnexpectedCharacters(stream, i, text_line, text_column, {item.expect.name for item in to_scan}, set(to_scan)) return next_to_scan