diagnostics: fix the order of multiple declarations reports

[bison.git] / tests / push.at

diff --git a/tests/push.at b/tests/push.at
index 1b99397175c95c7a535f6ceffd9bdb96d5e7fe27..d39ca56a9e052a8501e9db3954a0864e14fd41b5 100644 (file)
--- a/tests/push.at
+++ b/tests/push.at
@@ -1,6 +1,6 @@
 # Checking Push Parsing.                            -*- Autotest -*-
 
 # Checking Push Parsing.                            -*- Autotest -*-
 

-# Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2013 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
 
 # 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


@@ -57,12 +57,12 @@ main (void)
   /* yypstate_delete used to leak ps->yyss if the stack was reallocated but the
      parse did not return on success, syntax error, or memory exhaustion.  */
   ps = yypstate_new ();
   /* yypstate_delete used to leak ps->yyss if the stack was reallocated but the
      parse did not return on success, syntax error, or memory exhaustion.  */
   ps = yypstate_new ();

-  assert (yypush_parse (ps, 'a', YY_NULL) == YYPUSH_MORE);
+  assert (yypush_parse (ps, 'a', YY_NULLPTR) == YYPUSH_MORE);

   yypstate_delete (ps);
 
   ps = yypstate_new ();
   yypstate_delete (ps);
 
   ps = yypstate_new ();

-  assert (yypush_parse (ps, 'a', YY_NULL) == YYPUSH_MORE);
-  assert (yypush_parse (ps, 'b', YY_NULL) == YYPUSH_MORE);
+  assert (yypush_parse (ps, 'a', YY_NULLPTR) == YYPUSH_MORE);
+  assert (yypush_parse (ps, 'b', YY_NULLPTR) == YYPUSH_MORE);

   yypstate_delete (ps);
 
   return 0;
   yypstate_delete (ps);
 
   return 0;


@@ -111,11 +111,11 @@ main (void)
     {
       yypstate *ps = yypstate_new ();
       assert (ps);
     {
       yypstate *ps = yypstate_new ();
       assert (ps);

-      assert (yypstate_new () == YY_NULL);
+      assert (yypstate_new () == YY_NULLPTR);

       ]m4_if([$1], [[both]], [[assert (yyparse () == 2)]])[;
       yychar = 0;
       assert (yypush_parse (ps) == 0);
       ]m4_if([$1], [[both]], [[assert (yyparse () == 2)]])[;
       yychar = 0;
       assert (yypush_parse (ps) == 0);

-      assert (yypstate_new () == YY_NULL);
+      assert (yypstate_new () == YY_NULLPTR);

       ]m4_if([$1], [[both]], [[assert (yyparse () == 2)]])[;
       yypstate_delete (ps);
     }
       ]m4_if([$1], [[both]], [[assert (yyparse () == 2)]])[;
       yypstate_delete (ps);
     }