lalr1.cc: rename lex_symbol as api.token.constructor

[bison.git] / examples / variant.yy

diff --git a/examples/variant.yy b/examples/variant.yy
index 016c4b2ad07d3c4a6a20d5fd138a3cb30cc04b86..25f476a5baa9dda70b8c9ee5955cc8890e8bf46f 100644 (file)
--- a/examples/variant.yy
+++ b/examples/variant.yy
@@ -1,8 +1,27 @@
+/*
+  Copyright (C) 2008-2012 Free Software Foundation, Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+

 %debug
 %skeleton "lalr1.cc"
 %defines
 %debug
 %skeleton "lalr1.cc"
 %defines

+%define api.token.constructor
+%define parse.assert

 %define variant
 %define variant

-%define lex_symbol
+%locations

 
 %code requires // *.hh
 {
 
 %code requires // *.hh
 {


@@ -19,7 +38,10 @@ typedef std::list<std::string> strings_type;
 #include <sstream>
 
   // Prototype of the yylex function providing subsequent tokens.
 #include <sstream>
 
   // Prototype of the yylex function providing subsequent tokens.

-  static yy::parser::symbol_type yylex ();
+  namespace yy
+  {
+    static parser::symbol_type yylex ();
+  }

 
   // Printing a list of strings.
   // Koening look up will look into std, since that's an std::list.
 
   // Printing a list of strings.
   // Koening look up will look into std, since that's an std::list.


@@ -46,13 +68,14 @@ typedef std::list<std::string> strings_type;
   }
 }
 
   }
 }
 

-%token <std::string> TEXT;
+%token <::std::string> TEXT;

 %token <int> NUMBER;
 %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;
 
 %token END_OF_FILE 0;
 

-%type <std::string> item;
-%type <strings_type> list;
+%type <::std::string> item;
+%type <::std::list<std::string>> list;

 
 %%
 
 
 %%
 


@@ -71,39 +94,44 @@ item:
 ;
 %%
 
 ;
 %%
 

-// The yylex function providing subsequent tokens:
-// TEXT         "I have three numbers for you:"
-// NUMBER       1
-// NUMBER       2
-// NUMBER       3
-// TEXT         " and that's all!"
-// END_OF_FILE
-
-static
-yy::parser::symbol_type
-yylex ()
+namespace yy

 {
 {

-  static int stage = -1;
-  switch (++stage)
+  // The yylex function providing subsequent tokens:
+  // TEXT         "I have three numbers for you."
+  // NUMBER       1
+  // NUMBER       2
+  // NUMBER       3
+  // TEXT         "And that's all!"
+  // END_OF_FILE
+
+  static
+  parser::symbol_type
+  yylex ()

   {
   {

-    case 0:
-      return yy::parser::make_TEXT ("I have three numbers for you.");
-    case 1:
-    case 2:
-    case 3:
-      return yy::parser::make_NUMBER (stage);
-    case 4:
-      return yy::parser::make_TEXT ("And that's all!");
-    default:
-      return yy::parser::make_END_OF_FILE ();
+    static int stage = -1;
+    ++stage;
+    parser::location_type loc(0, stage + 1, stage + 1);
+    switch (stage)
+      {
+      case 0:
+        return parser::make_TEXT ("I have three numbers for you.", loc);
+      case 1:
+      case 2:
+      case 3:
+        return parser::make_NUMBER (stage, loc);
+      case 4:
+        return parser::make_TEXT ("And that's all!", loc);
+      default:
+        return parser::make_END_OF_FILE (loc);
+      }

   }
   }

-}

 
 

-// Mandatory error function
-void
-yy::parser::error (const std::string& message)
-{
-  std::cerr << message << std::endl;
+  // Mandatory error function
+  void
+  parser::error (const parser::location_type& loc, const std::string& msg)
+  {
+    std::cerr << loc << ": " << msg << std::endl;
+  }

 }
 
 int
 }
 
 int