the last checkin was broken; millaway fixed it

diff --git a/main.c b/main.c
index 0f5ea28af7ee9fbe87cdecb40e24ab9d9cf47f25..41237a5c33e4d9e5bda4f2d9ab6999c26190510c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -831,7 +831,7 @@ char **argv;
                     buf_strdefine(&userdef_buf, "YY_MAIN", "1");
                     break;
 
-            case OPT_NOLINE:
+            case OPT_NO_LINE:
                     gen_line_dirs = false;
                     break;
 
@@ -873,7 +873,7 @@ char **argv;
                     spprdflt = false;
                     break;
 
-            case OPT_NODEFAULT:
+            case OPT_NO_DEFAULT:
                     spprdflt = true;
                     break;
 
@@ -894,7 +894,7 @@ char **argv;
                             program_name, flex_version );
                     exit( 0 );
 
-            case OPT_NOWARN:
+            case OPT_NO_WARN:
                     nowarn = true;
                     break;
 

diff --git a/options.c b/options.c
index 26a90393e927a367399ef103204abfa49297df1b..d289010ba33b4b1e08aebf9451f26d519b9f7b5b 100644 (file)
--- a/options.c
+++ b/options.c
@@ -39,12 +39,12 @@ optspec_t  flexopts[] = {
 {"--main",              OPT_MAIN,0}, /* use built-in main() function. */
 {"--meta-ecs",          OPT_META_ECS,0},/* Construct meta-equivalence classes. */
 {"--never-interactive", OPT_NEVER_INTERACTIVE,0},
-{"--nodefault",         OPT_NODEFAULT,0},/* Suppress default rule to ECHO unmatched text. */
-{"-s",                  OPT_NODEFAULT,0},
-{"--noline",            OPT_NOLINE,0},/* Suppress #line directives in scanner. */
-{"-L",                  OPT_NOLINE,0},/* Suppress #line directives in scanner. */
-{"--nowarn",            OPT_NOWARN,0},/* Suppress warning messages. */
-{"-w",                  OPT_NOWARN,0},
+{"--nodefault",         OPT_NO_DEFAULT,0},/* Suppress default rule to ECHO unmatched text. */
+{"-s",                  OPT_NO_DEFAULT,0},
+{"--noline",            OPT_NO_LINE,0},/* Suppress #line directives in scanner. */
+{"-L",                  OPT_NO_LINE,0},/* Suppress #line directives in scanner. */
+{"--nowarn",            OPT_NO_WARN,0},/* Suppress warning messages. */
+{"-w",                  OPT_NO_WARN,0},
 {"--outfile=FILE",      OPT_OUTFILE,0},/* Write to FILE (default is lex.yy.c) */
 {"-o FILE",             OPT_OUTFILE,0},
 {"--perf-report",       OPT_PERF_REPORT,0},/* Generate performance report to stderr. */

diff --git a/options.h b/options.h
index 39ae1f5d8dbe58affee9df886bd61d0f24c18e92..0aa1ad3a9fce502e7fc9527592b946f4b8b0ab34 100644 (file)
--- a/options.h
+++ b/options.h
@@ -28,7 +28,7 @@ enum flexopt_flag_t {
     OPT_INTERACTIVE,
     OPT_LEX_COMPAT,
     OPT_MAIN,      OPT_NO_MAIN,
-    OPT_META_ECS,  OPT_NO_META_ECS
+    OPT_META_ECS,  OPT_NO_META_ECS,
     OPT_NEVER_INTERACTIVE,
     OPT_NO_LINE,
     OPT_OUTFILE,
@@ -48,7 +48,7 @@ enum flexopt_flag_t {
     OPT_UNPUT,    OPT_NOUNPUT,
     OPT_VERBOSE,
     OPT_VERSION,
-    OPT_WARN,     OPT_NOWARN,
+    OPT_WARN,     OPT_NO_WARN,
     OPT_YYCLASS,
     OPT_YYLINENO, OPT_NO_YYLINEO,
     OPT_YYMORE,   OPT_NO_YYMORE,