$ind++;
$name[$ind]="$real$suffix";
$type[$ind]=$type;
- $rest[$ind]="Regmatch state for $type";
+ $rest[$ind]="state for $type";
}
}
}
}
}
-my ($width,$rwidth,$twidth)=(0,0,0);
-for (1..@name) {
- $width=length($name[$_]) if $name[$_] and $width<length($name[$_]);
- $twidth=length($type[$_]) if $type[$_] and $twidth<length($type[$_]);
- $rwidth=$width if $_ == $lastregop;
-}
+# use fixed width to keep the diffs between regcomp.pl recompiles
+# as small as possible.
+my ($width,$rwidth,$twidth)=(22,12,9);
$lastregop ||= $ind;
my $tot = $ind;
close DESC;
-$width, REGMATCH_STATE_MAX => $tot - 1
;
-$ind = 0;
-while (++$ind <= $tot) {
+
+for ($ind=1; $ind <= $lastregop ; $ind++) {
my $oind = $ind - 1;
printf OUT "#define\t%*s\t%d\t/* %#04x %s */\n",
-$width, $name[$ind], $ind-1, $ind-1, $rest[$ind];
- print OUT "\n\t/* ------------ States ------------- */\n\n"
- if $ind == $lastregop and $lastregop != $tot;
+}
+print OUT "\t/* ------------ States ------------- */\n";
+for ( ; $ind <= $tot ; $ind++) {
+ printf OUT "#define\t%*s\t(REGNODE_MAX + %d)\t/* %s */\n",
+ -$width, $name[$ind], $ind - $lastregop, $rest[$ind];
}
print OUT <<EOP;
print OUT <<EOP;
};
+#endif /* REG_COMP_C */
+
/* reg_name[] - Opcode/state names in string form, for debugging */
-#ifdef DEBUGGING
-const char * reg_name[] = {
+#ifndef DOINIT
+EXTCONST char * PL_reg_name[];
+#else
+EXTCONST char * const PL_reg_name[] = {
EOP
$ind = 0;
+my $ofs = 1;
+my $sym = "";
while (++$ind <= $tot) {
my $size = $longj[$ind] || 0;
- printf OUT "\t%*s\t/* %#04x */\n",
- -3-$width,qq("$name[$ind]",),$ind-1;
- print OUT "\t/* ------------ States ------------- */\n"
- if $ind == $lastregop and $lastregop != $tot;
+ printf OUT "\t%*s\t/* $sym%#04x */\n",
+ -3-$width,qq("$name[$ind]",), $ind - $ofs;
+ if ($ind == $lastregop and $lastregop != $tot) {
+ print OUT "\t/* ------------ States ------------- */\n";
+ $ofs = $lastregop;
+ $sym = 'REGNODE_MAX +';
+ }
+
}
print OUT <<EOP;
};
-#endif /* DEBUGGING */
+#endif /* DOINIT */
+
+/* PL_reg_extflags_name[] - Opcode/state names in string form, for debugging */
+
+#ifndef DOINIT
+EXTCONST char * PL_reg_extflags_name[];
#else
-#ifdef DEBUGGING
-extern const char * reg_name[];
-#endif
-#endif /* REG_COMP_C */
+EXTCONST char * const PL_reg_extflags_name[] = {
+EOP
+
+open my $fh,"<","regexp.h" or die "Can't read regexp.h: $!";
+my %rxfv;
+my $val;
+while (<$fh>) {
+ if (/#define\s+(RXf_\w+)\s+(0x[A-F\d]+)/i) {
+ $rxfv{$1}= eval $2;
+ $val|=$rxfv{$1};
+ }
+}
+my %vrxf=reverse %rxfv;
+printf OUT "\t/* Bits in extflags defined: %032b */\n",$val;
+for (0..31) {
+ my $n=$vrxf{2**$_}||"UNUSED_BIT_$_";
+ $n=~s/^RXf_(PMf_)?//;
+ printf OUT qq(\t%-20s/* 0x%08x */\n),
+ qq("$n",),2**$_;
+}
+
+print OUT <<EOP;
+};
+#endif /* DOINIT */
/* ex: set ro: */
EOP
-
close OUT or die "close $tmp_h: $!";
safer_rename $tmp_h, 'regnodes.h';