diff options
| author | Robin Barker <rmbarker@cpan.org> | 2010-04-22 11:51:20 +0100 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgs@consttype.org> | 2010-04-26 15:44:56 +0200 |
| commit | 8d66b3f930dc6d88b524d103e304308ae73a46e7 (patch) | |
| tree | a3e92f564e382de0cc1e536bc65c318a5a5c893a | |
| parent | 9500e8e2396502af05bf3891caf7e5d5cc9dc8d9 (diff) | |
| download | perl-8d66b3f930dc6d88b524d103e304308ae73a46e7.tar.gz | |
Fix h2ph and test
| -rw-r--r-- | lib/h2ph.t | 12 | ||||
| -rw-r--r-- | utils/h2ph.PL | 28 |
2 files changed, 33 insertions, 7 deletions
diff --git a/lib/h2ph.t b/lib/h2ph.t index 27dd7b9d0a..8d62d469a9 100644 --- a/lib/h2ph.t +++ b/lib/h2ph.t @@ -18,7 +18,7 @@ if (!(-e $extracted_program)) { exit 0; } -plan(4); +plan(5); # quickly compare two text files sub txt_compare { @@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht', stderr => 1 ); like( $result, qr/syntax OK$/, "output compiles"); +$result = runperl( progfile => '_h2ph_pre.ph', + switches => ['-c'], + stderr => 1 ); +like( $result, qr/syntax OK$/, "preamble compiles"); + $result = runperl( switches => ["-w"], - prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);'); + stderr => 1, + prog => <<'PROG' ); +$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht); +PROG is( $result, '', "output free of warnings" ); # cleanup diff --git a/utils/h2ph.PL b/utils/h2ph.PL index 8f56db4db8..1255807a4c 100644 --- a/utils/h2ph.PL +++ b/utils/h2ph.PL @@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) { exit $Exit; sub expr { - $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out. + if (/\b__asm__\b/) { # freak out + $new = '"(assembly code)"'; + return + } my $joined_args; if(keys(%curargs)) { $joined_args = join('|', keys(%curargs)); @@ -770,7 +773,7 @@ sub inc_dirs sub build_preamble_if_necessary { # Increment $VERSION every time this function is modified: - my $VERSION = 2; + my $VERSION = 3; my $preamble = "$Dest_dir/_h2ph_pre.ph"; # Can we skip building the preamble file? @@ -798,7 +801,16 @@ sub build_preamble_if_necessary # parenthesized value: d=(v) $define{$_} = $1; } - if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { + if (/^(\w+)\((\w)\)$/) { + my($macro, $arg) = ($1, $2); + my $def = $define{$_}; + $def =~ s/$arg/\$\{$arg\}/g; + print PREAMBLE <<DEFINE; +unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } } + +DEFINE + } elsif + ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { # float: print PREAMBLE "unless (defined &$_) { sub $_() { $1 } }\n\n"; @@ -807,8 +819,14 @@ sub build_preamble_if_necessary print PREAMBLE "unless (defined &$_) { sub $_() { $1 } }\n\n"; } elsif ($define{$_} =~ /^\w+$/) { - print PREAMBLE - "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n"; + my $def = $define{$_}; + if ($isatype{$def}) { + print PREAMBLE + "unless (defined &$_) { sub $_() { \"$def\" } }\n\n"; + } else { + print PREAMBLE + "unless (defined &$_) { sub $_() { &$def } }\n\n"; + } } else { print PREAMBLE "unless (defined &$_) { sub $_() { \"", |