summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Estes <westes@users.noreply.github.com>2022-05-16 15:59:30 -0400
committerGitHub <noreply@github.com>2022-05-16 15:59:30 -0400
commit74a89fd6abf178f50f180f228613345682f7fd18 (patch)
tree4799dbce66b9580e20d9afb79462157c5123432a
parent00bfa85257ea06d55d9da7dcccda0a6083d9f067 (diff)
parent1677eff252854d10b29dd50d7fc520f763340f5e (diff)
downloadflex-git-74a89fd6abf178f50f180f228613345682f7fd18.tar.gz
Merge pull request #513 from ggujjula/issue_398
Issue 398; Documentation fix; Additional command-line options
-rwxr-xr-xdoc/flex.texi2
-rw-r--r--src/main.c9
-rw-r--r--src/options.c8
-rw-r--r--src/options.h3
4 files changed, 21 insertions, 1 deletions
diff --git a/doc/flex.texi b/doc/flex.texi
index a2e0dce..a4b5897 100755
--- a/doc/flex.texi
+++ b/doc/flex.texi
@@ -2614,7 +2614,7 @@ corresponding routine not appearing in the generated scanner:
@example
@verbatim
-input, yyunput
+yyinput, yyunput
yy_push_state, yy_pop_state, yy_top_state
yy_scan_buffer, yy_scan_bytes, yy_scan_string
diff --git a/src/main.c b/src/main.c
index 3b996b4..c4e6849 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1077,6 +1077,9 @@ void flexinit (int argc, char **argv)
case OPT_NO_YY_TOP_STATE:
ctrl.no_yy_top_state = true;
break;
+ case OPT_NO_YYINPUT:
+ ctrl.no_yyinput = true;
+ break;
case OPT_NO_YYUNPUT:
ctrl.no_yyunput = true;
break;
@@ -1137,6 +1140,12 @@ void flexinit (int argc, char **argv)
case OPT_NO_YYSET_LLOC:
ctrl.no_yyset_lloc = true;
break;
+ case OPT_NO_YYGET_DEBUG:
+ ctrl.no_get_debug = true;
+ break;
+ case OPT_NO_YYSET_DEBUG:
+ ctrl.no_set_debug = true;
+ break;
case OPT_HEX:
env.trace_hex = true;
diff --git a/src/options.c b/src/options.c
index 56c7f42..8b7fd8a 100644
--- a/src/options.c
+++ b/src/options.c
@@ -235,6 +235,10 @@ optspec_t flexopts[] = {
{"--yywrap", OPT_YYWRAP, 0}
,
+ {"--noinput", OPT_NO_YYINPUT, 0}
+ ,
+ {"--noyyinput", OPT_NO_YYINPUT, 0}
+ ,
{"--nounput", OPT_NO_YYUNPUT, 0}
,
{"--noyyunput", OPT_NO_YYUNPUT, 0}
@@ -283,6 +287,10 @@ optspec_t flexopts[] = {
,
{"--noyyset_lloc", OPT_NO_YYSET_LLOC, 0}
,
+ {"--noyyget_debug", OPT_NO_YYGET_DEBUG, 0}
+ ,
+ {"--noyyset_debug", OPT_NO_YYSET_DEBUG, 0}
+ ,
{"--unsafe-no-m4-sect3-escape", OPT_NO_SECT3_ESCAPE, 0}
,
{0, 0, 0} /* required final NULL entry. */
diff --git a/src/options.h b/src/options.h
index 0b905d5..a2d3786 100644
--- a/src/options.h
+++ b/src/options.h
@@ -79,6 +79,7 @@ enum flexopt_flag_t {
OPT_NO_REENTRANT,
OPT_NO_REJECT,
OPT_NO_STDINIT,
+ OPT_NO_YYINPUT,
OPT_NO_YYUNPUT,
OPT_NO_WARN,
OPT_NO_YYGET_EXTRA,
@@ -89,6 +90,7 @@ enum flexopt_flag_t {
OPT_NO_YYGET_LLOC,
OPT_NO_YYGET_LVAL,
OPT_NO_YYGET_OUT,
+ OPT_NO_YYGET_DEBUG,
OPT_NO_YYGET_TEXT,
OPT_NO_YYLINENO,
OPT_NO_YYMORE,
@@ -99,6 +101,7 @@ enum flexopt_flag_t {
OPT_NO_YYSET_LLOC,
OPT_NO_YYSET_LVAL,
OPT_NO_YYSET_OUT,
+ OPT_NO_YYSET_DEBUG,
OPT_NO_YYWRAP,
OPT_NO_YY_POP_STATE,
OPT_NO_YY_PUSH_STATE,