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

Support parametric types.

Browse Source 
There are two issues to handle: first scanning nested angle bracket pairs
to support types such as std::pair< std::string, std::list<std::string> > >.

Another issue is to address idiosyncracies of C++: do not glue two closing
angle brackets together (otherwise it's operator>>), and avoid sticking
blindly a TYPE to the opening <, as it can result in '<:' which is a
digraph for '['.

	* src/scan-gram.l (brace_level): Rename as...
	(nesting): this.
	(SC_TAG): New.
	Implement support for complex tags.
	(tag): Accept \n, but not <.
	* data/lalr1.cc (b4_symbol_value, b4_symbol_value_template)
	(b4_symbol_variant): Leave space around types as parameters.
	* examples/variant.yy: Use nested template types and leading ::.
	* src/parse-gram.y (TYPE, TYPE_TAG_ANY, TYPE_TAG_NONE, type.opt):
	Rename as...
	(TAG, TAG_ANY, TAG_NONE, tag.opt): these.
	* tests/c++.at: Test parametric types.
This commit is contained in:
Akim Demaille
2008-10-23 20:01:48 -05:00
parent 7b6e67533e
commit cb823b6f0c
6 changed files with 128 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/c++.at
View File

@@ -51,7 +51,7 @@ typedef std::list<std::string> strings_type;
#include <iterator>
#include <sstream>
static
static
#if defined USE_LEX_SYMBOL
yy::parser::symbol_type yylex ();
#else
@@ -86,26 +86,30 @@ typedef std::list<std::string> strings_type;
%token <std::string> TEXT;
%token <int> NUMBER;
%printer { debug_stream() << $][$; } <int> <std::string> <strings_type>;
%token END_OF_FILE 0;
%type <std::string> item;
%type <strings_type> list result;
// Using the template type to exercize its parsing.
// Starting with :: to ensure we don't output "<::" which starts by the
// digraph for the left square bracket.
%type <::std::list<std::string>> list result;
%printer { debug_stream() << $][$; }
<int> <::std::string> <::std::list<::std::string>>;
%%
result:
list { std::cout << $][1; }
list { std::cout << $][1; }
;
list:
/* nothing */ { /* Generates an empty string list */ }
| list item { std::swap($][$,$][1); $$.push_back($][2); }
/* nothing */ { /* Generates an empty string list */ }
| list item { std::swap($][$,$][1); $$.push_back($][2); }
;
item:
TEXT { std::swap($][$,$][1); }
| NUMBER { $][$ = string_cast($][1); }
TEXT { std::swap($][$,$][1); }
| NUMBER { $][$ = string_cast($][1); }
;
%%
@@ -164,7 +168,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
void
yy::parser::error(const yy::parser::location_type&,
const std::string& message)
const std::string& message)
{
std::cerr << message << std::endl;
}
@@ -363,5 +367,5 @@ AT_CHECK_NAMESPACE([[foo: :bar]], [[-]])
# contains single occurrences of `:'.
AT_CHECK_NAMESPACE([[foo[3]::bar::baz]], [[-]])
AT_CHECK_NAMESPACE([[foo::bar,baz]], [[-]])
AT_CHECK_NAMESPACE([[foo::bar::(baz]], [[-]])
AT_CHECK_NAMESPACE([[foo::bar::(baz /* Pacify Emacs ) */]], [[-]])
AT_CLEANUP