diff --git a/src/parse-gram.y b/src/parse-gram.y index 351da393..cd706263 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -214,7 +214,7 @@ BRACED_CODE "{...}" BRACED_PREDICATE "%?{...}" BRACKETED_ID _("[identifier]") - CHAR _("character literal") + CHAR_LITERAL _("character literal") COLON ":" EPILOGUE _("epilogue") EQUAL "=" @@ -232,7 +232,7 @@ %code pre-printer {tron (yyo);} %code post-printer {troff (yyo);} -%type CHAR +%type CHAR_LITERAL %printer { fputs (char_name ($$), yyo); } %type "{...}" "%?{...}" "%{...%}" EPILOGUE STRING TSTRING @@ -765,7 +765,7 @@ value: id: ID { $$ = symbol_from_uniqstr ($1, @1); } -| CHAR +| CHAR_LITERAL { const char *var = "api.token.raw"; if (current_class == nterm_sym) diff --git a/src/scan-gram.l b/src/scan-gram.l index bd367fa5..f957f137 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -615,9 +615,9 @@ eqopt ({sp}=)? } else { - val->CHAR = last_string[0]; + val->CHAR_LITERAL = last_string[0]; STRING_FREE (); - return CHAR; + return CHAR_LITERAL; } } {eol} unexpected_newline (token_start, "'");