Skip to content

Commit 2f696ff

Browse files
committed
regen/warnings.p: rename filehandle variables
rename my($warn, $pm) to ($warn_h, $warn_pm) to make it easier to see that they're the filehandles for warnings.h and warnings.pm
1 parent 255d739 commit 2f696ff

File tree

1 file changed

+39
-36
lines changed

1 file changed

+39
-36
lines changed

regen/warnings.pl

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -365,15 +365,15 @@ sub mkOct
365365
exit ;
366366
}
367367

368-
my ($warn, $pm) = map {
368+
my ($warn_h, $warn_pm) = map {
369369
open_new($_, '>', { by => 'regen/warnings.pl' });
370370
} 'warnings.h', 'lib/warnings.pm';
371371

372372
my ($index, $warn_size);
373373

374374
# generate warnings.h
375375

376-
print $warn warnings_h_boilerplate_1();
376+
print $warn_h warnings_h_boilerplate_1();
377377

378378
$index = orderValues($TREE);
379379

@@ -395,98 +395,101 @@ sub mkOct
395395
my @names;
396396
foreach $k (sort { $a <=> $b } keys %VALUE_TO_NAME) {
397397
my ($name, $version) = @{ $VALUE_TO_NAME{$k} };
398-
print $warn "\n/* Warnings Categories added in Perl $version */\n\n"
398+
print $warn_h "\n/* Warnings Categories added in Perl $version */\n\n"
399399
if $last_ver != $version ;
400400
$name =~ y/:/_/;
401401
$name = "WARN_$name";
402-
print $warn tab(6, "#define $name"), " $k\n" ;
402+
print $warn_h tab(6, "#define $name"), " $k\n" ;
403403
push @names, $name;
404404
$last_ver = $version ;
405405
}
406406

407-
print $warn tab(6, '#define WARNsize'), " $warn_size\n" ;
408-
print $warn tab(6, '#define WARN_ALLstring'), ' "', ('\125' x $warn_size) , "\"\n" ;
409-
print $warn tab(6, '#define WARN_NONEstring'), ' "', ('\0' x $warn_size) , "\"\n" ;
407+
print $warn_h tab(6, '#define WARNsize'), " $warn_size\n" ;
408+
print $warn_h tab(6, '#define WARN_ALLstring'), ' "', ('\125' x $warn_size) , "\"\n" ;
409+
print $warn_h tab(6, '#define WARN_NONEstring'), ' "', ('\0' x $warn_size) , "\"\n" ;
410410

411-
print $warn warnings_h_boilerplate_2();
411+
print $warn_h warnings_h_boilerplate_2();
412412

413-
print $warn "\n\n/*\n" ;
414-
print $warn map { "=for apidoc Amnh||$_\n" } @names;
415-
print $warn "\n=cut\n*/\n\n" ;
416-
print $warn "/* end of file warnings.h */\n";
413+
print $warn_h "\n\n/*\n" ;
414+
print $warn_h map { "=for apidoc Amnh||$_\n" } @names;
415+
print $warn_h "\n=cut\n*/\n\n" ;
416+
print $warn_h "/* end of file warnings.h */\n";
417417

418-
read_only_bottom_close_and_rename($warn);
418+
read_only_bottom_close_and_rename($warn_h);
419+
420+
421+
# generate warnings.pm
419422

420423
while (<DATA>) {
421424
last if /^VERSION$/ ;
422-
print $pm $_ ;
425+
print $warn_pm $_ ;
423426
}
424427

425-
print $pm qq(our \$VERSION = "$::VERSION";\n);
428+
print $warn_pm qq(our \$VERSION = "$::VERSION";\n);
426429

427430
while (<DATA>) {
428431
last if /^KEYWORDS$/ ;
429-
print $pm $_ ;
432+
print $warn_pm $_ ;
430433
}
431434

432435
my $last_ver = 0;
433-
print $pm "our %Offsets = (" ;
436+
print $warn_pm "our %Offsets = (" ;
434437
foreach my $k (sort { $a <=> $b } keys %VALUE_TO_NAME) {
435438
my ($name, $version) = @{ $VALUE_TO_NAME{$k} };
436439
$name = lc $name;
437440
$k *= 2 ;
438441
if ( $last_ver != $version ) {
439-
print $pm "\n";
440-
print $pm tab(6, " # Warnings Categories added in Perl $version");
441-
print $pm "\n";
442+
print $warn_pm "\n";
443+
print $warn_pm tab(6, " # Warnings Categories added in Perl $version");
444+
print $warn_pm "\n";
442445
}
443-
print $pm tab(6, " '$name'"), "=> $k,\n" ;
446+
print $warn_pm tab(6, " '$name'"), "=> $k,\n" ;
444447
$last_ver = $version;
445448
}
446449

447-
print $pm ");\n\n" ;
450+
print $warn_pm ");\n\n" ;
448451

449-
print $pm "our %Bits = (\n" ;
452+
print $warn_pm "our %Bits = (\n" ;
450453
foreach my $k (sort keys %CATEGORIES) {
451454

452455
my $v = $CATEGORIES{$k} ;
453456
my @list = sort { $a <=> $b } @$v ;
454457

455-
print $pm tab(6, " '$k'"), '=> "',
458+
print $warn_pm tab(6, " '$k'"), '=> "',
456459
mkHex($warn_size, map $_ * 2 , @list),
457460
'", # [', mkRange(@list), "]\n" ;
458461
}
459462

460-
print $pm ");\n\n" ;
463+
print $warn_pm ");\n\n" ;
461464

462-
print $pm "our %DeadBits = (\n" ;
465+
print $warn_pm "our %DeadBits = (\n" ;
463466
foreach my $k (sort keys %CATEGORIES) {
464467

465468
my $v = $CATEGORIES{$k} ;
466469
my @list = sort { $a <=> $b } @$v ;
467470

468-
print $pm tab(6, " '$k'"), '=> "',
471+
print $warn_pm tab(6, " '$k'"), '=> "',
469472
mkHex($warn_size, map $_ * 2 + 1 , @list),
470473
'", # [', mkRange(@list), "]\n" ;
471474
}
472475

473-
print $pm ");\n\n" ;
474-
print $pm "# These are used by various things, including our own tests\n";
475-
print $pm tab(6, 'our $NONE'), '= "', ('\0' x $warn_size) , "\";\n" ;
476-
print $pm tab(6, 'our $DEFAULT'), '= "',
476+
print $warn_pm ");\n\n" ;
477+
print $warn_pm "# These are used by various things, including our own tests\n";
478+
print $warn_pm tab(6, 'our $NONE'), '= "', ('\0' x $warn_size) , "\";\n" ;
479+
print $warn_pm tab(6, 'our $DEFAULT'), '= "',
477480
mkHex($warn_size, map $_ * 2, @DEFAULTS),
478481
'"; # [', mkRange(sort { $a <=> $b } @DEFAULTS), "]\n" ;
479-
print $pm tab(6, 'our $LAST_BIT'), '= ' . "$index ;\n" ;
480-
print $pm tab(6, 'our $BYTES'), '= ' . "$warn_size ;\n" ;
482+
print $warn_pm tab(6, 'our $LAST_BIT'), '= ' . "$index ;\n" ;
483+
print $warn_pm tab(6, 'our $BYTES'), '= ' . "$warn_size ;\n" ;
481484
while (<DATA>) {
482485
if ($_ eq "=for warnings.pl tree-goes-here\n") {
483-
print $pm warningsTree($TREE, " ");
486+
print $warn_pm warningsTree($TREE, " ");
484487
next;
485488
}
486-
print $pm $_ ;
489+
print $warn_pm $_ ;
487490
}
488491

489-
read_only_bottom_close_and_rename($pm);
492+
read_only_bottom_close_and_rename($warn_pm);
490493

491494
exit(0);
492495

0 commit comments

Comments
 (0)