wikiheaders: Fixed usage of die().

(if there's a newline in the output, it won't print the line in the Perl
script where the failure happened, so fix this in places where it's used
more like an assert than error reporting.)
This commit is contained in:
Ryan C. Gordon 2024-04-08 22:32:36 -04:00
parent 6906c50e8b
commit 125bbc5e61
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 12 additions and 12 deletions

View File

@ -426,7 +426,7 @@ sub dewikify_chunk {
$str =~ s/^\- /\n\\\(bu /gm; $str =~ s/^\- /\n\\\(bu /gm;
} else { } else {
die("Unexpected wikitype when converting to manpages\n"); # !!! FIXME: need to handle Markdown wiki pages. die("Unexpected wikitype when converting to manpages"); # !!! FIXME: need to handle Markdown wiki pages.
} }
if (defined $code) { if (defined $code) {
@ -440,7 +440,7 @@ sub dewikify_chunk {
$str .= ".EX\n$code\n.EE\n.PP\n"; $str .= ".EX\n$code\n.EE\n.PP\n";
} }
} else { } else {
die("Unexpected dewikify_mode\n"); die("Unexpected dewikify_mode");
} }
#print("\n\nDEWIKIFY CHUNK DONE:\n\n$str\n\n\n"); #print("\n\nDEWIKIFY CHUNK DONE:\n\n$str\n\n\n");
@ -720,7 +720,7 @@ while (my $d = readdir(DH)) {
$decl .= "\n$l"; $decl .= "\n$l";
} }
} else { } else {
die("Unexpected symtype $symtype\n"); die("Unexpected symtype $symtype");
} }
#print("DECL: [$decl]\n"); #print("DECL: [$decl]\n");
@ -845,7 +845,7 @@ while (my $d = readdir(DH)) {
next; next;
} }
} else { } else {
die("Unexpected wiki file type. Fixme!\n"); die("Unexpected wiki file type. Fixme!");
} }
if ($firstline) { if ($firstline) {
@ -1175,7 +1175,7 @@ if ($copy_direction == 1) { # --copy-to-headers
my $symtype = $headersymstype{$sym}; my $symtype = $headersymstype{$sym};
my $origwikitype = defined $wikitypes{$sym} ? $wikitypes{$sym} : 'md'; # default to MarkDown for new stuff. my $origwikitype = defined $wikitypes{$sym} ? $wikitypes{$sym} : 'md'; # default to MarkDown for new stuff.
my $wikitype = (defined $changeformat) ? $changeformat : $origwikitype; my $wikitype = (defined $changeformat) ? $changeformat : $origwikitype;
die("Unexpected wikitype '$wikitype'\n") if (($wikitype ne 'mediawiki') and ($wikitype ne 'md') and ($wikitype ne 'manpage')); die("Unexpected wikitype '$wikitype'") if (($wikitype ne 'mediawiki') and ($wikitype ne 'md') and ($wikitype ne 'manpage'));
#print("$sym\n"); next; #print("$sym\n"); next;
@ -1239,7 +1239,7 @@ if ($copy_direction == 1) { # --copy-to-headers
$syntax = "<syntaxhighlight lang='c'>\n$decl</syntaxhighlight>\n"; $syntax = "<syntaxhighlight lang='c'>\n$decl</syntaxhighlight>\n";
} elsif ($wikitype eq 'md') { } elsif ($wikitype eq 'md') {
$syntax = "```c\n$decl\n```\n"; $syntax = "```c\n$decl\n```\n";
} else { die("Expected wikitype '$wikitype'\n"); } } else { die("Expected wikitype '$wikitype'"); }
my %sections = (); my %sections = ();
$sections{'[Brief]'} = $brief; # include this section even if blank so we get a title line. $sections{'[Brief]'} = $brief; # include this section even if blank so we get a title line.
@ -1339,7 +1339,7 @@ if ($copy_direction == 1) { # --copy-to-headers
$sections{'See Also'} .= ":[[$sa]]\n"; $sections{'See Also'} .= ":[[$sa]]\n";
} elsif ($wikitype eq 'md') { } elsif ($wikitype eq 'md') {
$sections{'See Also'} .= "* [$sa]($sa)\n"; $sections{'See Also'} .= "* [$sa]($sa)\n";
} else { die("Expected wikitype '$wikitype'\n"); } } else { die("Expected wikitype '$wikitype'"); }
} }
} }
@ -1388,7 +1388,7 @@ if ($copy_direction == 1) { # --copy-to-headers
$str .= "| **$arg** " . (' ' x ($longest_arg - length($arg))) . "| $desc" . (' ' x ($longest_desc - length($desc))) . " |\n"; $str .= "| **$arg** " . (' ' x ($longest_arg - length($arg))) . "| $desc" . (' ' x ($longest_desc - length($desc))) . " |\n";
} }
} else { } else {
die("Unexpected wikitype!\n"); # should have checked this elsewhere. die("Unexpected wikitype!"); # should have checked this elsewhere.
} }
$sections{'Function Parameters'} = $str; $sections{'Function Parameters'} = $str;
} }
@ -1437,7 +1437,7 @@ if ($copy_direction == 1) { # --copy-to-headers
} elsif ($symtype == 2) { } elsif ($symtype == 2) {
$symtypename = 'Macro'; $symtypename = 'Macro';
} else { } else {
die("Unexpected symbol type $symtype!\n"); die("Unexpected symbol type $symtype!");
} }
if ($wikitype eq 'mediawiki') { if ($wikitype eq 'mediawiki') {
@ -1448,7 +1448,7 @@ if ($copy_direction == 1) { # --copy-to-headers
$footer =~ s/\[CategoryAPI\]\(CategoryAPI\),?\s*//g; $footer =~ s/\[CategoryAPI\]\(CategoryAPI\),?\s*//g;
$footer =~ s/\[CategoryAPI${symtypename}\]\(CategoryAPI${symtypename}\),?\s*//g; $footer =~ s/\[CategoryAPI${symtypename}\]\(CategoryAPI${symtypename}\),?\s*//g;
$footer = "[CategoryAPI](CategoryAPI), [CategoryAPI$symtypename](CategoryAPI$symtypename)" . (($footer eq '') ? '' : ', ') . $footer; $footer = "[CategoryAPI](CategoryAPI), [CategoryAPI$symtypename](CategoryAPI$symtypename)" . (($footer eq '') ? '' : ', ') . $footer;
} else { die("Unexpected wikitype '$wikitype'\n"); } } else { die("Unexpected wikitype '$wikitype'"); }
$$sectionsref{'[footer]'} = $footer; $$sectionsref{'[footer]'} = $footer;
if (defined $wikipreamble) { if (defined $wikipreamble) {
@ -1457,7 +1457,7 @@ if ($copy_direction == 1) { # --copy-to-headers
print FH "====== $wikified_preamble ======\n"; print FH "====== $wikified_preamble ======\n";
} elsif ($wikitype eq 'md') { } elsif ($wikitype eq 'md') {
print FH "###### $wikified_preamble\n"; print FH "###### $wikified_preamble\n";
} else { die("Unexpected wikitype '$wikitype'\n"); } } else { die("Unexpected wikitype '$wikitype'"); }
} }
my $prevsectstr = ''; my $prevsectstr = '';
@ -1480,7 +1480,7 @@ if ($copy_direction == 1) { # --copy-to-headers
print FH "= $sym =\n\n"; print FH "= $sym =\n\n";
} elsif ($wikitype eq 'md') { } elsif ($wikitype eq 'md') {
print FH "# $sym\n\n"; print FH "# $sym\n\n";
} else { die("Unexpected wikitype '$wikitype'\n"); } } else { die("Unexpected wikitype '$wikitype'"); }
} else { } else {
if ($wikitype eq 'mediawiki') { if ($wikitype eq 'mediawiki') {
print FH "\n== $sect ==\n\n"; print FH "\n== $sect ==\n\n";