X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regcomp.pl;h=febd5505521923dbcfad170f815c2d429c936ebc;hb=b2a156bd8e464af88881c77344280160fd844dcf;hp=cfe59adc2213c1845ab116dacdd33ff7045e25e7;hpb=d09b2d29781629d5f0436d3a59d2552621af768b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/regcomp.pl b/regcomp.pl
index cfe59ad..febd550 100644
--- a/regcomp.pl
+++ b/regcomp.pl
@@ -1,3 +1,7 @@
+BEGIN {
+    # Get function prototypes
+    require 'regen_lib.pl';
+}
 #use Fatal qw(open close rename chmod unlink);
 open DESC, 'regcomp.sym';
 $ind = 0;
@@ -12,16 +16,20 @@ while (<DESC>) {
 }
 close DESC;
 $tot = $ind;
+die "Too many regexp opcodes! Maximum is 256, but there are $tot in file!"
+    if $tot>256;
 
 $tmp_h = 'tmp_reg.h';
 
 unlink $tmp_h if -f $tmp_h;
 
 open OUT, ">$tmp_h";
+binmode OUT;
 
 print OUT <<EOP;
-/* !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-   This file is built by regcomp.pl from regcomp.sym.  
+/* -*- buffer-read-only: t -*-
+   !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
+   This file is built by regcomp.pl from regcomp.sym.
    Any changes made here will be lost!
 */
 
@@ -37,11 +45,12 @@ EOP
 }
 
 print OUT <<EOP;
+#define REGNODE_MAX $oind
 
 #ifndef DOINIT
-EXTCONST U8 regkind[];
+EXTCONST U8 PL_regkind[];
 #else
-EXTCONST U8 regkind[] = {
+EXTCONST U8 PL_regkind[] = {
 EOP
 
 $ind = 0;
@@ -57,7 +66,7 @@ print OUT <<EOP;
 
 
 #ifdef REG_COMP_C
-const static U8 regarglen[] = {
+static const U8 regarglen[] = {
 EOP
 
 $ind = 0;
@@ -73,13 +82,13 @@ EOP
 print OUT <<EOP;
 };
 
-const static char reg_off_by_arg[] = {
+static const char reg_off_by_arg[] = {
 EOP
 
 $ind = 0;
 while (++$ind <= $tot) {
   $size = $longj[$ind] || 0;
-  
+
   print OUT <<EOP;
 	$size,		/* $name[$ind] */
 EOP
@@ -87,12 +96,32 @@ EOP
 
 print OUT <<EOP;
 };
+
+#ifdef DEBUGGING
+static const char * const reg_name[] = {
+EOP
+
+$ind = 0;
+while (++$ind <= $tot) {
+  $hind = sprintf "%#4x", $ind-1;
+  $size = $longj[$ind] || 0;
+
+  print OUT <<EOP;
+	"$name[$ind]",		/* $hind */
+EOP
+}
+
+print OUT <<EOP;
+};
+
+static const int reg_num = $tot;
+
+#endif /* DEBUGGING */
 #endif /* REG_COMP_C */
 
+/* ex: set ro: */
 EOP
 
-close OUT;
+close OUT or die "close $tmp_h: $!";
 
-chmod 0666, 'regnodes.h';
-unlink 'regnodes.h';
-rename $tmp_h, 'regnodes.h';
+safer_rename $tmp_h, 'regnodes.h';