Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 21:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

parser: handle %locations as %define locations.

Browse Source 
* src/getargs.h, src/getargs.c (locations_flag): Remove.
	* src/getargs.c, src/scan-code.l: Use muscle_percent_define_ensure
	to set "locations" to true.
	* src/output.c (prepare): Don't output "locations".
	* src/scan-gram.l (%locations): Handle it as a %<flag>.
	* src/parse-gram.y: It's no longer a token.
	Don't handle it.
	* data/bison.m4 (b4_locations_if): Define it with
	b4_percent_define_if_define.
	* data/c.m4, data/glr.cc: Adjust.
This commit is contained in:
Akim Demaille
2009-04-05 22:05:08 +02:00
parent 697c912fa4
commit bc0f573730
10 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/scan-code.l
View File

@@ -1,6 +1,6 @@
/* Bison Action Scanner -*- C -*-
Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -34,7 +34,7 @@
#include <src/getargs.h>
#include <get-errno.h>
#include <quote.h>
#include <src/muscle_tab.h>
#include <src/scan-code.h>
#include <src/symlist.h>
@@ -223,7 +223,7 @@ splice (\\[ \f\t\v]*\n)*
"#" STRING_GROW; in_cpp = true;
{splice} STRING_GROW;
[\n\r] STRING_GROW; if (in_cpp) in_cpp = need_semicolon = false;
[\n\r] STRING_GROW; if (in_cpp) in_cpp = need_semicolon = false;
[ \t\f] STRING_GROW;
. STRING_GROW; need_semicolon = true;
}
@@ -236,7 +236,7 @@ splice (\\[ \f\t\v]*\n)*
}
"@$" {
obstack_sgrow (&obstack_for_string, "]b4_at_dollar[");
locations_flag = true;
muscle_percent_define_ensure("locations", the_location, true);
}
}
@@ -391,7 +391,7 @@ handle_action_at (symbol_list *rule, char *text, location at_loc)
? rule->midrule_parent_rhs_index - 1
: symbol_list_length (rule->next));
locations_flag = true;
muscle_percent_define_ensure("locations", at_loc, true);
if (*cp == '$')
obstack_sgrow (&obstack_for_string, "]b4_lhs_location[");