X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f6038cb8c35c6b1a827fd3f6356d8cc9a002abe0..44bb9084856ec2c421c91e1e1bd0f20437ce83b8:/examples/variant.yy?ds=inline

diff --git a/examples/variant.yy b/examples/variant.yy
index cba6d08c..8471e6e8 100644
--- a/examples/variant.yy
+++ b/examples/variant.yy
@@ -1,9 +1,10 @@
-/* Test file for C++ parsers using variants.
-   Based on an example by Michiel De Wilde <mdewilde.agilent@gmail.com>. */
 %debug
-%skeleton "lalr1-fusion.cc"
+%skeleton "lalr1.cc"
 %defines
+%define assert
 %define variant
+%define lex_symbol
+%locations
 
 %code requires // *.hh
 {
@@ -20,17 +21,17 @@ typedef std::list<std::string> strings_type;
 #include <sstream>
 
   // Prototype of the yylex function providing subsequent tokens.
-  static yy::parser::token_type yylex(yy::parser::semantic_type* yylval);
+  static yy::parser::symbol_type yylex ();
 
   // Printing a list of strings.
   // Koening look up will look into std, since that's an std::list.
   namespace std
   {
     std::ostream&
-    operator<<(std::ostream& o, const strings_type& s)
+    operator<< (std::ostream& o, const strings_type& s)
     {
-      std::copy(s.begin(), s.end(),
-                std::ostream_iterator<strings_type::value_type>(o, "\n"));
+      std::copy (s.begin (), s.end (),
+                 std::ostream_iterator<strings_type::value_type> (o, "\n"));
       return o;
     }
   }
@@ -43,22 +44,23 @@ typedef std::list<std::string> strings_type;
   {
     std::ostringstream o;
     o << t;
-    return o.str();
+    return o.str ();
   }
 }
 
-%token <std::string> TEXT;
+%token <::std::string> TEXT;
 %token <int> NUMBER;
-%printer { debug_stream () << $$; } <int> <std::string> <strings_type>;
+%printer { debug_stream () << $$; }
+   <int> <::std::string> <::std::list<std::string>>;
 %token END_OF_FILE 0;
 
-%type <std::string> item;
-%type <strings_type> list;
+%type <::std::string> item;
+%type <::std::list<std::string>> list;
 
 %%
 
 result:
-  list	{ std::cout << $1 << std::endl; }
+  list  { std::cout << $1 << std::endl; }
 ;
 
 list:
@@ -81,52 +83,40 @@ item:
 // END_OF_FILE
 
 static
-yy::parser::token_type
-yylex (yy::parser::semantic_type* yylval)
+yy::parser::symbol_type
+yylex ()
 {
-  static int stage = 0;
-  yy::parser::token_type result;
-
+  static int stage = -1;
+  ++stage;
+  yy::parser::location_type loc(0, stage + 1, stage + 1);
   switch (stage)
   {
     case 0:
-      yylval->build<std::string> () =
-        std::string ("I have three numbers for you.");
-      result = yy::parser::token::TEXT;
-      break;
+      return yy::parser::make_TEXT ("I have three numbers for you.", loc);
     case 1:
     case 2:
     case 3:
-      yylval->build<int> () = stage;
-      result = yy::parser::token::NUMBER;
-      break;
+      return yy::parser::make_NUMBER (stage, loc);
     case 4:
-      yylval->build<std::string> () = std::string ("And that's all!");
-      result = yy::parser::token::TEXT;
-      break;
+      return yy::parser::make_TEXT ("And that's all!", loc);
     default:
-      result = yy::parser::token::END_OF_FILE;
-      break;
+      return yy::parser::make_END_OF_FILE (loc);
   }
-
-  stage++;
-  return result;
 }
 
 // Mandatory error function
 void
-yy::parser::error (const yy::parser::location_type& yylloc,
-                   const std::string& message)
+yy::parser::error (const yy::parser::location_type& loc, const std::string& msg)
 {
-  std::cerr << yylloc << ": " << message << std::endl;
+  std::cerr << loc << ": " << msg << std::endl;
 }
 
 int
-main (int argc, char *argv[])
+main ()
 {
   yy::parser p;
   p.set_debug_level (!!getenv ("YYDEBUG"));
-  p.parse ();
+  return p.parse ();
 }
 
 // Local Variables: