Use locations in the variant example.

Yes, this obfuscates the point of this example, variants only.  But glr.cc
cannot work (yet?) without locations.  This change makes it easier to use
this example with glr.cc.

	* examples/variant.yy (assert): %define it.
	(locations): Request them.
	(yylex): Bind the location to the stage.

diff --git a/ChangeLog b/ChangeLog
index bf2431284bcf70ad23ba8dbc039353ad33307aca..6f8df1a9e6653cbc317bf21624a489bead8ce1fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-02  Akim Demaille  <demaille@gostai.com>
+
+       Use locations in the variant example.
+       Yes, this obfuscates the point of this example, variants only.  But glr.cc
+       cannot work (yet?) without locations.  This change makes it easier to use
+       this example with glr.cc.
+       
+       * examples/variant.yy (assert): %define it.
+       (locations): Request them.
+       (yylex): Bind the location to the stage.
+
 2009-03-02  Akim Demaille  <demaille@gostai.com>
 
        Dub make_TOKEN as a public type interface.

diff --git a/examples/variant.yy b/examples/variant.yy
index fe5dce0fa9219b7b85ee1a4997c38fcf7f6a3c22..8471e6e8adc6ba033fd9ce6cbf0c6e8584f1c436 100644 (file)
--- a/examples/variant.yy
+++ b/examples/variant.yy
@@ -1,8 +1,10 @@
 %debug
 %skeleton "lalr1.cc"
 %defines
+%define assert
 %define variant
 %define lex_symbol
+%locations
 
 %code requires // *.hh
 {
@@ -85,26 +87,28 @@ yy::parser::symbol_type
 yylex ()
 {
   static int stage = -1;
-  switch (++stage)
+  ++stage;
+  yy::parser::location_type loc(0, stage + 1, stage + 1);
+  switch (stage)
   {
     case 0:
-      return yy::parser::make_TEXT ("I have three numbers for you.");
+      return yy::parser::make_TEXT ("I have three numbers for you.", loc);
     case 1:
     case 2:
     case 3:
-      return yy::parser::make_NUMBER (stage);
+      return yy::parser::make_NUMBER (stage, loc);
     case 4:
-      return yy::parser::make_TEXT ("And that's all!");
+      return yy::parser::make_TEXT ("And that's all!", loc);
     default:
-      return yy::parser::make_END_OF_FILE ();
+      return yy::parser::make_END_OF_FILE (loc);
   }
 }
 
 // Mandatory error function
 void
-yy::parser::error (const std::string& message)
+yy::parser::error (const yy::parser::location_type& loc, const std::string& msg)
 {
-  std::cerr << message << std::endl;
+  std::cerr << loc << ": " << msg << std::endl;
 }
 
 int