X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=autodoc.pl;h=6126f9ff65a3445df3f68e4901691e6885985057;hb=62703e7218aceb3f5d30f70a2307dd02e5eb8c63;hp=8b6f3b44723a17d6d01cce1237936475630f742a;hpb=94bdecf9800c3bee967274854f7adf2933ffd42b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/autodoc.pl b/autodoc.pl
index 8b6f3b4..6126f9f 100644
--- a/autodoc.pl
+++ b/autodoc.pl
@@ -3,8 +3,14 @@
 require 5.003;	# keep this compatible, an old perl is all we may have before
                 # we build the new one
 
+BEGIN {
+  push @INC, 'lib';
+  require 'regen_lib.pl';
+}
+
+
 #
-# See database of global and static function prototypes at the __END__.
+# See database of global and static function prototypes in embed.fnc
 # This is used to generate prototype headers under various configurations,
 # export symbols lists for different platforms, and macros to provide an
 # implicit interpreter context argument.
@@ -25,7 +31,9 @@ sub walk_table (&@) {
 	$F = $filename;
     }
     else {
+	safer_unlink $filename;
 	open F, ">$filename" or die "Can't open $filename: $!";
+	binmode F;
 	$F = \*F;
     }
     print $F $leader if $leader;
@@ -33,10 +41,11 @@ sub walk_table (&@) {
     while (<IN>) {
 	chomp;
 	next if /^:/;
-	while (s|\\$||) {
+	while (s|\\\s*$||) {
 	    $_ .= <IN>;
 	    chomp;
 	}
+	s/\s+$//;
 	my @args;
 	if (/^\s*(#|$)/) {
 	    @args = $_;
@@ -47,7 +56,9 @@ sub walk_table (&@) {
 	print $F $function->(@args);
     }
     print $F $trailer if $trailer;
-    close $F unless ref $filename;
+    unless (ref $filename) {
+	close $F or die "Error closing $filename: $!";
+    }
 }
 
 my %apidocs;
@@ -66,17 +77,13 @@ FUNC:
             next FUNC;
         }
 	$line++;
-	if ($in =~ /^=for\s+apidoc\s+(.*)\n/) {
+	if ($in =~ /^=for\s+apidoc\s+(.*?)\s*\n/) {
 	    my $proto = $1;
 	    $proto = "||$proto" unless $proto =~ /\|/;
 	    my($flags, $ret, $name, @args) = split /\|/, $proto;
 	    my $docs = "";
 DOC:
 	    while (defined($doc = <$fh>)) {
-                if ($doc =~ /^=head1 (.*)/) {
-                    $curheader = $1;
-                    next DOC;
-                }
 		$line++;
 		last DOC if $doc =~ /^=\w+/;
 		if ($doc =~ m:^\*/$:) {
@@ -98,7 +105,7 @@ DOC:
 		$docfuncs{$name} = [$flags, $docs, $ret, $file, $curheader, @args];
 	    }
 	    if (defined $doc) {
-		if ($doc =~ /^=for/) {
+		if ($doc =~ /^=(?:for|head)/) {
 		    $in = $doc;
 		    redo FUNC;
 		}
@@ -135,16 +142,25 @@ removed without notice.\n\n" if $flags =~ /x/;
 }
 
 my $file;
-for $file (glob('*.c'), glob('*.h')) {
+# glob() picks up docs from extra .c or .h files that may be in unclean
+# development trees.
+my $MANIFEST = do {
+  local ($/, *FH);
+  open FH, "MANIFEST" or die "Can't open MANIFEST: $!";
+  <FH>;
+};
+
+for $file (($MANIFEST =~ /^(\S+\.c)\t/gm), ($MANIFEST =~ /^(\S+\.h)\t/gm)) {
     open F, "< $file" or die "Cannot open $file for docs: $!\n";
     $curheader = "Functions in file $file\n";
     autodoc(\*F,$file);
     close F or die "Error closing $file: $!\n";
 }
 
-unlink "pod/perlapi.pod";
+safer_unlink "pod/perlapi.pod";
 open (DOC, ">pod/perlapi.pod") or
 	die "Can't create pod/perlapi.pod: $!\n";
+binmode DOC;
 
 walk_table {	# load documented functions into approriate hash
     if (@_ > 1) {
@@ -152,16 +168,20 @@ walk_table {	# load documented functions into approriate hash
 	return "" unless $flags =~ /d/;
 	$func =~ s/\t//g; $flags =~ s/p//; # clean up fields from embed.pl
 	$retval =~ s/\t//;
-	if ($flags =~ /A/) {
-	    my $docref = delete $docfuncs{$func};
+	my $docref = delete $docfuncs{$func};
+	if ($docref and @$docref) {
+	    if ($flags =~ /A/) {
+		$docref->[0].="x" if $flags =~ /M/;
+		$apidocs{$docref->[4]}{$func} = 
+		    [$docref->[0] . 'A', $docref->[1], $retval,
+		    				$docref->[3], @args];
+	    } else {
+		$gutsdocs{$docref->[4]}{$func} = 
+		    [$docref->[0], $docref->[1], $retval, $docref->[3], @args];
+	    }
+	}
+	else {
 	    warn "no docs for $func\n" unless $docref and @$docref;
-            $docref->[0].="x" if $flags =~ /M/;
-	    $apidocs{$docref->[4]}{$func} = 
-                [$docref->[0] . 'A', $docref->[1], $retval, $docref->[3], @args];
-	} else {
-	    my $docref = delete $docfuncs{$func};
-	    $gutsdocs{$docref->[4]}{$func} = 
-                [$docref->[0], $docref->[1], $retval, $docref->[3], @args];
 	}
     }
     return "";
@@ -196,10 +216,12 @@ The listing is alphabetical, case insensitive.
 _EOB_
 
 my $key;
-for $key (sort { uc($a) cmp uc($b); } keys %apidocs) { # case insensitive sort
+# case insensitive sort, with fallback for determinacy
+for $key (sort { uc($a) cmp uc($b) || $a cmp $b } keys %apidocs) {
     my $section = $apidocs{$key}; 
     print DOC "\n=head1 $key\n\n=over 8\n\n";
-    for my $key (sort { uc($a) cmp uc($b); } keys %$section) {
+    # Again, fallback for determinacy
+    for my $key (sort { uc($a) cmp uc($b) || $a cmp $b } keys %$section) {
         docout(\*DOC, $key, $section->{$key});
     }
     print DOC "\n=back\n";
@@ -228,10 +250,12 @@ perlguts(1), perlxs(1), perlxstut(1), perlintern(1)
 _EOE_
 
 
-close(DOC);
+close(DOC) or die "Error closing pod/perlapi.pod: $!";
 
+safer_unlink "pod/perlintern.pod";
 open(GUTS, ">pod/perlintern.pod") or
 		die "Unable to create pod/perlintern.pod: $!\n";
+binmode GUTS;
 print GUTS <<'END';
 =head1 NAME
 
@@ -270,5 +294,4 @@ perlguts(1), perlapi(1)
 
 END
 
-close GUTS;
-
+close GUTS or die "Error closing pod/perlintern.pod: $!";