C++ fixes related to recent Unicode work.

* lib.c (chk_wrealloc): convert needs to be a coerce.

* parser.l (grammar): Use yyg instead of yyscanner;
the latter is the same pointer but of void * type.

1 files changed, 3 insertions, 3 deletions

diff --git a/parser.l b/parser.l
index 774ade24..6ec112ac 100644
--- a/parser.l
+++ b/parser.l
@@ -436,7 +436,7 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
       || yy_top_state(yyscanner) == QWLIT)
     yy_pop_state(yyscanner);
 
-  yylval->lexeme = unicode_ident(yyscanner, yytext);
+  yylval->lexeme = unicode_ident(yyg, yytext);
   return SYMTOK;
 }
 
@@ -449,7 +449,7 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
       || yy_top_state(yyscanner) == QWLIT)
     yy_pop_state(yyscanner);
 
-  yylval->lexeme = unicode_ident(yyscanner, yytext);
+  yylval->lexeme = unicode_ident(yyg, yytext);
   return SYMTOK;
 }
 
@@ -463,7 +463,7 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
   yyerrorf(yyg, lit("bad token: ~a"),
                     string_own(utf8_dup_from(yytext)),
                     nao);
-  yylval->lexeme = unicode_ident(yyscanner, yytext);
+  yylval->lexeme = unicode_ident(yyg, yytext);
   return SYMTOK;
 }