X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=embed.pl;h=f125ef0a496ef2079da412fda348b996ed72e37f;hb=23acf6821d640f06d65b9a368b9c4101c358376d;hp=c2f5351d864590035ee5399a054b15f1dd169cc7;hpb=8eceec63d7a4c39284b15f8b23984d5483bf6573;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/embed.pl b/embed.pl
index c2f5351..f125ef0 100755
--- a/embed.pl
+++ b/embed.pl
@@ -49,7 +49,8 @@ sub walk_table (&@) {
 	else {
 	    @args = split /\s*\|\s*/, $_;
 	}
-	print $F $function->(@args);
+        my @outs = &{$function}(@args);
+        print $F @outs; # $function->(@args) is not 5.003
     }
     print $F $trailer if $trailer;
     close $F unless ref $filename;
@@ -251,7 +252,8 @@ readvars %intrp,  'intrpvar.h','I';
 readvars %thread, 'thrdvar.h','T';
 readvars %globvar, 'perlvars.h','G';
 
-foreach my $sym (sort keys %thread) {
+my $sym;
+foreach $sym (sort keys %thread) {
   warn "$sym in intrpvar.h as well as thrdvar.h\n" if exists $intrp{$sym};
 }
 
@@ -856,15 +858,15 @@ START_EXTERN_C
 
 EOT
 
-foreach my $sym (sort keys %intrp) {
+foreach $sym (sort keys %intrp) {
     print CAPIH bincompat_var('I',$sym);
 }
 
-foreach my $sym (sort keys %thread) {
+foreach $sym (sort keys %thread) {
     print CAPIH bincompat_var('T',$sym);
 }
 
-foreach my $sym (sort keys %globvar) {
+foreach $sym (sort keys %globvar) {
     print CAPIH bincompat_var('G',$sym);
 }
 
@@ -985,7 +987,7 @@ sub emit_func {
 	if (length $return) {
 	    $decl .= "    $rettype retval;\n";
 	    $retarg .= "retval = ";
-	    $return = "\n    ${return}retval;\n";
+	    $return = "\n    " . $return . "retval;\n";
 	}
 	$emitval .= <<EOT
 $rettype
@@ -1011,7 +1013,6 @@ EOT
 }
 
 # XXXX temporary hack
-my $sym;
 for $sym (qw(
 		perl_construct
 		perl_destruct
@@ -2227,7 +2228,7 @@ Ap	|PERL_SI*|si_dup	|PERL_SI* si|clone_params* param
 Ap	|ANY*	|ss_dup		|PerlInterpreter* proto_perl|clone_params* param
 Ap	|void*	|any_dup	|void* v|PerlInterpreter* proto_perl
 Ap	|HE*	|he_dup		|HE* e|bool shared|clone_params* param
-Ap	|REGEXP*|re_dup		|REGEXP* r
+Ap	|REGEXP*|re_dup		|REGEXP* r|clone_params* param
 Ap	|PerlIO*|fp_dup		|PerlIO* fp|char type
 Ap	|DIR*	|dirp_dup	|DIR* dp
 Ap	|GP*	|gp_dup		|GP* gp|clone_params* param
@@ -2592,6 +2593,7 @@ s	|char*	|stdize_locale	|char* locs
 #endif
 
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+s	|COP*	|closest_cop	|COP *cop|OP *o
 s	|SV*	|mess_alloc
 #  if defined(LEAKTEST)
 s	|void	|xstat		|int