Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix grep portability issues.

Browse Source 
Grep on Solaris does not support -q.
Reported by Summum Bonum.

	* NEWS: Add a stub for 2.4.2.
	* THANKS: Add Summum Bonum.
	* tests/atlocal.in (EGREP): New.
	(CC, CXX, XSLTPROC): Make it possible to override them via
	envvars.
	* tests/java.at: Use $EGREP instead of egrep.
	Use AT_CHECK's ignore instead of grep's -q.
This commit is contained in:
Akim Demaille
2009-01-08 09:41:21 +01:00
parent 41930e7ad8
commit 8defe11bfa
5 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2009-01-08 Akim Demaille <demaille@gostai.com>
Fix grep portability issues.
Grep on Solaris does not support -q.
Reported by Summum Bonum.
* NEWS: Add a stub for 2.4.2.
* THANKS: Add Summum Bonum.
* tests/atlocal.in (EGREP): New.
(CC, CXX, XSLTPROC): Make it possible to override them via
envvars.
* tests/java.at: Use $EGREP instead of egrep.
Use AT_CHECK's ignore instead of grep's -q.
2008-12-11 Joel E. Denny <jdenny@ces.clemson.edu> 2008-12-11 Joel E. Denny <jdenny@ces.clemson.edu>
Version 2.4.1. Version 2.4.1.

6
NEWS
View File

@@ -1,6 +1,8 @@
Bison News Bison News
---------- ----------
* Changes in version 2.4.2 (????-??-??):
* Changes in version 2.4.1 (2008-12-11): * Changes in version 2.4.1 (2008-12-11):
** In the GLR defines file, unexpanded M4 macros in the yylval and yylloc ** In the GLR defines file, unexpanded M4 macros in the yylval and yylloc
@@ -1049,9 +1051,9 @@ End:
----- -----
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler. This file is part of Bison, the GNU Parser Generator.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by

3
THANKS
View File

@@ -78,11 +78,12 @@ Raja R Harinath harinath@cs.umn.edu
Richard Stallman rms@gnu.org Richard Stallman rms@gnu.org
Robert Anisko anisko_r@epita.fr Robert Anisko anisko_r@epita.fr
Satya Kiran Popuri satyakiran@gmail.com Satya Kiran Popuri satyakiran@gmail.com
Sebastien Fricker sebastien.fricker@gmail.com
Sebastian Setzer sebastian.setzer.ext@siemens.com Sebastian Setzer sebastian.setzer.ext@siemens.com
Sebastien Fricker sebastien.fricker@gmail.com
Sergei Steshenko sergstesh@yahoo.com Sergei Steshenko sergstesh@yahoo.com
Shura debil_urod@ngs.ru Shura debil_urod@ngs.ru
Steve Murphy murf@parsetree.com Steve Murphy murf@parsetree.com
Summum Bonum sum@geekhouse.org
Tim Josling tej@melbpc.org.au Tim Josling tej@melbpc.org.au
Tim Van Holder tim.van.holder@pandora.be Tim Van Holder tim.van.holder@pandora.be
Tom Lane tgl@sss.pgh.pa.us Tom Lane tgl@sss.pgh.pa.us

13
tests/atlocal.in
View File

@@ -1,11 +1,11 @@
# @configure_input@ -*- shell-script -*- # @configure_input@ -*- shell-script -*-
# Configurable variable values for Bison test suite. # Configurable variable values for Bison test suite.
# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
# Software Foundation, Inc. # 2009 Free Software Foundation, Inc.
# We need a C compiler. # We need a C compiler.
CC='@CC@' : ${CC='@CC@'}
# We want no optimization. # We want no optimization.
CFLAGS='@O0CFLAGS@ @WARN_CFLAGS@ @WERROR_CFLAGS@' CFLAGS='@O0CFLAGS@ @WARN_CFLAGS@ @WERROR_CFLAGS@'
@@ -17,7 +17,7 @@ CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
GCC='@GCC@' GCC='@GCC@'
# The C++ compiler. # The C++ compiler.
CXX='@CXX@' : ${CXX='@CXX@'}
# If 'exit 77'; skip all C++ tests; otherwise ':'. # If 'exit 77'; skip all C++ tests; otherwise ':'.
BISON_CXX_WORKS='@BISON_CXX_WORKS@' BISON_CXX_WORKS='@BISON_CXX_WORKS@'
@@ -38,4 +38,7 @@ CONF_JAVAC='@CONF_JAVAC@'
CONF_JAVA='@CONF_JAVA@' CONF_JAVA='@CONF_JAVA@'
# Empty if no xsltproc was found # Empty if no xsltproc was found
XSLTPROC='@XSLTPROC@' : ${XSLTPROC='@XSLTPROC@'}
# We need egrep.
: ${EGREP='@EGREP@'}

