summaryrefslogtreecommitdiff
path: root/src/scan.l
diff options
context:
space:
mode:
authorrlar <rlar>2016-02-28 14:19:04 +0100
committerWill Estes <westes575@gmail.com>2016-02-28 18:56:25 -0500
commit318396d05a99dc434ea49452f01407b0ad59ce8d (patch)
tree7a3b7fa30d59d1f3240e7533be38bf076e7934c2 /src/scan.l
parent804efe8c42f692d0756b197e3cc013a09b329383 (diff)
unification, rename some more
rename these too for improved similiarity: OPTION_OP OPT_HEADER OPT_EXTRA_TYPE OPT_TABLES
Diffstat (limited to 'src/scan.l')
-rw-r--r--src/scan.l8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scan.l b/src/scan.l
index 73ed109..263613d 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -174,7 +174,7 @@ M4QEND "]]"
^"%pointer".*{NL} yytext_is_array = false; ++linenum;
^"%array".*{NL} yytext_is_array = true; ++linenum;
- ^"%option" BEGIN(OPTION); return OPTION_OP;
+ ^"%option" BEGIN(OPTION); return TOK_OPTION;
^"%"{LEXOPT}{OPTWS}[[:digit:]]*{OPTWS}{NL} ++linenum; /* ignore */
^"%"{LEXOPT}{WS}.*{NL} ++linenum; /* ignore */
@@ -421,12 +421,12 @@ M4QEND "]]"
yyget_lloc ACTION_M4_IFDEF("M4""_YY_NO_GET_LLOC", ! option_sense);
yyset_lloc ACTION_M4_IFDEF("M4""_YY_NO_SET_LLOC", ! option_sense);
- extra-type return OPT_EXTRA_TYPE;
+ extra-type return TOK_EXTRA_TYPE;
outfile return TOK_OUTFILE;
prefix return TOK_PREFIX;
yyclass return TOK_YYCLASS;
- header(-file)? return OPT_HEADER;
- tables-file return OPT_TABLES;
+ header(-file)? return TOK_HEADER_FILE;
+ tables-file return TOK_TABLES_FILE;
tables-verify {
tablesverify = option_sense;
if(!tablesext && option_sense)