scanner: finish support for noyy{get,set}_column.

Unattributed patch carried over from sourceforge bug tracker.

diff --git a/src/main.c b/src/main.c
index e5eac44fe0a746271eca119dfed7c9725395e496..337c40d2920275c679799315c082ca684f7cf549 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -648,6 +648,7 @@ void flexend (int exit_status)
                 "yyget_extra",
                 "yyget_in",
                 "yyget_leng",
+                "yyget_column",
                 "yyget_lineno",
                 "yyget_lloc",
                 "yyget_lval",
@@ -670,6 +671,7 @@ void flexend (int exit_status)
                 "yyset_debug",
                 "yyset_extra",
                 "yyset_in",
+                "yyset_column",
                 "yyset_lineno",
                 "yyset_lloc",
                 "yyset_lval",
@@ -1394,6 +1396,14 @@ void flexinit (int argc, char **argv)
                        //buf_strdefine (&userdef_buf, "YY_NO_SET_LINENO", "1");
             buf_m4_define( &m4defs_buf, "M4_YY_NO_SET_LINENO",0);
                        break;
+               case OPT_NO_YYGET_COLUMN:
+                       //buf_strdefine (&userdef_buf, "YY_NO_GET_COLUMN", "1");
+            buf_m4_define( &m4defs_buf, "M4_YY_NO_GET_COLUMN",0);
+                       break;
+               case OPT_NO_YYSET_COLUMN:
+                       //buf_strdefine (&userdef_buf, "YY_NO_SET_COLUMN", "1");
+            buf_m4_define( &m4defs_buf, "M4_YY_NO_SET_COLUMN",0);
+                       break;
                case OPT_NO_YYGET_IN:
                        //buf_strdefine (&userdef_buf, "YY_NO_GET_IN", "1");
             buf_m4_define( &m4defs_buf, "M4_YY_NO_GET_IN",0);

diff --git a/src/options.c b/src/options.c
index 366bc2e566c6f9f6a87b97dcec02c28507625ff0..8e42adbdfd9d37b7630094d55d0c90659b91c01a 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -255,6 +255,10 @@ optspec_t flexopts[] = {
        ,
        {"--noyyset_lineno", OPT_NO_YYSET_LINENO, 0}
        ,
+       {"--noyyget_column", OPT_NO_YYGET_COLUMN, 0}
+       ,
+       {"--noyyset_column", OPT_NO_YYSET_COLUMN, 0}
+       ,
        {"--noyyget_in", OPT_NO_YYGET_IN, 0}
        ,
        {"--noyyset_in", OPT_NO_YYSET_IN, 0}

diff --git a/src/options.h b/src/options.h
index 5b51c23816a118ba2e532c85b6ab3fd2687b364b..5016680fd134008ae3f957d370ad4effdc7ba839 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -83,6 +83,7 @@ enum flexopt_flag_t {
        OPT_NO_YYGET_IN,
        OPT_NO_YYGET_LENG,
        OPT_NO_YYGET_LINENO,
+       OPT_NO_YYGET_COLUMN,
        OPT_NO_YYGET_LLOC,
        OPT_NO_YYGET_LVAL,
        OPT_NO_YYGET_OUT,
@@ -92,6 +93,7 @@ enum flexopt_flag_t {
        OPT_NO_YYSET_EXTRA,
        OPT_NO_YYSET_IN,
        OPT_NO_YYSET_LINENO,
+       OPT_NO_YYSET_COLUMN,
        OPT_NO_YYSET_LLOC,
        OPT_NO_YYSET_LVAL,
        OPT_NO_YYSET_OUT,

diff --git a/src/scan.l b/src/scan.l
index 66db8645ceeb5b3dabf53fc312c6f2533405fa8d..3995bcf1686765e27df5e3089c4aa12b2d791d07 100644 (file)
--- a/src/scan.l
+++ b/src/scan.l
@@ -433,6 +433,8 @@ M4QEND      "]""]"
     yyset_extra     ACTION_M4_IFDEF("M4""_YY_NO_SET_EXTRA", ! option_sense);
     yyget_leng      ACTION_M4_IFDEF("M4""_YY_NO_GET_LENG", ! option_sense);
     yyget_text      ACTION_M4_IFDEF("M4""_YY_NO_GET_TEXT", ! option_sense);
+    yyget_column    ACTION_M4_IFDEF("M4""_YY_NO_GET_COLUMN", ! option_sense);
+    yyset_column    ACTION_M4_IFDEF("M4""_YY_NO_SET_COLUMN", ! option_sense);
     yyget_lineno    ACTION_M4_IFDEF("M4""_YY_NO_GET_LINENO", ! option_sense);
     yyset_lineno    ACTION_M4_IFDEF("M4""_YY_NO_SET_LINENO", ! option_sense);
     yyget_in        ACTION_M4_IFDEF("M4""_YY_NO_GET_IN", ! option_sense);