unify string type checks

Author: isidentical

Include/internal/pycore_token.h

@@ -90,6 +90,9 @@ extern "C" {
                                  (x) == NEWLINE   || \
                                  (x) == INDENT    || \
                                  (x) == DEDENT)
+#define ISSTRINGLIT(x)          ((x) == STRING           || \
+                                 (x) == FSTRING_MIDDLE   || \
+                                 (x) == FSTRING_END)
 
 
 // Symbols exported for test_peg_generator

Parser/tokenizer.c

@@ -1563,7 +1563,7 @@ token_setup(struct tok_state *tok, struct token *token, int type, const char *st
 {
     assert((start == NULL && end == NULL) || (start != NULL && end != NULL));
     token->level = tok->level;
-    if (type == STRING || type == FSTRING_MIDDLE || type == FSTRING_END) {
+    if (ISSTRINGLIT(type)) {
         token->lineno = tok->first_lineno;
     }
     else {

Python/Python-tokenize.c

@@ -86,8 +86,8 @@ tokenizeriter_next(tokenizeriterobject *it)
         Py_DECREF(str);
         return NULL;
     }
-    const char *line_start = type == STRING ? it->tok->multi_line_start : it->tok->line_start;
-    int lineno = type == STRING ? it->tok->first_lineno : it->tok->lineno;
+    const char *line_start = ISSTRINGLIT(type) ? it->tok->multi_line_start : it->tok->line_start;
+    int lineno = ISSTRINGLIT(type) ? it->tok->first_lineno : it->tok->lineno;
     int end_lineno = it->tok->lineno;
     int col_offset = -1;
     int end_col_offset = -1;

Tools/build/generate_token.py

@@ -80,6 +80,9 @@ def update_file(file, content):
                                  (x) == NEWLINE   || \\
                                  (x) == INDENT    || \\
                                  (x) == DEDENT)
+#define ISSTRINGLIT(x)          ((x) == STRING           || \\
+                                 (x) == FSTRING_MIDDLE   || \\
+                                 (x) == FSTRING_END)
 
 
 // Symbols exported for test_peg_generator