Skip to content

Commit 02358bf

Browse files
authored
Syntax message gives full line in "sntufn" tag (#137)
1 parent bc5fa6c commit 02358bf

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

mathics_scanner/escape_sequences.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def parse_named_character(source_text: str, start: int, finish: int) -> Optional
6363
if named_character.isalpha():
6464
char = named_characters.get(named_character)
6565
if char is None:
66-
raise NamedCharacterSyntaxError("sntufn", named_character)
66+
raise NamedCharacterSyntaxError("sntufn", named_character, source_text)
6767
else:
6868
return char
6969

mathics_scanner/feed.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,12 @@ def syntax_message(self, symbol_name: str, tag: str, *args) -> List[str]:
107107
else:
108108
message.append('""')
109109
message.append(str(self.lineno))
110-
message.append(f'"{self.container}"')
110+
if self.container:
111+
message.append(f'"{self.container}"')
112+
elif len(args) == 2:
113+
message.append(f'"{(args[1].rstrip())}"')
114+
else:
115+
message.append("")
111116
assert len(message) == 7
112117
return message
113118

mathics_scanner/mathics3_tokens.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def interactive_eval_loop(shell: TerminalShell, code_tokenize_format: bool):
176176
shell.errmsg(
177177
"Syntax",
178178
"sntufn",
179-
"Unknown unicode longname",
179+
"Unknown escape sequence",
180180
)
181181
# This has to come after NamedCharacterSyntaxError and
182182
# EscapeSyntaxError since those are subclasses of

0 commit comments

Comments
 (0)