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

Named symbol references.

Browse Source 
Discussed in:
http://lists.gnu.org/archive/html/bison-patches/2009-01/msg00000.html
http://lists.gnu.org/archive/html/bison-patches/2009-02/msg00002.html
http://lists.gnu.org/archive/html/bison-patches/2009-03/msg00009.html

	* src/parse-gram.y: Add new syntax (named_ref.opt).
	* src/reader.c: Store named refs in symbol lists.
	* src/reader.h: New argument for symbol_append and
	action_append functions.
	* src/scan-code.h: Add new field (named_ref) into
	code_props data structure. Keeps named ref of midrule
	actions.
	* src/scan-code.l: Support for named refs in semantic
	action code. New function 'parse_named_ref'.
	* src/scan-gram.l: Support bracketed id.
	* src/symlist.c: Store named refs in symbol lists.
	* src/symlist.h: New field in symbol list: named_ref.
	* src/named-ref.h: New file, a struct for named_ref.
	* src/named-ref.c: New file, named_ref_new function.
	* src/Makefile.am: Add two new files.
	* tests/testsuite.at: Include new test group:
	* tests/named-refs.at: this new file.
This commit is contained in:
Alex Rozenman
2009-05-23 18:48:03 +03:00
parent 67f8cf51c3
commit 7685e2f7ba
14 changed files with 1161 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/parse-gram.y
View File

@@ -30,6 +30,7 @@
#include "quotearg.h"
#include "reader.h"
#include "symlist.h"
#include "named-ref.h"
#include "scan-gram.h"
#include "scan-code.h"
@@ -63,6 +64,7 @@ static symbol_class current_class = unknown_sym;
static uniqstr current_type = NULL;
static symbol *current_lhs;
static location current_lhs_location;
static named_ref *current_lhs_named_ref;
static int current_prec = 0;
#define YYTYPE_INT16 int_fast16_t
@@ -98,6 +100,7 @@ static int current_prec = 0;
assoc assoc;
uniqstr uniqstr;
unsigned char character;
named_ref *named_ref;
};
/* Define the tokens together with their human representation. */
@@ -169,6 +172,7 @@ static int current_prec = 0;
%token TYPE "type"
%token TYPE_TAG_ANY "<*>"
%token TYPE_TAG_NONE "<>"
%token BRACKETED_ID "[id]"
%type <character> CHAR
%printer { fputs (char_name ($$), stderr); } CHAR
@@ -182,7 +186,8 @@ static int current_prec = 0;
%printer { fprintf (stderr, "{\n%s\n}", $$); }
braceless content.opt "{...}" "%{...%}" EPILOGUE
%type <uniqstr> TYPE ID ID_COLON variable
%type <uniqstr> TYPE ID ID_COLON BRACKETED_ID variable
%type <named_ref> named_ref.opt
%printer { fprintf (stderr, "<%s>", $$); } TYPE
%printer { fputs ($$, stderr); } ID variable
%printer { fprintf (stderr, "%s:", $$); } ID_COLON
@@ -519,7 +524,8 @@ rules_or_grammar_declaration:
;
rules:
id_colon { current_lhs = $1; current_lhs_location = @1; } rhses.1
id_colon named_ref.opt { current_lhs = $1; current_lhs_location = @1;
current_lhs_named_ref = $2; } rhses.1
;
rhses.1:
@@ -530,11 +536,12 @@ rhses.1:
rhs:
/* Nothing. */
{ grammar_current_rule_begin (current_lhs, current_lhs_location); }
| rhs symbol
{ grammar_current_rule_symbol_append ($2, @2); }
| rhs "{...}"
{ grammar_current_rule_action_append ($2, @2); }
{ grammar_current_rule_begin (current_lhs, current_lhs_location,
current_lhs_named_ref); }
| rhs symbol named_ref.opt
{ grammar_current_rule_symbol_append ($2, @2, $3); }
| rhs "{...}" named_ref.opt
{ grammar_current_rule_action_append ($2, @2, $3); }
| rhs "%prec" symbol
{ grammar_current_rule_prec_set ($3, @3); }
| rhs "%dprec" INT
@@ -543,6 +550,14 @@ rhs:
{ grammar_current_rule_merge_set ($3, @3); }
;
named_ref.opt:
/* Nothing. */
{ $$ = 0; }
|
BRACKETED_ID
{ $$ = named_ref_new($1, @1); }
;
/*----------------------------*
| variable and content.opt. |