C++ upkeep.

TXR's support for compiling as C++ pays off:  C++ compiler finds
serious bugs introduced in August 2 ("Big switch to reentrant lexing
and parsing"). The yyerror function was being misused; some of
the calls reversed the scanner and parser arguments. Since one
of the two parameters is void *, this reversal wasn't caught.

* parser.l (yyerror): Fix first two arguments being
reversed.
(num_esc): Change previously correct call to yyerror to follow reversed
arguments, so that it stays correct.

* parser.y (%parse-param): Change order of these directives
so that the scnr parameter is before the parser parameter.
This causes the yacc-generated calls to yyerror to have
the arguments in the correct order.  It also has the
effect of changing the signature of yyparse, reversing its parameters.
(parse): Update call to yyparse to new argument order.

* parser.h (yyparse): Declaration removed.
(yyerror): Declaration updated.

* regex.c (regex_kind_t): New enum typedef.
(struct regex): Use regex_kind_t rather than an enum
inside the struct, which has different scoping rules
under C++.

* txr.c (get_self_path): Fix signed/unsigned warning.

1 files changed, 3 insertions, 3 deletions

diff --git a/parser.l b/parser.l
index 66ccb4bd..d59955b7 100644
--- a/parser.l
+++ b/parser.l
@@ -78,7 +78,7 @@ int yylex_destroy(void)
 int yyget_column(void *);
 void yyset_column (int  column_no , yyscan_t yyscanner);
 
-void yyerror(parser_t *parser, void *scanner, const char *s)
+void yyerror(void *scanner, parser_t *parser, const char *s)
 {
   yyerrorf(scanner, lit("~a"), string_utf8(s), nao);
   if (parser->prepared_msg) {
@@ -141,13 +141,13 @@ static wchar_t num_esc(void *scn, char *num)
 {
   if (num[0] == 'x') {
     if (strlen(num) > 7)
-      yyerror(yyget_extra(scn), scn, "too many digits in hex character escape");
+      yyerror(scn, yyget_extra(scn), "too many digits in hex character escape");
     return strtol(num + 1, 0, 16);
   } else {
     if (num[0] == 'o')
       num++;
     if (strlen(num) > 8)
-      yyerror(yyget_extra(scn), scn, "too many digits in octal character escape");
+      yyerror(scn, yyget_extra(scn), "too many digits in octal character escape");
     return strtol(num, 0, 8);
   }
 }