gh-153568: Keep NOTEQUAL spelling in token text

Author: pablogsal

Parser/action_helpers.c

@@ -946,14 +946,16 @@ _PyPegen_add_type_comment_to_arg(Parser *p, arg_ty a, Token *tc)
 0 indicates success and nonzero indicates failure (an exception may be set) */
 int
 _PyPegen_check_barry_as_flufl(Parser *p, Token* t) {
+    assert(t->bytes != NULL);
     assert(t->type == NOTEQUAL);
 
-    if (p->flags & PyPARSE_BARRY_AS_BDFL && !t->is_barry) {
+    const char* tok_str = PyBytes_AS_STRING(t->bytes);
+    if (p->flags & PyPARSE_BARRY_AS_BDFL && strcmp(tok_str, "<>") != 0) {
         RAISE_SYNTAX_ERROR("with Barry as BDFL, use '<>' instead of '!='");
         return -1;
     }
     if (!(p->flags & PyPARSE_BARRY_AS_BDFL)) {
-        return t->is_barry;
+        return strcmp(tok_str, "!=");
     }
     return 0;
 }

Parser/pegen.c

@@ -197,8 +197,8 @@ _get_keyword_or_name_type(Parser *p, const char *text, Py_ssize_t length)
     return NAME;
 }
 
-// Only names, literals and type comments need their token text. Keyword
-// error actions use fixed spellings; NOTEQUAL keeps its spelling in is_barry.
+// Keep text only where grammar actions or helpers read it. Keyword error
+// actions use fixed spellings, so keywords do not need their text.
 static inline int
 token_needs_text(int type)
 {
@@ -213,6 +213,7 @@ token_needs_text(int type)
         case TSTRING_MIDDLE:
         case TSTRING_END:
         case TYPE_COMMENT:
+        case NOTEQUAL:  // _PyPegen_check_barry_as_flufl() distinguishes != and <>.
             return 1;
         default:
             return 0;
@@ -252,7 +253,6 @@ initialize_token(Parser *p, Token *parser_token, struct token *new_token, int to
 
     parser_token->level = new_token->level;
     parser_token->is_raw = new_token->is_raw;
-    parser_token->is_barry = token_type == NOTEQUAL && text[0] == '<';
     parser_token->lineno = new_token->start_loc.lineno;
     parser_token->col_offset = new_token->end_loc.lineno == p->starting_lineno
         ? p->starting_col_offset + new_token->start_loc.byte_col

Parser/pegen.h

@@ -38,11 +38,10 @@ typedef struct _memo {
 
 typedef struct {
     int type;
-    // Text for names, literals and type comments; otherwise NULL.
+    // Text required by grammar actions or helpers; otherwise NULL.
     PyObject *bytes;
     int level;
-    unsigned int is_raw : 1;
-    unsigned int is_barry : 1;  // The '<>' spelling of NOTEQUAL.
+    int is_raw;
     int lineno, col_offset, end_lineno, end_col_offset;
     Memo *memo;
     // Filter over the rule types present in `memo` (bit `type & 63` is set