diff options
Diffstat (limited to 'regen')
-rwxr-xr-x | regen/embed.pl | 10 | ||||
-rwxr-xr-x | regen/regcharclass.pl | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/regen/embed.pl b/regen/embed.pl index 6007d92c39..342e0171f2 100755 --- a/regen/embed.pl +++ b/regen/embed.pl @@ -44,8 +44,8 @@ sub full_name ($$) { # Returns the function name with potentially the # prefixes 'S_' or 'Perl_' my ($func, $flags) = @_; - return "S_$func" if $flags =~ /[si]/; return "Perl_$func" if $flags =~ /p/; + return "S_$func" if $flags =~ /[si]/; return $func; } @@ -92,12 +92,8 @@ my ($embed, $core, $ext, $api) = setup_embed(); warn "It is nonsensical to require the return value of a void function ($plain_func) to be checked"; } - my $scope_type_flag_count = 0; - $scope_type_flag_count++ if $flags =~ /s/; - $scope_type_flag_count++ if $flags =~ /i/; - $scope_type_flag_count++ if $flags =~ /p/; - warn "$plain_func: i, p, and s flags are all mutually exclusive" - if $scope_type_flag_count > 1; + warn "$plain_func: s flag is mutually exclusive from the i and p plags" + if $flags =~ /s/ && $flags =~ /[ip]/; my $splint_flags = ""; if ( $SPLINT && !$commented_out ) { $splint_flags .= '/*@noreturn@*/ ' if $never_returns; diff --git a/regen/regcharclass.pl b/regen/regcharclass.pl index 9115eafeb6..e22720b508 100755 --- a/regen/regcharclass.pl +++ b/regen/regcharclass.pl @@ -1630,11 +1630,11 @@ REPLACEMENT: Unicode REPLACEMENT CHARACTER 0xFFFD NONCHAR: Non character code points -=> UTF8 :fast +=> UTF8 :safe \p{_Perl_Nchar} SURROGATE: Surrogate characters -=> UTF8 :fast +=> UTF8 :safe \p{_Perl_Surrogate} # This program was run with this enabled, and the results copied to utf8.h; |