X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly.fixer;h=31e0171e242e8509b0b5dc93321e446c938c73d5;hb=b13c494218827599481238f7c7f4125dd056dce1;hp=00f583c6755fd0022f4013228350805abc0e133c;hpb=dae2d13f8edc3ee84694ec70a87a495ba78e08f2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perly.fixer b/perly.fixer
index 00f583c..31e0171 100755
--- a/perly.fixer
+++ b/perly.fixer
@@ -2,7 +2,7 @@
 
 # Fix up yacc output to allow dynamic allocation.  Since perly.c
 # is now provided with the perl source, this should not be necessary.
-#  
+#
 # However, if the user wishes to use byacc, or wishes to try another 
 # compiler compiler (e.g. bison or yacc), this script will get run.
 # See makefile run_byacc target for more details.
@@ -14,6 +14,12 @@
 #
 # Additional information to make the BSD section work with SunOS 4.0.2
 #   tdinger@East.Sun.COM (Tom Dinger)	4/15/1991
+#
+# Also edit some practices gcc -Wall finds questionable.
+#  
+
+gnupatch=patch
+. ./config.sh
 
 input=$1
 output=$2
@@ -34,13 +40,19 @@ if grep 'yaccpar 1.8 (Berkeley)' $input >/dev/null 2>&1; then
     cp $input $output
     # Don't expect the diff to do everything -- do some by hand
     if test -f perly_c.diff; then
-	patch -F3 $output <perly_c.diff
+	$gnupatch -F3 $output <perly_c.diff
 	sed -e '/^[ 	]*printf("yydebug:/s/printf(/PerlIO_printf(Perl_debug_log, /' \
 	    -e '/^#line /s/"y[.]tab[.]c"/"perly.c"/' \
 	    -e '/\[\] *= *[{]/s/^/static /' \
 	    -e '/^static static/s/^static //' \
 	    -e '/^#define.WORD/,/^#define.ARROW/d' \
 	    -e '/^int.yydebug/,/^#define.yystacksize/d' \
+	    -e 's/^yyerrlab:$//' \
+	    -e 's/^    goto yyerrlab;//' \
+	    -e 's/^yynewerror:$//' \
+	    -e 's/^    goto yynewerror;//' \
+	    -e 's|^static char yysccsid\(.*\)|/* static char yysccsid\1 */|' \
+	    -e 's|deprecate(|deprecate_old(|' \
 	    < $output > $tmp && mv -f $tmp $output || exit 1
 	rm -rf $input
 	echo "If you need to debug perly.c, you need to fix up the #line"
@@ -49,13 +61,19 @@ if grep 'yaccpar 1.8 (Berkeley)' $input >/dev/null 2>&1; then
     exit
 elif grep 'yaccpar	1.9 (Berkeley)' $input >/dev/null 2>&1; then
     if test -f perly.c.dif9; then
-	patch -F3 $output <perly.c.dif9
+	$gnupatch -F3 $output <perly.c.dif9
 	sed -e '/^[ 	]*printf("yydebug:/s/printf(/PerlIO_printf(Perl_debug_log, /' \
 	    -e '/^#line /s/"y[.]tab[.]c"/"perly.c"/' \
 	    -e '/\[\] *= *[{]/s/^/static /' \
 	    -e '/^static static/s/^static //' \
 	    -e '/^#define.WORD/,/^#define.ARROW/d' \
 	    -e '/^int.yydebug/,/^#define.yystacksize/d' \
+	    -e 's/^yyerrlab:$//' \
+	    -e 's/^    goto yyerrlab;//' \
+	    -e 's/^yynewerror:$//' \
+	    -e 's/^    goto yynewerror;//' \
+	    -e 's|^static char yysccsid\(.*\)|/* static char yysccsid\1 */|' \
+	    -e 's|deprecate(|deprecate_old(|' \
 	    < $output > $tmp && mv -f $tmp $output || exit 1
 	rm -rf $input
 	echo "If you need to debug perly.c, you need to fix up the #line"