flex code modernization: Replace YY_EXTRA_TYPE define with flex option

Replace #define YY_EXTRA_TYPE with %option extra-type.  The latter is
the way recommended by the flex manual (available since flex 2.5.34).

Reviewed-by: Heikki Linnakangas <hlinnaka@iki.fi>
Discussion: https://www.postgresql.org/message-id/flat/eb6faeac-2a8a-4b69-9189-c33c520e5b7b@eisentraut.org

diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 1d5dfe83125c2fb9060b6c93c9f08be517d2e474..8031a78b9085356a7daff496b564de16b10727af 100644 (file)
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -89,12 +89,6 @@ const uint16 ScanKeywordTokens[] = {
  */
 #define YYSTYPE core_YYSTYPE
 
-/*
- * Set the type of yyextra.  All state variables used by the scanner should
- * be in yyextra, *not* statically allocated.
- */
-#define YY_EXTRA_TYPE core_yy_extra_type *
-
 /*
  * Each call to yylex must set yylloc to the location of the found token
  * (expressed as a byte offset from the start of the input text).
@@ -161,6 +155,7 @@ extern void core_yyset_column(int column_no, yyscan_t yyscanner);
 %option noyyfree
 %option warn
 %option prefix="core_yy"
+%option extra-type="core_yy_extra_type *"
 
 /*
  * OK, here is a short description of lex/flex rules behavior.

diff --git a/src/backend/replication/repl_scanner.l b/src/backend/replication/repl_scanner.l
index 0d1ac2d2389a5cf629e7dfb2242c327c9bbdba40..de10cb5abd19bd6d6ace89e961ee682bcffd578c 100644 (file)
--- a/src/backend/replication/repl_scanner.l
+++ b/src/backend/replication/repl_scanner.l
@@ -46,7 +46,6 @@ struct replication_yy_extra_type
        /* Work area for collecting literals */
        StringInfoData litbuf;
 };
-#define YY_EXTRA_TYPE struct replication_yy_extra_type *
 
 static void startlit(yyscan_t yyscanner);
 static char *litbufdup(yyscan_t yyscanner);
@@ -70,6 +69,7 @@ static void addlitchar(unsigned char ychar, yyscan_t yyscanner);
 %option noyyfree
 %option warn
 %option prefix="replication_yy"
+%option extra-type="struct replication_yy_extra_type *"
 
 /*
  * Exclusive states:

diff --git a/src/backend/replication/syncrep_scanner.l b/src/backend/replication/syncrep_scanner.l
index 4db6732995641eea0dd476a96cd5319a82abe6f3..05e5fdecf1b31925a989bd8a161258ee1dfd1b8a 100644 (file)
--- a/src/backend/replication/syncrep_scanner.l
+++ b/src/backend/replication/syncrep_scanner.l
@@ -41,7 +41,6 @@ struct syncrep_yy_extra_type
 {
        StringInfoData xdbuf;
 };
-#define YY_EXTRA_TYPE struct syncrep_yy_extra_type *
 
 /* LCOV_EXCL_START */
 
@@ -60,6 +59,7 @@ struct syncrep_yy_extra_type
 %option noyyfree
 %option warn
 %option prefix="syncrep_yy"
+%option extra-type="struct syncrep_yy_extra_type *"
 
 /*
  * <xd> delimited identifiers (double-quoted identifiers)

diff --git a/src/backend/utils/adt/jsonpath_scan.l b/src/backend/utils/adt/jsonpath_scan.l
index 2efc33f9542f1ea332f09b4dce55f8fcda5acc03..c7aab83eeb4f674ef3c1a1cca3c5734e0c886ede 100644 (file)
--- a/src/backend/utils/adt/jsonpath_scan.l
+++ b/src/backend/utils/adt/jsonpath_scan.l
@@ -34,7 +34,6 @@ struct jsonpath_yy_extra_type
 {
        JsonPathString scanstring;
 };
-#define YY_EXTRA_TYPE struct jsonpath_yy_extra_type *
 
 static void addstring(bool init, char *s, int l, yyscan_t yyscanner);
 static void addchar(bool init, char c, yyscan_t yyscanner);
@@ -64,6 +63,7 @@ fprintf_to_ereport(const char *fmt, const char *msg)
 %option noyywrap
 %option warn
 %option prefix="jsonpath_yy"
+%option extra-type="struct jsonpath_yy_extra_type *"
 %option reentrant
 %option bison-bridge
 %option noyyalloc

diff --git a/src/bin/psql/psqlscanslash.l b/src/bin/psql/psqlscanslash.l
index 35fde05661b07b6605a379d35c339f5d3837b2f0..f76b7722ac7c7e7eae97263207159e7915798243 100644 (file)
--- a/src/bin/psql/psqlscanslash.l
+++ b/src/bin/psql/psqlscanslash.l
@@ -38,12 +38,6 @@
  */
 typedef int YYSTYPE;
 
-/*
- * Set the type of yyextra; we use it as a pointer back to the containing
- * PsqlScanState.
- */
-#define YY_EXTRA_TYPE PsqlScanState
-
 /*
  * These variables do not need to be saved across calls.  Yeah, it's a bit
  * of a hack, but putting them into PsqlScanStateData would be klugy too.
@@ -88,6 +82,12 @@ extern void slash_yyset_column(int column_no, yyscan_t yyscanner);
 %option warn
 %option prefix="slash_yy"
 
+/*
+ * Set the type of yyextra; we use it as a pointer back to the containing
+ * PsqlScanState.
+ */
+%option extra-type="PsqlScanState"
+
 /*
  * OK, here is a short description of lex/flex rules behavior.
  * The longest pattern which matches an input string is always chosen.

diff --git a/src/fe_utils/psqlscan.l b/src/fe_utils/psqlscan.l
index bdea4c43054b9b3f8ebdc11741226fe382fda4ee..e1cb726f326554677a787f8bde107d965b6dfa37 100644 (file)
--- a/src/fe_utils/psqlscan.l
+++ b/src/fe_utils/psqlscan.l
@@ -52,12 +52,6 @@
  */
 typedef int YYSTYPE;
 
-/*
- * Set the type of yyextra; we use it as a pointer back to the containing
- * PsqlScanState.
- */
-#define YY_EXTRA_TYPE PsqlScanState
-
 
 /* Return values from yylex() */
 #define LEXRES_EOL                     0       /* end of input */
@@ -89,6 +83,12 @@ extern void psql_yyset_column(int column_no, yyscan_t yyscanner);
 %option warn
 %option prefix="psql_yy"
 
+/*
+ * Set the type of yyextra; we use it as a pointer back to the containing
+ * PsqlScanState.
+ */
+%option extra-type="PsqlScanState"
+
 /*
  * All of the following definitions and rules should exactly match
  * src/backend/parser/scan.l so far as the flex patterns are concerned.