lalr1.cc: location_type: make sure we don't depend on loc.(begin|end).

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index fddddee422313165ae90e9b1c30f955684121239..08ccbe41cd7dbf959b97aaa0a8aefc7be63dbb6c 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -122,19 +122,15 @@ int
 ])[
     }
 
-]AT_LOCATION_IF([
-  AT_LOC_FIRST_COLUMN = AT_LOC_LAST_COLUMN;
-  AT_LOC_FIRST_LINE   = AT_LOC_LAST_LINE;
-])[
-
-  /* Skip white space.  */
-  while ((c = get_char (]AT_LEX_ARGS[)) == ' ' || c == '\t')
+  /* Skip current token, then white spaces.  */
+  do
     {
 ]AT_LOCATION_IF(
 [     AT_LOC_FIRST_COLUMN = AT_LOC_LAST_COLUMN;
       AT_LOC_FIRST_LINE   = AT_LOC_LAST_LINE;
 ])[
     }
+  while ((c = get_char (]AT_LEX_ARGS[)) == ' ' || c == '\t');
 
   /* process numbers   */
   if (c == '.' || isdigit (c))
@@ -160,7 +156,7 @@ AT_SKEL_CC_IF(
 [%define global_tokens_and_yystype])[
 %code requires
 {
-]AT_LOCATION_TYPE_IF([
+]AT_LOCATION_TYPE_IF([[
 # include <iostream>
   struct Point
   {
@@ -170,10 +166,24 @@ AT_SKEL_CC_IF(
 
   struct Span
   {
-    Point begin;
-    Point end;
+    Point first;
+    Point last;
   };
-])[
+
+# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
+do {                                                                    \
+  if (N)                                                                \
+    {                                                                   \
+      (Current).first = (Rhs)[1].location.first;                       \
+      (Current).last  = (Rhs)[N].location.last;                         \
+    }                                                                   \
+  else                                                                  \
+    {                                                                   \
+      (Current).first = (Current).last = (Rhs)[0].location.last;       \
+    }                                                                   \
+} while (false)
+
+]])[
   /* Exercise pre-prologue dependency to %union.  */
   typedef int semantic_value;
 }
@@ -211,6 +221,7 @@ FILE *input;
 static semantic_value global_result = 0;
 static int global_count = 0;
 static int power (int base, int exponent);
+
 ]AT_SKEL_CC_IF(,
 [/* yyerror receives the location if:
    - %location & %pure & %glr
@@ -282,11 +293,11 @@ exp:
   std::ostream&
   operator<< (std::ostream& o, const Span& s)
   {
-    o << s.begin.l << '.' << s.begin.c;
-    if (s.begin.l != s.end.l)
-      o << '-' << s.end.l << '.' << s.end.c - 1;
-    else if (s.begin.c != s.end.c - 1)
-      o << '-' << s.end.c - 1;
+    o << s.first.l << '.' << s.first.c;
+    if (s.first.l != s.last.l)
+      o << '-' << s.last.l << '.' << s.last.c - 1;
+    else if (s.first.c != s.last.c - 1)
+      o << '-' << s.last.c - 1;
     return o;
   }
 ]])