X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3ebecc240d845191154734074e64dc9d15cb1daa..d0ee410565c9d7bc876af42583ee092568f44fa8:/tests/actions.at?ds=sidebyside

diff --git a/tests/actions.at b/tests/actions.at
index 66dc6277..e17f7003 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,20 +1,19 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+# Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# 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 2, or (at your option)
-# any later version.
-
+# 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AT_BANNER([[User Actions.]])
 
@@ -178,7 +177,7 @@ m4_if([$1$2$3], $[1]$[2]$[3], [],
 # helping macros.  So don't put any directly in the Bison file.
 AT_BISON_OPTION_PUSHDEFS([$5])
 AT_DATA_GRAMMAR([[input.y]],
-[[%requires {
+[[%code requires {
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -196,8 +195,8 @@ m4_ifval([$6], [%union
 {
   int ival;
 }])
-AT_LALR1_CC_IF([%define "global_tokens_and_yystype"])
-m4_ifval([$6], [[%provides {]], [[%code {]])
+AT_LALR1_CC_IF([%define global_tokens_and_yystype])
+m4_ifval([$6], [[%code provides {]], [[%code {]])
 AT_LALR1_CC_IF([typedef yy::location YYLTYPE;])
 [static int yylex (]AT_LEX_FORMALS[);
 ]AT_LALR1_CC_IF([], [static void yyerror (const char *msg);])
@@ -959,7 +958,7 @@ AT_CLEANUP
 ## Default %printer and %destructor are not for error or $undefined.  ##
 ## ------------------------------------------------------------------ ##
 
-AT_SETUP([Default %printer and %destructor are not for error or \$undefined])
+AT_SETUP([Default %printer and %destructor are not for error or $undefined])
 
 # If Bison were to apply the default %printer and %destructor to the error
 # token or to $undefined:
@@ -1069,7 +1068,7 @@ AT_CLEANUP
 ## Default %printer and %destructor are not for $accept.  ##
 ## ------------------------------------------------------ ##
 
-AT_SETUP([Default %printer and %destructor are not for \$accept])
+AT_SETUP([Default %printer and %destructor are not for $accept])
 
 # If YYSTYPE is a union and Bison were to apply the default %printer and
 # %destructor to $accept:
@@ -1246,3 +1245,62 @@ Stack now 0
 ]])
 
 AT_CLEANUP
+
+
+## ----------------------- ##
+## @$ implies %locations.  ##
+## ----------------------- ##
+
+# Bison once forgot to check for @$ in actions other than semantic actions.
+
+# AT_CHECK_ACTION_LOCATIONS(ACTION-DIRECTIVE)
+# -------------------------------------------------------
+m4_define([AT_CHECK_ACTION_LOCATIONS],
+[AT_SETUP([[@$ in ]$1[ implies %locations]])
+
+AT_DATA_GRAMMAR([[input.y]],
+[[%code {
+  #include <stdio.h>
+  static int yylex (void);
+  static void yyerror (char const *msg);
+}
+
+%debug
+
+]$1[ {
+  printf ("%d\n", @$.first_line);
+} ]m4_if($1, [%initial-action], [], [[start]])[
+
+%%
+
+start:  ;
+
+%%
+
+static int
+yylex (void)
+{
+  return 0;
+}
+
+static void
+yyerror (char const *msg)
+{
+  fprintf (stderr, "%s\n", msg);
+}
+
+int
+main (void)
+{
+  return yyparse ();
+}
+]])
+
+AT_CHECK([[bison -o input.c input.y]])
+AT_COMPILE([[input]])
+
+AT_CLEANUP])
+
+AT_CHECK_ACTION_LOCATIONS([[%initial-action]])
+AT_CHECK_ACTION_LOCATIONS([[%destructor]])
+AT_CHECK_ACTION_LOCATIONS([[%printer]])