uniqstr wasn't being used for handle_syncline like it should.

[bison.git] / tests / conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 259827bda6021fb97c98e8c7813d6b6c23f79ae4..381b49ef99659214d1ef9ceb37661946b75d966e 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,6 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004 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
@@ -55,10 +55,7 @@ AT_DATA_GRAMMAR([input.y],
 [[
 %{
 #include <stdio.h>
-
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #define YYERROR_VERBOSE 1
 static void
@@ -550,11 +547,11 @@ input.y: warning: expected 0 reduce/reduce conflicts
 AT_CLEANUP
 
 
-## ---------------------------- ##
-## %default-prec without %prec  ##
-## ---------------------------- ##
+## ------------------------------- ##
+## %no-default-prec without %prec  ##
+## ------------------------------- ##
 
-AT_SETUP([%default-prec without %prec])
+AT_SETUP([%no-default-prec without %prec])
 
 AT_DATA([[input.y]],
 [[%left '+'
@@ -562,7 +559,7 @@ AT_DATA([[input.y]],
 
 %%
 
-%default-prec 0;
+%no-default-prec;
 
 e:   e '+' e
    | e '*' e
@@ -576,11 +573,11 @@ AT_CHECK([bison -o input.c input.y], 0, [],
 AT_CLEANUP
 
 
-## ------------------------- ##
-## %default-prec with %prec  ##
-## ------------------------- ##
+## ---------------------------- ##
+## %no-default-prec with %prec  ##
+## ---------------------------- ##
 
-AT_SETUP([%default-prec with %prec])
+AT_SETUP([%no-default-prec with %prec])
 
 AT_DATA([[input.y]],
 [[%left '+'
@@ -588,7 +585,7 @@ AT_DATA([[input.y]],
 
 %%
 
-%default-prec 0;
+%no-default-prec;
 
 e:   e '+' e %prec '+'
    | e '*' e %prec '*'
@@ -601,10 +598,10 @@ AT_CLEANUP
 
 
 ## ---------------- ##
-## %default-prec 1  ##
+## %default-prec    ##
 ## ---------------- ##
 
-AT_SETUP([%default-prec 1])
+AT_SETUP([%default-prec])
 
 AT_DATA([[input.y]],
 [[%left '+'
@@ -612,7 +609,7 @@ AT_DATA([[input.y]],
 
 %%
 
-%default-prec 1;
+%default-prec;
 
 e:   e '+' e
    | e '*' e