X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ecbca7db4b65178157d09e658fa759d0d9b79a52..56d60c19479822159e56960616cb3602e31f2a2c:/tests/calc.at

diff --git a/tests/calc.at b/tests/calc.at
index 5bb746f7..c5040083 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,6 +1,6 @@
 # Simple calculator.                         -*- Autotest -*-
 
-# Copyright (C) 2000-2010 Free Software Foundation, Inc.
+# Copyright (C) 2000-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
@@ -156,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
   {
@@ -166,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 = YYRHSLOC (Rhs, 1).first;                      \
+        (Current).last  = YYRHSLOC (Rhs, N).last;                       \
+      }                                                                 \
+    else                                                                \
+      {                                                                 \
+        (Current).first = (Current).last = YYRHSLOC (Rhs, 0).last;      \
+      }                                                                 \
+  while (false)
+
+]])[
   /* Exercise pre-prologue dependency to %union.  */
   typedef int semantic_value;
 }
@@ -193,6 +207,7 @@ extern FILE *input;]AT_SKEL_CC_IF([[
 
 %code
 {
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #if HAVE_UNISTD_H
@@ -207,6 +222,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
@@ -225,7 +241,7 @@ int yylex (]AT_LEX_FORMALS[);
    are stored in a union, from which objects with constructors are
    excluded in C++. */
 %initial-action {
-  @$.initialize (0);
+  @$.initialize ();
 }
 ])])[
 
@@ -278,11 +294,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;
   }
 ]])
@@ -332,8 +348,7 @@ static int
 power (int base, int exponent)
 {
   int res = 1;
-  if (exponent < 0)
-    exit (3);
+  assert (0 <= exponent);
   for (/* Niente */; exponent; --exponent)
     res *= base;
   return res;
@@ -697,6 +712,7 @@ m4_define([AT_CHECK_CALC_GLR_CC],
 [AT_CHECK_CALC([%language "C++" %glr-parser %defines %locations] $@)])
 
 AT_CHECK_CALC_GLR_CC([])
+AT_CHECK_CALC_GLR_CC([%define location_type Span])
 AT_CHECK_CALC_GLR_CC([%error-verbose %name-prefix "calc" %verbose %yacc])
 
 AT_CHECK_CALC_GLR_CC([%debug])