summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2015-08-19 07:48:33 -0700
committerKaz Kylheku <kaz@kylheku.com>2015-08-19 07:48:33 -0700
commit1cf78b42b2ebbb16b33e16f0bb3c1f1dc2b3b26f (patch)
tree8239cebd4be8014d3f36f3abb3726782853a6a93
parent055ea6cbe74203568d6e038298725fb0f97bfbfe (diff)
downloadtxr-1cf78b42b2ebbb16b33e16f0bb3c1f1dc2b3b26f.tar.gz
txr-1cf78b42b2ebbb16b33e16f0bb3c1f1dc2b3b26f.tar.bz2
txr-1cf78b42b2ebbb16b33e16f0bb3c1f1dc2b3b26f.zip
Remove useless member from parser structure.
* parser.c (parser_common_init): Use local variable to capture output of yylex_init, rather than yyscan structure member. * parser.h (struct parser): Member yyscan removed.
-rw-r--r--parser.c5
-rw-r--r--parser.h1
2 files changed, 3 insertions, 3 deletions
diff --git a/parser.c b/parser.c
index 199b0a07..1490a3de 100644
--- a/parser.c
+++ b/parser.c
@@ -90,6 +90,7 @@ static struct cobj_ops parser_ops = {
void parser_common_init(parser_t *p)
{
int i;
+ yyscan_t yyscan;
p->parser = nil;
p->lineno = 1;
@@ -98,8 +99,8 @@ void parser_common_init(parser_t *p)
p->name = nil;
p->prepared_msg = nil;
p->syntax_tree = nil;
- yylex_init(&p->yyscan);
- p->scanner = convert(scanner_t *, p->yyscan);
+ yylex_init(&yyscan);
+ p->scanner = convert(scanner_t *, yyscan);
yyset_extra(p, p->scanner);
p->recent_tok.yy_char = 0;
p->recent_tok.yy_lval.val = 0;
diff --git a/parser.h b/parser.h
index fe8e4413..3e45e32d 100644
--- a/parser.h
+++ b/parser.h
@@ -48,7 +48,6 @@ struct parser {
val name;
val prepared_msg;
val syntax_tree;
- yyscan_t yyscan;
scanner_t *scanner;
struct yy_token recent_tok;
struct yy_token tok_pushback[4];