Change 27479 by [EMAIL PROTECTED] on 2006/03/11 22:51:26
Fix the last 2 perly.y specific parts of regen_perly.pl, and make
the regen_perly target call it for both perly.y and madly.y.
Affected files ...
... //depot/perl/MANIFEST#1369 edit
... //depot/perl/Makefile.SH#354 edit
... //depot/perl/regen_madly.pl#2 delete
... //depot/perl/regen_perly.pl#7 edit
Differences ...
==== //depot/perl/MANIFEST#1369 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST#1368~27468~ 2006-03-11 01:32:18.000000000 -0800
+++ perl/MANIFEST 2006-03-11 14:51:26.000000000 -0800
@@ -3035,7 +3035,6 @@
regcomp.pl Builder of regnodes.h
regcomp.sym Data for regnodes.h
regen_lib.pl Common file routines for generator scripts
-regen_madly.pl generate madly.{act,h,tab} from madly.y
regen_perly.pl generate perly.{act,h,tab} from perly.y
regen.pl Run all scripts that (re)generate files
regexec.c Regular expression evaluator
==== //depot/perl/Makefile.SH#354 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#353~27471~ 2006-03-11 02:21:27.000000000 -0800
+++ perl/Makefile.SH 2006-03-11 14:51:26.000000000 -0800
@@ -892,7 +892,7 @@
# this outputs perly.h, perly.act, perly.tab, madly.h, madly.act and madly.tab
regen_perly:
perl regen_perly.pl
- perl regen_madly.pl
+ perl regen_perly.pl madly.y
# We don't want to regenerate perly.c and perly.h, but they might
# appear out-of-date after a patch is applied or a new distribution is
==== //depot/perl/regen_perly.pl#7 (text) ====
Index: perl/regen_perly.pl
--- perl/regen_perly.pl#6~25746~ 2005-10-13 02:05:42.000000000 -0700
+++ perl/regen_perly.pl 2006-03-11 14:51:26.000000000 -0800
@@ -114,7 +114,7 @@
print H_FILE "#endif /* PERL_CORE */\n";
$endcore_done = 1;
}
- s/"perlytmp.h"/"perly.h"/;
+ s/"$tmph_file"/"$h_file"/;
print H_FILE $_;
}
close TMPH_FILE;
@@ -150,7 +150,7 @@
switch \s* \( \s* \w+ \s* \) \s* { \s*
(
case \s* \d+ \s* : \s*
- \#line [^\n]+"perly\.y"
+ \#line [^\n]+"\Q$y_file\E"
.*?
)
}
End of Patch.
