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

tests: c++: use a custom string type

Browse Source 
The forthcoming automove feature, to be properly checked, will require
that we can rely on the value of a moved-from string, which is not
something the C++ standard guarantees.  So introduce our own wrapper.

Suggested by Frank Heckenbach.
https://lists.gnu.org/archive/html/bison-patches/2018-09/msg00111.html

* tests/c++.at (Variants): Introduce and use a new 'string' class.
This commit is contained in:
Akim Demaille
2018-09-22 08:47:42 +02:00
parent 21eeee46e9
commit aa5de5728c
1 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/c++.at
View File

@@ -222,8 +222,36 @@ AT_DATA_GRAMMAR([list.y],
#include <sstream> #include <sstream>
#include <string> #include <string>
class string
{
public:
string () {}
typedef std::vector<std::string> strings_type; string (const std::string& s)
: val_(s)
{}
string (const string& s)
: val_(s.val_)
{}
string& operator= (const string& s)
{
val_ = s.val_;
return *this;
}
friend
std::ostream& operator<< (std::ostream& o, const string& s)
{
return o << s.val_;
}
private:
std::string val_;
};
typedef std::vector<string> strings_type;
namespace yy namespace yy
{ {
@@ -255,31 +283,30 @@ AT_DATA_GRAMMAR([list.y],
// Conversion to string. // Conversion to string.
template <typename T> template <typename T>
inline inline
std::string string
to_string (const T& t) to_string (const T& t)
{ {
std::ostringstream o; std::ostringstream o;
o << t; o << t;
return o.str (); return string (o.str ());
} }
} }
} }
%token <::std::string> TEXT; %token <::string> TEXT;
%token <int> NUMBER; %token <int> NUMBER;
%token END_OF_FILE 0; %token END_OF_FILE 0;
%token COMMA "," %token COMMA ","
%type <::std::string> item;
// Using the template type to exercize its parsing.
// Starting with :: to ensure we don't output "<::" which starts by the // Starting with :: to ensure we don't output "<::" which starts by the
// digraph for the left square bracket. // digraph for the left square bracket.
%type <::std::vector<std::string>> list; %type <::string> item;
// Using the template type to exercize its parsing.
%type <::std::vector<string>> list;
%printer { yyo << $$; } %printer { yyo << $$; } <int> <::string> <::std::vector<string>>;
<int> <::std::string> <::std::vector<std::string>>;
%destructor { std::cerr << "Destroy: " << $$ << '\n'; } <*>; %destructor { std::cerr << "Destroy: " << $$ << '\n'; } <*>;
%destructor { std::cerr << "Destroy: \"" << $$ << "\"\n"; } <::std::string>; %destructor { std::cerr << "Destroy: \"" << $$ << "\"\n"; } <::string>;
%% %%
result: result:
@@ -343,7 +370,7 @@ namespace yy
else else
{]AT_TOKEN_CTOR_IF([[ {]AT_TOKEN_CTOR_IF([[
return parser::make_TEXT (to_string (stage)]AT_LOCATION_IF([, location ()])[);]], [[ return parser::make_TEXT (to_string (stage)]AT_LOCATION_IF([, location ()])[);]], [[
yylval->BUILD (std::string, to_string (stage));]AT_LOCATION_IF([ yylval->BUILD (string, to_string (stage));]AT_LOCATION_IF([
*yylloc = location ();])[ *yylloc = location ();])[
return parser::token::TEXT;]])[ return parser::token::TEXT;]])[
} }