More h2ph tweaking for gcc __inline functions

[p5sagit/p5-mst-13.2.git] / utils / h2ph.PL

diff --git a/utils/h2ph.PL b/utils/h2ph.PL
index 27a7bf6..e501067 100644 (file)
--- a/utils/h2ph.PL
+++ b/utils/h2ph.PL
@@ -120,7 +120,9 @@ while (defined (my $file = next_file())) {
        open(OUT,">$Dest_dir/$outfile") || die "Can't create $outfile: $!\n";
     }
 
-    print OUT "require '_h2ph_pre.ph';\n\n";
+    print OUT
+        "require '_h2ph_pre.ph';\n\n",
+        "no warnings 'redefine';\n\n";
 
     while (defined (local $_ = next_line($file))) {
        if (s/^\s*\#\s*//) {
@@ -131,9 +133,9 @@ while (defined (my $file = next_file())) {
                s/\(\w+\s*\(\*\)\s*\(\w*\)\)\s*(-?\d+)/$1/; # (int (*)(foo_t))0
                if (s/^\(([\w,\s]*)\)//) {
                    $args = $1;
-                   my $proto = '() ';
+                   my $proto = '() ';
                    if ($args ne '') {
-                       $proto = '';
+                       $proto = '';
                        foreach my $arg (split(/,\s*/,$args)) {
                            $arg =~ s/^\s*([^\s].*[^\s])\s*$/$1/;
                            $curargs{$arg} = 1;
@@ -144,6 +146,7 @@ while (defined (my $file = next_file())) {
                    s/^\s+//;
                    expr();
                    $new =~ s/(["\\])/\\$1/g;       #"]);
+                 EMIT:
                    $new = reindent($new);
                    $args = reindent($args);
                    if ($t ne '') {
@@ -266,7 +269,7 @@ while (defined (my $file = next_file())) {
            } elsif(/^ident\s+(.*)/) {
                print OUT $t, "# $1\n";
            }
-       } elsif(/^\s*(typedef\s*)?enum\s*(\s+[a-zA-Z_]\w*\s*)?/) {
+       } elsif (/^\s*(typedef\s*)?enum\s*(\s+[a-zA-Z_]\w*\s*)?/) { # { for vi
            until(/\{[^}]*\}.*;/ || /;/) {
                last unless defined ($next = next_line($file));
                chomp $next;
@@ -298,6 +301,68 @@ while (defined (my $file = next_file())) {
                               "unless defined(\&$enum_name);\n");
                }
            }
+       } elsif (/^(?:__extension__\s+)?(?:extern|static)\s+(?:__)?inline(?:__)?\s+/) { # { for vi
+           # This is a hack to parse the inline functions in the glibc headers.
+           # Warning: massive kludge ahead. We suppose inline functions are mainly
+           # constructed like macros.
+           while (1) {
+               last unless defined ($next = next_line($file));
+               chomp $next;
+               undef $_, last if $next =~ /__THROW\s*;/;
+               $_ .= " $next";
+               print OUT "# $next\n" if $opt_D;
+               last if $next =~ /^}|^{.*}\s*$/;
+           }
+           next if not defined; # because it's only a prototype
+           s/\b(__extension__|extern|static|(?:__)?inline(?:__)?)\b//g;
+           # violently drop #ifdefs
+           s/#\s*if.*?#\s*endif//g
+               and print OUT "# some #ifdef were dropped here -- fill in the blanks\n";
+           if (s/^(?:\w|\s|\*)*\s(\w+)\s*//) {
+               $name = $1;
+           } else {
+               warn "name not found"; next; # shouldn't occur...
+           }
+           my @args;
+           if (s/^\(([^()]*)\)\s*(\w+\s*)*//) {
+               for my $arg (split /,/, $1) {
+                   if ($arg =~ /(\w+)\s*$/) {
+                       $curargs{$1} = 1;
+                       push @args, $1;
+                   }
+               }
+           }
+           $args = (
+               @args
+               ? "local(" . (join ',', map "\$$_", @args) . ") = \@_;\n$t    "
+               : ""
+           );
+           my $proto = @args ? '' : '() ';
+           $new = '';
+           s/\breturn\b//g; # "return" doesn't occur in macros usually...
+           expr();
+           # try to find and perlify local C variables
+           our @local_variables = (); # needs to be a our(): (?{...}) bug workaround
+           $new =~ s['
+             (?:(?:un)?signed\s+)?
+             (?:long\s+)?
+             (?:long|int|float|double|char|\w+_t)\s+
+             (\w+)
+             (?{ push @local_variables, $1 })
+             ']
+            [my \$$1]gx;
+           $new =~ s['
+             (?:(?:un)?signed\s+)?
+             (?:long\s+)?
+             (?:long|int|float|double|char|\w+_t)
+             ' \s+ &(\w+) \s* ;
+             (?{ push @local_variables, $1 })
+             ]
+            [my \$$1;]gx;
+           $new =~ s/&$_\b/\$$_/g for @local_variables;
+           $new =~ s/(["\\])/\\$1/g;       #"]);
+           # now that's almost like a macro (we hope)
+           goto EMIT;
        }
     }
     $Is_converted{$file} = 1;
@@ -306,7 +371,7 @@ while (defined (my $file = next_file())) {
         $next = '';
     } else {
         print OUT "1;\n";
-    queue_includes_from($file) if ($opt_a);
+       queue_includes_from($file) if $opt_a;
     }
 }
 
@@ -378,10 +443,16 @@ sub expr {
         };
        # Eliminate typedefs
        /\(([\w\s]+)[\*\s]*\)\s*[\w\(]/ && do {
+           my $doit = 1;
            foreach (split /\s+/, $1) {  # Make sure all the words are types,
-               last unless ($isatype{$_} or $_ eq 'struct' or $_ eq 'union');
+               unless($isatype{$_} or $_ eq 'struct' or $_ eq 'union'){
+                   $doit = 0;
+                   last;
+               }
+           }
+           if( $doit ){
+               s/\([\w\s]+[\*\s]*\)// && next;      # then eliminate them.
            }
-           s/\([\w\s]+[\*\s]*\)// && next;      # then eliminate them.
        };
        # struct/union member, including arrays:
        s/^([_A-Z]\w*(\[[^\]]+\])?((\.|->)[_A-Z]\w*(\[[^\]]+\])?)+)//i && do {