From 535ee0cb54b7fec32b5dea3433d0e9d993761bf6 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@lrde.epita.fr>
Date: Thu, 20 Sep 2012 11:42:06 +0200
Subject: [PATCH] tests: minor improvements

* tests/c++.at: Space changes.
Use AT_YYERROR_DEFINE.
* tests/local.at (AT_YYERROR_DEFINE): Issue errors on unknown languages.
---
 tests/c++.at   | 9 ++++-----
 tests/local.at | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/c++.at b/tests/c++.at
index 93675d4d..c44a2a59 100644
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -1,4 +1,4 @@
-# Checking the output filenames.                    -*- Autotest -*-
+# Checking the C++ Features.                    -*- Autotest -*-
 
 # Copyright (C) 2004-2005, 2007, 2009-2012 Free Software Foundation,
 # Inc.
@@ -30,6 +30,7 @@ m4_define([AT_CHECK_DOXYGEN],
 	 [m4_fatal([invalid argument: $1])])
 AT_SETUP([Doxygen $1 Documentation])
 
+AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc"])
 AT_DATA([input.yy],
 [[%skeleton "lalr1.cc"
 %locations
@@ -38,10 +39,7 @@ AT_DATA([input.yy],
 %%
 exp:;
 %%
-yy::parser::error (const location& l, const std::string& m)
-{
-  std::cerr << l << s << std::endl;
-}
+]AT_YYERROR_DEFINE[
 ]])
 
 AT_BISON_CHECK([-o input.cc input.yy], 0)
@@ -94,6 +92,7 @@ EXTRACT_STATIC         = AT_DOXYGEN_PRIVATE
 AT_CHECK([doxygen --version || exit 77], 0, ignore)
 AT_CHECK([doxygen], 0, [], [ignore])
 
+AT_BISON_OPTION_POPDEFS
 AT_CLEANUP
 
 m4_popdef([AT_DOXYGEN_PRIVATE])
diff --git a/tests/local.at b/tests/local.at
index 2362e766..036b0a1d 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -405,7 +405,8 @@ void
   public void yyerror (String s)
   {
     System.err.println (s);
-  }]])])dnl
+  }]])],
+[m4_fatal([$0: invalid language: ]AT_LANG)])dnl
 ])
 
 
-- 
2.45.2