Improve gdb by making rwm a variable in scanners

Author: bengsig

src/rwlarglex.l

@@ -12,6 +12,7 @@
  *
  * History
  *
+ * bengsig  12-jun-2023 - Make rwm a variable in scanners
  * bengsig  10-aug-2022 - Output userhelp in order from rwl source file
  * bengsig  10-aug-2022 - Don't reorder useroption/userswitch
  * bengsig  04-jul-2022 - Restructure scan string, scan SQL code
@@ -39,10 +40,9 @@
 #include "rwldiprs.tab.h"
 #define YYSTYPE RWLZSTYPE
 #define YY_DECL sb4 rwlalex(void *yylval_param, void * yyscanner)
+#define YY_USER_ACTION { rwm = (yyget_extra(yyscanner)); }
 
 
-/* The rwm define is used to make code below legible */
-#define rwm (yyget_extra(yyscanner))
 // to avoid flex generating some code:
 // #define YY_NO_INPUT
 
@@ -59,6 +59,11 @@
 
 %%
 
+%{
+  rwl_main *rwm = 0; // will be set using YY_USER_ACTION
+%}
+
+
 (?i:administer[ \r\n]+key[ \r\n]+management)	|
 (?i:associate[ \r\n]+statistics)	|
 (?i:disassociate[ \r\n]+statistics)	|

src/rwldilex.l

@@ -14,6 +14,7 @@
  *
  * History
  *
+ * bengsig  12-jun-2023 - Make rwm a variable in scanners
  * bengsig  25-may-2023 - Use rwlscanstring.c 
  * bengsig  15-may-2023 - statisticsonly
  * bengsig   8-mar-2023 - Normal Distributed random
@@ -43,13 +44,12 @@
 #include "rwl.h"
 #include "rwldiprs.tab.h"
 
-/* The rwm define is used to make code below legible */
-#define rwm (yyget_extra(yyscanner))
 // to avoid flex generating some code:
 #define YY_NO_INPUT
 
 #define YYSTYPE RWLZSTYPE
 #define YY_DECL sb4 rwlzlex(void *yylval_param, void *yyscanner)
+#define YY_USER_ACTION { rwm = (yyget_extra(yyscanner)); }
 #define RWL_IN_DILEX // make rwlscanstring.c do the right thing
 
 %}
@@ -60,6 +60,10 @@
 
 %%
 
+%{
+  rwl_main *rwm = 0; // will be set using YY_USER_ACTION
+%}
+
 \'(\\.|[^\\'])*\'	{ // copy from rwllexer.l
 			  rwlerror(rwm, RWL_ERROR_USE_QUOTE_FOR_STRING);
 			  rwm->badchar++;
@@ -399,8 +403,6 @@
 
 %%
 
-#undef rwm /* now outside flex code */
-
 sb4 rwlzwrap(yyscan_t ys)
 {
   return 1;

src/rwllexer.l

@@ -11,6 +11,7 @@
  *
  * History
  *
+ * bengsig  12-jun-2023 - Make rwm a variable in scanners
  * bengsig  15-may-2023 - statisticsonly, incorrect RWL-293
  * bengsig   2-may-2023 - $hostname: directive
  * bengsig  17-apr-2023 - Engineering notation output
@@ -91,11 +92,9 @@
 #include "rwl.h"
 #include "rwlparser.tab.h"
 
-#define rwm (yyget_extra(yyscanner))
-
 #define YYSTYPE RWLYSTYPE
 #define YY_DECL sb4 rwlylex(void *yylval_param, void *yyscanner)
-#define YY_USER_ACTION { rwm->loc.inpos += yyleng; }
+#define YY_USER_ACTION { rwm = (yyget_extra(yyscanner)); rwm->loc.inpos += yyleng; }
 
 %}
 
@@ -105,6 +104,10 @@
 
 %%
 
+%{
+  rwl_main *rwm = 0; // will be set using YY_USER_ACTION
+%}
+
   /* **************************************************************** */
   /* NOTE THAT ANY CHANGES HERE MUST BE KEPT IN SYNC WITH rwlarglex.l */
   /* **************************************************************** */
@@ -1529,8 +1532,6 @@
 
 %%
 
-#undef rwm /* now outside flex code */
-
 /* this rouine must be here as it depends on #define
  * and typedefs created by flex
  */

src/rwlscansql.c

@@ -13,6 +13,7 @@
  *
  * History
  *
+ * bengsig  12-jun-2023 - Make rwm a variable in scanners
  * bengsig  04-jul-2022 - Scan sql and pl/sql in lexer
  */
 
@@ -33,8 +34,7 @@
 ub4 rwlscansql(void)
 #endif
 {
-  rwl_main *rwmhere = rwm; // just for the debugger
-  rwmhere->sqlbuffer[0] = 0;
+  rwm->sqlbuffer[0] = 0;
   ub8 l, len;
   text *p;
   sb4 curr, next;

src/rwlscanstring.c

@@ -13,6 +13,7 @@
  *
  * History
  *
+ * bengsig  12-jun-2023 - Make rwm a variable in scanners
  * bengsig  25-may-2023 - Also use in rwldilex.l
  * bengsig  04-jul-2022 - Creation
  */
@@ -25,9 +26,8 @@
 ub4 rwlscanstring(void)
 #endif
 {
-    rwl_main *rwmhere = rwm; // just a debugger aid
     text *in, *ut;
-    rwmhere->loc.inpos -= yyleng-1; // make error below correct
+    rwm->loc.inpos -= yyleng-1; // make error below correct
     /* copy string and remove " at ends */
     rwm->sval = rwlstrdup(rwm, (text *)yytext+1);
     if ('"' == yytext[yyleng-1])