22
tests/java.at
View File

@@ -1,6 +1,6 @@
# Java tests for simple calculator. -*- Autotest -*- # Java tests for simple calculator. -*- Autotest -*-
# Copyright (C) 2007, 2008 Free Software Foundation, Inc. # Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@@ -134,7 +134,7 @@ AT_LOCATION_IF([[
]], [[ ]], [[
public void yyerror (String s) public void yyerror (String s)
{ {
System.err.println (s); System.err.println (s);
} }
]])[ ]])[
@@ -342,7 +342,7 @@ _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null],
# first error is ")", which is needed to recover from the error and # first error is ")", which is needed to recover from the error and
# produce the "0" that triggers the "0 != 1" error. # produce the "0" that triggers the "0 != 1" error.
# #
_AT_CHECK_JAVA_CALC_ERROR([$1], _AT_CHECK_JAVA_CALC_ERROR([$1],
[() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1], [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
[1: syntax error, unexpected ')', expecting number or '-' or '(' or '!' [1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
1: syntax error, unexpected ')', expecting number or '-' or '(' or '!' 1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
@@ -426,7 +426,7 @@ start: "end" {$2};
class m4_default([$3], [Position]) {} class m4_default([$3], [Position]) {}
]) ])
AT_BISON_CHECK([[YYParser.y]]) AT_BISON_CHECK([[YYParser.y]])
AT_CHECK([[grep -q '[mb]4_' YYParser.y]], [1]) AT_CHECK([[grep '[mb]4_' YYParser.y]], [1], [ignore])
AT_JAVA_COMPILE([[YYParser.java]]) AT_JAVA_COMPILE([[YYParser.java]])
]) ])
@@ -458,7 +458,7 @@ m4_define([AT_CHECK_JAVA_MINIMAL_W_LEXER],
{ {
$3 $3
} }
$4 $4
}], [$5], [$7])]) }], [$5], [$7])])
@@ -747,9 +747,9 @@ AT_CHECK_JAVA_MINIMAL([[
%define location_type "MyLoc" %define location_type "MyLoc"
%define position_type "MyPos" %define position_type "MyPos"
%code { class MyPos {} }]], [[$$ = $<java.awt.Color>1;]], [[MyPos]]) %code { class MyPos {} }]], [[$$ = $<java.awt.Color>1;]], [[MyPos]])
AT_CHECK([[grep -q 'java.awt.Color' YYParser.java]]) AT_CHECK([[grep 'java.awt.Color' YYParser.java]], [0], [ignore])
AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Position']], [1]) AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Position']], [1], [ignore])
AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Location']], [1]) AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Location']], [1], [ignore])
AT_CHECK_JAVA_MINIMAL_W_LEXER([[ AT_CHECK_JAVA_MINIMAL_W_LEXER([[
%define stype "java.awt.Color" %define stype "java.awt.Color"
@@ -759,8 +759,8 @@ AT_CHECK_JAVA_MINIMAL_W_LEXER([[
%code { class MyPos {} }]], [], [[return EOF;]], [], %code { class MyPos {} }]], [], [[return EOF;]], [],
[[$$ = $<java.awt.Color>1;]], [[$$ = $<java.awt.Color>1;]],
[[java.awt.Color]], [[MyPos]], [[MyLoc]]) [[java.awt.Color]], [[MyPos]], [[MyLoc]])
AT_CHECK([[grep -q 'java.awt.Color' YYParser.java]]) AT_CHECK([[grep 'java.awt.Color' YYParser.java]], [0], [ignore])
AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Position']], [1]) AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Position']], [1], [ignore])
AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Location']], [1]) AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Location']], [1], [ignore])
AT_CLEANUP AT_CLEANUP