X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8b807f1177634400b307b32f120f16adfd0cead0..671850a1c3e1aaac93a89fabc6d810be6a4a77fe:/tests/regression.at?ds=sidebyside

diff --git a/tests/regression.at b/tests/regression.at
index f101f218..d2cb7de2 100644
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -1,6 +1,6 @@
 # Bison Regressions.                               -*- Autotest -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2015 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
@@ -378,8 +378,8 @@ exp: %empty;
 ]])
 
 AT_BISON_CHECK([-v -Wall -o input.c input.y], 0, [],
-[[input.y:1.29-32: warning: useless precedence and associativity for "||" [-Wprecedence]
-input.y:2.29-32: warning: useless precedence and associativity for "<=" [-Wprecedence]
+[[input.y:3.1-5: warning: useless precedence and associativity for "||" [-Wprecedence]
+input.y:3.1-5: warning: useless precedence and associativity for "<=" [-Wprecedence]
 ]])
 
 AT_CLEANUP
@@ -770,7 +770,7 @@ static const yytype_uint8 yyrline[] =
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"",
-  "\"else\"", "$accept", "statement", "struct_stat", "if", "else", YY_NULL
+  "\"else\"", "$accept", "statement", "struct_stat", "if", "else", YY_NULLPTR
 };
 static const yytype_uint16 yytoknum[] =
 {
@@ -1145,15 +1145,15 @@ sr_conflict:
 ]AT_YYLEX_DEFINE([{ 1, 2, 3, 0 }])[
 ]AT_MAIN_DEFINE[
 ]])
-AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-Wall -o input.c input.y]], [[0]],,
 [[input.y:24.5-19: warning: rule useless in parser due to conflicts [-Wother]
 input.y:28.5-19: warning: rule useless in parser due to conflicts [-Wother]
-input.y:18.7-9: warning: useless precedence and associativity for TK1 [-Wprecedence]
+input.y:18.1-5: warning: useless precedence and associativity for TK1 [-Wprecedence]
 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]])
+AT_BISON_OPTION_POPDEFS
 
 AT_CLEANUP