X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=overload.pl;h=69808c6221314b32cc9bc2bf1104489fd122a2c9;hb=6ada912ce2ec33f8cd53bfc96056ec8617e4a08e;hp=295c837102b2189117cf7891c73d278296c2d30b;hpb=38f1469315740f96c6a8755fb7cce33b9db22549;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/overload.pl b/overload.pl
index 295c837..69808c6 100644
--- a/overload.pl
+++ b/overload.pl
@@ -21,14 +21,16 @@ while (<DATA>) {
   push @names, $name;
 }
 
-safer_unlink 'overload.h';
-die "overload.h: $!" unless open(H, ">overload.h");
-binmode H;
-select H;
-print <<'EOF';
+safer_unlink ('overload.h', 'overload.c');
+my $c = safer_open("overload.c");
+my $h = safer_open("overload.h");
+
+sub print_header {
+  my $file = shift;
+  print <<"EOF";
 /* -*- buffer-read-only: t -*-
  *
- *    overload.h
+ *    $file
  *
  *    Copyright (C) 1997, 1998, 2000, 2001, 2005, 2006, 2007 by Larry Wall
  *    and others
@@ -39,6 +41,15 @@ print <<'EOF';
  *  !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
  *  This file is built by overload.pl
  */
+EOF
+}
+
+select $c;
+print_header('overload.c');
+
+select $h;
+print_header('overload.h');
+print <<'EOF';
 
 enum {
 EOF
@@ -50,31 +61,44 @@ print <<'EOF';
     /* Do not leave a trailing comma here.  C9X allows it, C89 doesn't. */
 };
 
-
 #define NofAMmeth max_amg_code
+
+EOF
+
+print $c <<'EOF';
+
 #define AMG_id2name(id) (PL_AMG_names[id]+1)
+#define AMG_id2namelen(id) (PL_AMG_namelens[id]-1)
+
+static const U8 PL_AMG_namelens[NofAMmeth] = {
+EOF
+
+my $last = pop @names;
+
+print $c "    $_,\n" foreach map { length $_ } @names;
 
-#ifdef DOINIT
-EXTCONST char * const PL_AMG_names[NofAMmeth] = {
+my $lastlen = length $last;
+print $c <<"EOT";
+    $lastlen
+};
+
+static const char * const PL_AMG_names[NofAMmeth] = {
   /* Names kept in the symbol table.  fallback => "()", the rest has
      "(" prepended.  The only other place in perl which knows about
      this convention is AMG_id2name (used for debugging output and
      'nomethod' only), the only other place which has it hardwired is
      overload.pm.  */
-EOF
+EOT
 
-my $last = pop @names;
-print "    \"$_\",\n" foreach map { s/(["\\"])/\\$1/g; $_ } @names;
+print $c "    \"$_\",\n" foreach map { s/(["\\"])/\\$1/g; $_ } @names;
 
-print <<"EOT";
+print $c <<"EOT";
     "$last"
 };
-#else
-EXTCONST char * PL_AMG_names[NofAMmeth];
-#endif /* def INITAMAGIC */
 EOT
 
-close H or die $!;
+safer_close($h);
+safer_close($c);
 
 __DATA__
 # Fallback should be the first