X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly.fixer;h=daa558e84e4cd7d408634f3e280149e019a061a8;hb=d20626d86bf3d55ba658adbc2678de4c519cbc6c;hp=8dc533efc109b9706734a8a5c46aa14727a9eaf4;hpb=93a17b20b6d176db3f04f51a63b0a781e5ffd11c;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perly.fixer b/perly.fixer index 8dc533e..daa558e 100755 --- a/perly.fixer +++ b/perly.fixer @@ -1,5 +1,14 @@ #!/bin/sh +# 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. +# +# Currently, only byacc version 1.8 is fully supported. +# # Hacks to make it work with Interactive's SysVr3 Version 2.2 # doughera@lafvax.lafayette.edu (Andy Dougherty) 3/23/91 # @@ -10,22 +19,68 @@ input=$1 output=$2 tmp=/tmp/f$$ -if test -f perly.c.diff; then +if grep 'yaccpar 1.8 (Berkeley)' $input >/dev/null 2>&1; then cp $input $output - patch -F3 $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" + echo "directives yourself." + fi exit +elif grep 'yaccpar 1.9 (Berkeley)' $input >/dev/null 2>&1; then + if test -f perly.c.dif9; then + patch -F3 $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" + echo "directives yourself." + exit 0 + else + echo "Diffs from byacc-1.9 are not available." + echo "If you wish to proceed anyway, do" + echo "cp $input $output" + echo "cp y.tab.h perly.h" + echo "and re-run make. Otherwise, I will use the old perly.c" + touch perly.c + # Exit with error status to stop make. + exit 1 + fi fi plan="unknown" +echo "" +echo "Warning: the yacc you have used is not directly supported by perl." +echo "The perly.fixer script will attempt to make some changes to the generated" +echo "file. The changes may be incomplete and that might lead to problems later" +echo "(especially with complex scripts). You may need to apply the changes" +echo "embedded in perl.fixer (and/or perly_c.dif*) by hand." +echo "" + +# Below, we check for various characteristic yaccpar outputs. + # Test for BSD 4.3 version. # Also tests for the SunOS 4.0.2 version egrep 'YYSTYPE[ ]*yyv\[ *YYMAXDEPTH *\]; short[ ]*yys\[ *YYMAXDEPTH *\] *; yyps *= *&yys\[ *-1 *\]; yypv *= *&yyv\[ *-1 *\]; -if *\( *\+\+yyps *>=* *&yys\[ *YYMAXDEPTH *\] *\)' $input >$tmp +if *\( *\+\+yyps *>=* *&yys\[ *YYMAXDEPTH *\] *\)' $input >$tmp 2>/dev/null set `wc -l $tmp` if test "$1" = "5"; then @@ -33,12 +88,12 @@ if test "$1" = "5"; then fi if test "$plan" = "unknown"; then - # Test for ISC 2.2 version. + # Test for ISC 2.2 version (probably generic SysVr3). egrep 'YYSTYPE[ ]*yyv\[ *YYMAXDEPTH *\]; int[ ]*yys\[ *YYMAXDEPTH *\] *; yyps *= *&yys\[ *-1 *\]; yypv *= *&yyv\[ *-1 *\]; -if *\( *\+\+yy_ps *>= *&yys\[ *YYMAXDEPTH *\] *\)' $input >$tmp +if *\( *\+\+yy_ps *>= *&yys\[ *YYMAXDEPTH *\] *\)' $input >$tmp 2>/dev/null set `wc -l $tmp` if test "$1" = "5"; then @@ -46,13 +101,15 @@ if *\( *\+\+yy_ps *>= *&yys\[ *YYMAXDEPTH *\] *\)' $input >$tmp fi fi +# ------ + case "$plan" in ################################################################## # The SunOS 4.0.2 version has the comparison fixed already. # Also added are out of memory checks (makes porting the generated # code easier) For most systems, it can't hurt. -- TD "bsd43") - echo "Patching perly.c to allow dynamic yacc stack allocation" + echo "Attempting to patch perly.c to allow dynamic yacc stack allocation" echo "Assuming bsd4.3 yaccpar" cat >$tmp <<'END' /YYSTYPE[ ]*yyv\[ *YYMAXDEPTH *\];/c\ @@ -67,8 +124,8 @@ short *maxyyps; /yypv *= *&yyv\[ *-1 *\];/c\ \ if (!yyv) {\ -\ yyv = (YYSTYPE*) malloc(yymaxdepth * sizeof(YYSTYPE));\ -\ yys = (short*) malloc(yymaxdepth * sizeof(short));\ +\ New(73, yyv, yymaxdepth, YYSTYPE);\ +\ New(73, yys, yymaxdepth, short);\ \ if ( !yyv || !yys ) {\ \ yyerror( "out of memory" );\ \ return(1);\ @@ -85,10 +142,8 @@ short *maxyyps; \ int ts = yyps - yys;\ \ \ yymaxdepth *= 2;\ -\ yyv = (YYSTYPE*)realloc((char*)yyv,\ -\ yymaxdepth*sizeof(YYSTYPE));\ -\ yys = (short*)realloc((char*)yys,\ -\ yymaxdepth*sizeof(short));\ +\ Renew(yyv, yymaxdepth, YYSTYPE);\ +\ Renew(yys, yymaxdepth, short);\ \ if ( !yyv || !yys ) {\ \ yyerror( "yacc stack overflow" );\ \ return(1);\ @@ -101,11 +156,15 @@ short *maxyyps; /yacc stack overflow.*}/d /yacc stack overflow/,/}/d END - sed -f $tmp <$input >$output ;; + if sed -f $tmp <$input >$output + then echo "The edit seems to have been applied okay." + else echo "The edit seems to have failed!" + fi + ;; ####################################################### "isc") # Interactive Systems 2.2 version - echo "Patching perly.c to allow dynamic yacc stack allocation" + echo "Attempting to patch perly.c to allow dynamic yacc stack allocation" echo "Assuming Interactive SysVr3 2.2 yaccpar" # Easier to simply put whole script here than to modify the # bsd script with sed. @@ -128,8 +187,8 @@ int *maxyyps; /yypv *= *&yyv\[ *-1 *\];/c\ \ if (!yyv) {\ -\ yyv = (YYSTYPE*) malloc(yymaxdepth * sizeof(YYSTYPE));\ -\ yys = (int*) malloc(yymaxdepth * sizeof(int));\ +\ New(73, yyv, yymaxdepth, YYSTYPE);\ +\ New(73, yys, yymaxdepth, int);\ \ maxyyps = &yys[yymaxdepth];\ \ }\ \ yyps = &yys[-1];\ @@ -141,21 +200,28 @@ int *maxyyps; \ int ts = yy_ps - yys;\ \ \ yymaxdepth *= 2;\ -\ yyv = (YYSTYPE*)realloc((char*)yyv,\ -\ yymaxdepth*sizeof(YYSTYPE));\ -\ yys = (int*)realloc((char*)yys,\ -\ yymaxdepth*sizeof(int));\ +\ Renew(yyv, yymaxdepth, YYSTYPE);\ +\ Renew(yys, yymaxdepth, int);\ \ yy_ps = yyps = yys + ts;\ \ yy_pv = yypv = yyv + tv;\ \ maxyyps = &yys[yymaxdepth];\ \ }\ \ if (yyv == NULL || yys == NULL) END - sed -f $tmp < $input > $output ;; + if sed -f $tmp < $input > $output + then echo "The edit seems to have been applied okay." + else echo "The edit seems to have failed!" + fi + ;; ###################################################### # Plan still unknown - *) sed -e 's/Received token/ *** Received token/' $input >$output; + *) + echo "Unable to patch perly.c to allow dynamic yacc stack allocation (plan=$plan)" + # just do minimal change to write $output from $input + sed -e 's/Received token/ *** Received token/' $input >$output + ;; esac +echo "" rm -rf $tmp $input