Add an optional third argument to open_new(), to invoke read_only_top() with.

Merge together many calls to open_new() and read_only_top().

1 files changed, 4 insertions, 2 deletions

diff --git a/regen/regen_lib.pl b/regen/regen_lib.pl
index e18a3ba9b8..4715236050 100644
--- a/regen/regen_lib.pl
+++ b/regen/regen_lib.pl
@@ -34,8 +34,9 @@ sub safer_unlink {
 
 # Open a new file.
 sub open_new {
-    my ($final_name, $mode) = @_;
+    my ($final_name, $mode, $header) = @_;
     my $name = $final_name . '-new';
+    my $lang = $final_name =~ /\.(?:c|h|tab|act)$/ ? 'C' : 'Perl';
     my $fh = gensym;
     if (!defined $mode or $mode eq '>') {
 	if (-f $name) {
@@ -49,8 +50,9 @@ sub open_new {
     }
     *{$fh}->{name} = $name;
     *{$fh}->{final_name} = $final_name;
-    *{$fh}->{lang} = ($final_name =~ /\.(?:c|h|tab|act)$/ ? 'C' : 'Perl');
+    *{$fh}->{lang} = $lang;
     binmode $fh;
+    print $fh read_only_top(lang => $lang, %$header) if $header;
     $fh;
 }