X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c373bf8bb8da68ed12b1e73aaa2d777f6c701e46..fa8195091647391bc39089e26dd9c6f9e1f4be24:/tests/push.at?ds=inline

diff --git a/tests/push.at b/tests/push.at
index a3222382..70c1fdce 100644
--- a/tests/push.at
+++ b/tests/push.at
@@ -33,7 +33,7 @@ AT_DATA_GRAMMAR([[input.y]],
   void yyerror (char const *msg);
 %}
 
-%pure-parser %define api.push_pull "push"
+%define api.pure %define api.push_pull "push"
 
 %%
 
@@ -71,7 +71,7 @@ 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]])
 
@@ -83,6 +83,7 @@ AT_CLEANUP
 
 AT_SETUP([[Push Parsing: Multiple impure instances]])
 
+m4_pushdef([AT_MULTIPLE_IMPURE_INSTANCES_CHECK], [
 AT_DATA_GRAMMAR([[input.y]],
 [[
 %{
@@ -92,7 +93,7 @@ AT_DATA_GRAMMAR([[input.y]],
   int yylex (void);
 %}
 
-%define api.push_pull "both"
+%define api.push_pull "]$1["
 
 %%
 
@@ -123,11 +124,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);
     }
 
@@ -135,18 +136,15 @@ 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
 
@@ -163,7 +161,7 @@ AT_DATA([[input.y]],
 start: ;
 ]])
 
-AT_CHECK([[bison input.y]], [0], [],
+AT_BISON_CHECK([[input.y]], [0], [],
 [[input.y:2.9-21: warning: %define variable `api.push_pull' is not used
 ]])