X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1b17b01d0fa00512e2d7b561757336bff9784fa0..62a87154b3bb1af77ee153603972090a600bafce:/tests/push.at

diff --git a/tests/push.at b/tests/push.at
index 16ca4132..adb51358 100644
--- a/tests/push.at
+++ b/tests/push.at
@@ -1,5 +1,6 @@
 # Checking Push Parsing.                            -*- Autotest -*-
-# Copyright (C) 2007 Free Software Foundation, Inc.
+
+# Copyright (C) 2007, 2009-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
@@ -16,11 +17,11 @@
 
 AT_BANNER([[Push Parsing Tests]])
 
-## ---------------------------------------------- ##
-## Push Parsing: Memory Leak for Early Deletion.  ##
-## ---------------------------------------------- ##
+## -------------------------------- ##
+## Memory Leak for Early Deletion.  ##
+## -------------------------------- ##
 
-AT_SETUP([[Push Parsing: Memory Leak for Early Deletion]])
+AT_SETUP([[Memory Leak for Early Deletion]])
 
 # Requires Valgrind.
 
@@ -33,7 +34,7 @@ AT_DATA_GRAMMAR([[input.y]],
   void yyerror (char const *msg);
 %}
 
-%pure-parser %push-parser
+%define api.pure %define api.push-pull push
 
 %%
 
@@ -71,19 +72,19 @@ main (void)
 }
 ]])
 
-AT_CHECK([[bison -o input.c input.y]])
+AT_BISON_CHECK([[-o input.c input.y]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]])
 
 AT_CLEANUP
 
+## --------------------------- ##
+## Multiple impure instances.  ##
+## --------------------------- ##
 
-## ----------------------------------------- ##
-## Push Parsing: Multiple impure instances.  ##
-## ----------------------------------------- ##
-
-AT_SETUP([[Push Parsing: Multiple impure instances]])
+AT_SETUP([[Multiple impure instances]])
 
+m4_pushdef([AT_MULTIPLE_IMPURE_INSTANCES_CHECK], [
 AT_DATA_GRAMMAR([[input.y]],
 [[
 %{
@@ -93,7 +94,7 @@ AT_DATA_GRAMMAR([[input.y]],
   int yylex (void);
 %}
 
-%push-pull-parser
+%define api.push-pull ]$1[
 
 %%
 
@@ -124,11 +125,11 @@ main (void)
       ps = yypstate_new ();
       assert (ps);
       assert (yypstate_new () == NULL);
-      assert (yyparse () == 2);
+      ]m4_if([$1], [[both]], [[assert (yyparse () == 2)]])[;
       yychar = 0;
       assert (yypush_parse (ps) == 0);
       assert (yypstate_new () == NULL);
-      assert (yyparse () == 2);
+      ]m4_if([$1], [[both]], [[assert (yyparse () == 2)]])[;
       yypstate_delete (ps);
     }
 
@@ -136,17 +137,33 @@ main (void)
 }
 ]])
 
-AT_CHECK([[bison -o input.c input.y]])
+AT_BISON_CHECK([[-o input.c input.y]])
 AT_COMPILE([[input]])
-AT_PARSER_CHECK([[./input]], 0, [],
-[[cannot allocate multiple impure push-parser instances
-cannot allocate multiple impure push-parser instances
-cannot allocate multiple impure push-parser instances
-cannot allocate multiple impure push-parser instances
-cannot allocate multiple impure push-parser instances
-cannot allocate multiple impure push-parser instances
-cannot allocate multiple impure push-parser instances
-cannot allocate multiple impure push-parser instances
+AT_PARSER_CHECK([[./input]])
+])
+
+AT_MULTIPLE_IMPURE_INSTANCES_CHECK([[both]])
+AT_MULTIPLE_IMPURE_INSTANCES_CHECK([[push]])
+
+m4_popdef([AT_MULTIPLE_IMPURE_INSTANCES_CHECK])
+
+AT_CLEANUP
+
+## ----------------------- ##
+## Unsupported Skeletons.  ##
+## ----------------------- ##
+
+AT_SETUP([[Unsupported Skeletons]])
+
+AT_DATA([[input.y]],
+[[%glr-parser
+%define api.push-pull push
+%%
+start: ;
+]])
+
+AT_BISON_CHECK([[input.y]], [[1]], [],
+[[input.y:2.9-21: %define variable 'api.push-pull' is not used
 ]])
 
 AT_CLEANUP