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, 1 deletions

diff --git a/regex.c b/regex.c
index e4dfee4d..87fad93e 100644
--- a/regex.c
+++ b/regex.c
@@ -56,8 +56,10 @@ typedef struct nfa {
   nfa_state_t *accept;
 } nfa_t;
 
+typedef enum { REGEX_NFA, REGEX_DV } regex_kind_t;
+
 typedef struct regex {
-  enum { REGEX_NFA, REGEX_DV } kind;
+  regex_kind_t kind;
   union {
     struct nfa nfa;
     val dv;