@@ -365,15 +365,15 @@ sub mkOct
365
365
exit ;
366
366
}
367
367
368
- my ($warn , $pm ) = map {
368
+ my ($warn_h , $warn_pm ) = map {
369
369
open_new($_ , ' >' , { by => ' regen/warnings.pl' });
370
370
} ' warnings.h' , ' lib/warnings.pm' ;
371
371
372
372
my ($index , $warn_size );
373
373
374
374
# generate warnings.h
375
375
376
- print $warn warnings_h_boilerplate_1();
376
+ print $warn_h warnings_h_boilerplate_1();
377
377
378
378
$index = orderValues($TREE );
379
379
@@ -395,98 +395,101 @@ sub mkOct
395
395
my @names ;
396
396
foreach $k (sort { $a <=> $b } keys %VALUE_TO_NAME ) {
397
397
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 "
399
399
if $last_ver != $version ;
400
400
$name =~ y / :/ _/ ;
401
401
$name = " WARN_$name " ;
402
- print $warn tab(6, " #define $name " ), " $k \n " ;
402
+ print $warn_h tab(6, " #define $name " ), " $k \n " ;
403
403
push @names , $name ;
404
404
$last_ver = $version ;
405
405
}
406
406
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 " ;
410
410
411
- print $warn warnings_h_boilerplate_2();
411
+ print $warn_h warnings_h_boilerplate_2();
412
412
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 " ;
417
417
418
- read_only_bottom_close_and_rename($warn );
418
+ read_only_bottom_close_and_rename($warn_h );
419
+
420
+
421
+ # generate warnings.pm
419
422
420
423
while (<DATA >) {
421
424
last if / ^VERSION$ / ;
422
- print $pm $_ ;
425
+ print $warn_pm $_ ;
423
426
}
424
427
425
- print $pm qq( our \$ VERSION = "$: :VERSION";\n ) ;
428
+ print $warn_pm qq( our \$ VERSION = "$: :VERSION";\n ) ;
426
429
427
430
while (<DATA >) {
428
431
last if / ^KEYWORDS$ / ;
429
- print $pm $_ ;
432
+ print $warn_pm $_ ;
430
433
}
431
434
432
435
my $last_ver = 0;
433
- print $pm " our %Offsets = (" ;
436
+ print $warn_pm " our %Offsets = (" ;
434
437
foreach my $k (sort { $a <=> $b } keys %VALUE_TO_NAME ) {
435
438
my ($name , $version ) = @{ $VALUE_TO_NAME {$k } };
436
439
$name = lc $name ;
437
440
$k *= 2 ;
438
441
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 " ;
442
445
}
443
- print $pm tab(6, " '$name '" ), " => $k ,\n " ;
446
+ print $warn_pm tab(6, " '$name '" ), " => $k ,\n " ;
444
447
$last_ver = $version ;
445
448
}
446
449
447
- print $pm " );\n\n " ;
450
+ print $warn_pm " );\n\n " ;
448
451
449
- print $pm " our %Bits = (\n " ;
452
+ print $warn_pm " our %Bits = (\n " ;
450
453
foreach my $k (sort keys %CATEGORIES ) {
451
454
452
455
my $v = $CATEGORIES {$k } ;
453
456
my @list = sort { $a <=> $b } @$v ;
454
457
455
- print $pm tab(6, " '$k '" ), ' => "' ,
458
+ print $warn_pm tab(6, " '$k '" ), ' => "' ,
456
459
mkHex($warn_size , map $_ * 2 , @list ),
457
460
' ", # [' , mkRange(@list ), " ]\n " ;
458
461
}
459
462
460
- print $pm " );\n\n " ;
463
+ print $warn_pm " );\n\n " ;
461
464
462
- print $pm " our %DeadBits = (\n " ;
465
+ print $warn_pm " our %DeadBits = (\n " ;
463
466
foreach my $k (sort keys %CATEGORIES ) {
464
467
465
468
my $v = $CATEGORIES {$k } ;
466
469
my @list = sort { $a <=> $b } @$v ;
467
470
468
- print $pm tab(6, " '$k '" ), ' => "' ,
471
+ print $warn_pm tab(6, " '$k '" ), ' => "' ,
469
472
mkHex($warn_size , map $_ * 2 + 1 , @list ),
470
473
' ", # [' , mkRange(@list ), " ]\n " ;
471
474
}
472
475
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' ), ' = "' ,
477
480
mkHex($warn_size , map $_ * 2, @DEFAULTS ),
478
481
' "; # [' , 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 " ;
481
484
while (<DATA >) {
482
485
if ($_ eq " =for warnings.pl tree-goes-here\n " ) {
483
- print $pm warningsTree($TREE , " " );
486
+ print $warn_pm warningsTree($TREE , " " );
484
487
next ;
485
488
}
486
- print $pm $_ ;
489
+ print $warn_pm $_ ;
487
490
}
488
491
489
- read_only_bottom_close_and_rename($pm );
492
+ read_only_bottom_close_and_rename($warn_pm );
490
493
491
494
exit (0);
492
495
0 commit comments