Minor fixes to lexer and Makefile

lysnikolaou · lysnikolaou · commit a78c082900cb · 2025-04-21T19:56:27.000+02:00
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -2638,6 +2638,7 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/test_peg_generator \
 		test/test_pydoc \
 		test/test_pyrepl \
+		test/test_string \
 		test/test_sqlite3 \
 		test/test_tkinter \
 		test/test_tomllib \
diff --git a/Parser/lexer/lexer.c b/Parser/lexer/lexer.c
@@ -1016,7 +1016,7 @@ tok_get_normal_mode(struct tok_state *tok, tokenizer_mode* current_tok, struct t
                 Py_UNREACHABLE();
         }
 
-        the_current_tok->string_kind = TSTRING;
+        the_current_tok->string_kind = string_kind;
         the_current_tok->curly_bracket_depth = 0;
         the_current_tok->curly_bracket_expr_start_depth = -1;
         return string_kind == TSTRING ? MAKE_TOKEN(TSTRING_START) : MAKE_TOKEN(FSTRING_START);

Original file line number	Diff line number	Diff line change
`@@ -1016,7 +1016,7 @@ tok_get_normal_mode(struct tok_state tok, tokenizer_mode current_tok, struct t`
`1016`	`1016`	`Py_UNREACHABLE();`
`1017`	`1017`	`}`
`1018`	`1018`
`1019`		`- the_current_tok->string_kind = TSTRING;`
	`1019`	`+ the_current_tok->string_kind = string_kind;`
`1020`	`1020`	`the_current_tok->curly_bracket_depth = 0;`
`1021`	`1021`	`the_current_tok->curly_bracket_expr_start_depth = -1;`
`1022`	`1022`	`return string_kind == TSTRING ? MAKE_TOKEN(TSTRING_START) : MAKE_TOKEN(FSTRING_START);`