diff options
author | Michael G. Schwern <schwern@pobox.com> | 2020-12-28 19:48:01 -0800 |
---|---|---|
committer | Karl Williamson <khw@cpan.org> | 2021-01-17 09:18:15 -0700 |
commit | 9824c081922f8e3697322536c3da1702e35e45ab (patch) | |
tree | a5c8f673282770dfddd88133421c8df984816e80 /regen/embed.pl | |
parent | 1604cfb0273418ed479719f39def5ee559bffda2 (diff) | |
download | perl-9824c081922f8e3697322536c3da1702e35e45ab.tar.gz |
style: Detabify regen files.
They generate C files.
Bump feature.pm and warnings.pm versions to satisfy cmpVERSION.pl.
I can't get it to easily ignore whitespace, `git diff --name-only`
does not respect the -w flag.
regen_perly.pl is left alone. That would require rebuilding
perly.* which is beyond a simple indentation change.
Diffstat (limited to 'regen/embed.pl')
-rwxr-xr-x | regen/embed.pl | 480 |
1 files changed, 240 insertions, 240 deletions
diff --git a/regen/embed.pl b/regen/embed.pl index f5db51d51c..64a8da3f47 100755 --- a/regen/embed.pl +++ b/regen/embed.pl @@ -45,7 +45,7 @@ sub die_at_end ($) { # Keeps going for now, but makes sure the regen doesn't } sub full_name ($$) { # Returns the function name with potentially the - # prefixes 'S_' or 'Perl_' + # prefixes 'S_' or 'Perl_' my ($func, $flags) = @_; return "Perl_$func" if $flags =~ /p/; @@ -57,11 +57,11 @@ sub open_print_header { my ($file, $quote) = @_; return open_new($file, '>', - { file => $file, style => '*', by => 'regen/embed.pl', - from => ['data in embed.fnc', 'regen/embed.pl', - 'regen/opcodes', 'intrpvar.h', 'perlvars.h'], - final => "\nEdit those files and run 'make regen_headers' to effect changes.\n", - copyright => [1993 .. 2009], quote => $quote }); + { file => $file, style => '*', by => 'regen/embed.pl', + from => ['data in embed.fnc', 'regen/embed.pl', + 'regen/opcodes', 'intrpvar.h', 'perlvars.h'], + final => "\nEdit those files and run 'make regen_headers' to effect changes.\n", + copyright => [1993 .. 2009], quote => $quote }); } my ($embed, $core, $ext, $api) = setup_embed(); @@ -73,196 +73,196 @@ my ($embed, $core, $ext, $api) = setup_embed(); my $ret; foreach (@$embed) { - if (@$_ == 1) { - print $pr "$_->[0]\n"; - next; - } + if (@$_ == 1) { + print $pr "$_->[0]\n"; + next; + } - my ($flags,$retval,$plain_func,@args) = @$_; + my ($flags,$retval,$plain_func,@args) = @$_; if ($flags =~ / ( [^AabCDdEefFGhIiMmNnOoPpRrSsTUuWXx] ) /x) { - die_at_end "flag $1 is not legal (for function $plain_func)"; - } - my @nonnull; - my $args_assert_line = ( $flags !~ /G/ ); + die_at_end "flag $1 is not legal (for function $plain_func)"; + } + my @nonnull; + my $args_assert_line = ( $flags !~ /G/ ); my $has_depth = ( $flags =~ /W/ ); - my $has_context = ( $flags !~ /T/ ); - my $never_returns = ( $flags =~ /r/ ); - my $binarycompat = ( $flags =~ /b/ ); - my $commented_out = ( $flags =~ /m/ ); - my $is_malloc = ( $flags =~ /a/ ); - my $can_ignore = ( $flags !~ /R/ ) && ( $flags !~ /P/ ) && !$is_malloc; - my @names_of_nn; - my $func; - - if (! $can_ignore && $retval eq 'void') { - warn "It is nonsensical to require the return value of a void function ($plain_func) to be checked"; - } - - die_at_end "$plain_func: S and p flags are mutually exclusive" - if $flags =~ /S/ && $flags =~ /p/; - die_at_end "$plain_func: m and $1 flags are mutually exclusive" - if $flags =~ /m/ && $flags =~ /([pS])/; - - die_at_end "$plain_func: u flag only usable with m" if $flags =~ /u/ - && $flags !~ /m/; - - my $static_inline = 0; - if ($flags =~ /([SIi])/) { - my $type; - if ($never_returns) { - $type = { - 'S' => 'PERL_STATIC_NO_RET', - 'i' => 'PERL_STATIC_INLINE_NO_RET', - 'I' => 'PERL_STATIC_FORCE_INLINE_NO_RET' - }->{$1}; - } - else { - $type = { - 'S' => 'STATIC', - 'i' => 'PERL_STATIC_INLINE', - 'I' => 'PERL_STATIC_FORCE_INLINE' - }->{$1}; - } - $retval = "$type $retval"; - die_at_end "Don't declare static function '$plain_func' pure" if $flags =~ /P/; - $static_inline = $type =~ /^PERL_STATIC(?:_FORCE)?_INLINE/; - } - else { - if ($never_returns) { - $retval = "PERL_CALLCONV_NO_RET $retval"; - } - else { - $retval = "PERL_CALLCONV $retval"; - } - } - - die_at_end "For '$plain_func', M flag requires p flag" - if $flags =~ /M/ && $flags !~ /p/; - die_at_end "For '$plain_func', C flag requires one of [pIimb] flags" - if $flags =~ /C/ && $flags !~ /[Iibmp]/; - die_at_end "For '$plain_func', X flag requires one of [Iip] flags" - if $flags =~ /X/ && $flags !~ /[Iip]/; - die_at_end "For '$plain_func', X and m flags are mutually exclusive" - if $flags =~ /X/ && $flags =~ /m/; - die_at_end "For '$plain_func', [Ii] with [ACX] requires p flag" - if $flags =~ /[Ii]/ && $flags =~ /[ACX]/ && $flags !~ /p/; - die_at_end "For '$plain_func', b and m flags are mutually exclusive" - . " (try M flag)" if $flags =~ /b/ && $flags =~ /m/; - die_at_end "For '$plain_func', b flag without M flag requires D flag" - if $flags =~ /b/ && $flags !~ /M/ && $flags !~ /D/; - die_at_end "For '$plain_func', I and i flags are mutually exclusive" - if $flags =~ /I/ && $flags =~ /i/; - - $func = full_name($plain_func, $flags); - $ret = ""; - $ret .= "$retval\t$func("; - if ( $has_context ) { - $ret .= @args ? "pTHX_ " : "pTHX"; - } - if (@args) { - die_at_end "n flag is contradicted by having arguments" - if $flags =~ /n/; - my $n; - for my $arg ( @args ) { - ++$n; - if ( $arg =~ /\*/ && $arg !~ /\b(NN|NULLOK)\b/ ) { - warn "$func: $arg needs NN or NULLOK\n"; - ++$unflagged_pointers; - } - my $nn = ( $arg =~ s/\s*\bNN\b\s+// ); - push( @nonnull, $n ) if $nn; - - my $nullok = ( $arg =~ s/\s*\bNULLOK\b\s+// ); # strip NULLOK with no effect - - # Make sure each arg has at least a type and a var name. - # An arg of "int" is valid C, but want it to be "int foo". - my $temp_arg = $arg; - $temp_arg =~ s/\*//g; - $temp_arg =~ s/\s*\bstruct\b\s*/ /g; - if ( ($temp_arg ne "...") - && ($temp_arg !~ /\w+\s+(\w+)(?:\[\d+\])?\s*$/) ) { - die_at_end "$func: $arg ($n) doesn't have a name\n"; - } - if (defined $1 && $nn && !($commented_out && !$binarycompat)) { - push @names_of_nn, $1; - } - } - $ret .= join ", ", @args; - } - else { - $ret .= "void" if !$has_context; - } + my $has_context = ( $flags !~ /T/ ); + my $never_returns = ( $flags =~ /r/ ); + my $binarycompat = ( $flags =~ /b/ ); + my $commented_out = ( $flags =~ /m/ ); + my $is_malloc = ( $flags =~ /a/ ); + my $can_ignore = ( $flags !~ /R/ ) && ( $flags !~ /P/ ) && !$is_malloc; + my @names_of_nn; + my $func; + + if (! $can_ignore && $retval eq 'void') { + warn "It is nonsensical to require the return value of a void function ($plain_func) to be checked"; + } + + die_at_end "$plain_func: S and p flags are mutually exclusive" + if $flags =~ /S/ && $flags =~ /p/; + die_at_end "$plain_func: m and $1 flags are mutually exclusive" + if $flags =~ /m/ && $flags =~ /([pS])/; + + die_at_end "$plain_func: u flag only usable with m" if $flags =~ /u/ + && $flags !~ /m/; + + my $static_inline = 0; + if ($flags =~ /([SIi])/) { + my $type; + if ($never_returns) { + $type = { + 'S' => 'PERL_STATIC_NO_RET', + 'i' => 'PERL_STATIC_INLINE_NO_RET', + 'I' => 'PERL_STATIC_FORCE_INLINE_NO_RET' + }->{$1}; + } + else { + $type = { + 'S' => 'STATIC', + 'i' => 'PERL_STATIC_INLINE', + 'I' => 'PERL_STATIC_FORCE_INLINE' + }->{$1}; + } + $retval = "$type $retval"; + die_at_end "Don't declare static function '$plain_func' pure" if $flags =~ /P/; + $static_inline = $type =~ /^PERL_STATIC(?:_FORCE)?_INLINE/; + } + else { + if ($never_returns) { + $retval = "PERL_CALLCONV_NO_RET $retval"; + } + else { + $retval = "PERL_CALLCONV $retval"; + } + } + + die_at_end "For '$plain_func', M flag requires p flag" + if $flags =~ /M/ && $flags !~ /p/; + die_at_end "For '$plain_func', C flag requires one of [pIimb] flags" + if $flags =~ /C/ && $flags !~ /[Iibmp]/; + die_at_end "For '$plain_func', X flag requires one of [Iip] flags" + if $flags =~ /X/ && $flags !~ /[Iip]/; + die_at_end "For '$plain_func', X and m flags are mutually exclusive" + if $flags =~ /X/ && $flags =~ /m/; + die_at_end "For '$plain_func', [Ii] with [ACX] requires p flag" + if $flags =~ /[Ii]/ && $flags =~ /[ACX]/ && $flags !~ /p/; + die_at_end "For '$plain_func', b and m flags are mutually exclusive" + . " (try M flag)" if $flags =~ /b/ && $flags =~ /m/; + die_at_end "For '$plain_func', b flag without M flag requires D flag" + if $flags =~ /b/ && $flags !~ /M/ && $flags !~ /D/; + die_at_end "For '$plain_func', I and i flags are mutually exclusive" + if $flags =~ /I/ && $flags =~ /i/; + + $func = full_name($plain_func, $flags); + $ret = ""; + $ret .= "$retval\t$func("; + if ( $has_context ) { + $ret .= @args ? "pTHX_ " : "pTHX"; + } + if (@args) { + die_at_end "n flag is contradicted by having arguments" + if $flags =~ /n/; + my $n; + for my $arg ( @args ) { + ++$n; + if ( $arg =~ /\*/ && $arg !~ /\b(NN|NULLOK)\b/ ) { + warn "$func: $arg needs NN or NULLOK\n"; + ++$unflagged_pointers; + } + my $nn = ( $arg =~ s/\s*\bNN\b\s+// ); + push( @nonnull, $n ) if $nn; + + my $nullok = ( $arg =~ s/\s*\bNULLOK\b\s+// ); # strip NULLOK with no effect + + # Make sure each arg has at least a type and a var name. + # An arg of "int" is valid C, but want it to be "int foo". + my $temp_arg = $arg; + $temp_arg =~ s/\*//g; + $temp_arg =~ s/\s*\bstruct\b\s*/ /g; + if ( ($temp_arg ne "...") + && ($temp_arg !~ /\w+\s+(\w+)(?:\[\d+\])?\s*$/) ) { + die_at_end "$func: $arg ($n) doesn't have a name\n"; + } + if (defined $1 && $nn && !($commented_out && !$binarycompat)) { + push @names_of_nn, $1; + } + } + $ret .= join ", ", @args; + } + else { + $ret .= "void" if !$has_context; + } $ret .= " _pDEPTH" if $has_depth; - $ret .= ")"; - my @attrs; - if ( $flags =~ /r/ ) { - push @attrs, "__attribute__noreturn__"; - } - if ( $flags =~ /D/ ) { - push @attrs, "__attribute__deprecated__"; - } - if ( $is_malloc ) { - push @attrs, "__attribute__malloc__"; - } - if ( !$can_ignore ) { - push @attrs, "__attribute__warn_unused_result__"; - } - if ( $flags =~ /P/ ) { - push @attrs, "__attribute__pure__"; - } - if ( $flags =~ /I/ ) { - push @attrs, "__attribute__always_inline__"; - } - if( $flags =~ /f/ ) { - my $prefix = $has_context ? 'pTHX_' : ''; - my ($args, $pat); - if ($args[-1] eq '...') { - $args = scalar @args; - $pat = $args - 1; - $args = $prefix . $args; - } - else { - # don't check args, and guess which arg is the pattern - # (one of 'fmt', 'pat', 'f'), - $args = 0; - my @fmts = grep $args[$_] =~ /\b(f|pat|fmt)$/, 0..$#args; - if (@fmts != 1) { - die "embed.pl: '$plain_func': can't determine pattern arg\n"; - } - $pat = $fmts[0] + 1; - } - my $macro = grep($_ == $pat, @nonnull) - ? '__attribute__format__' - : '__attribute__format__null_ok__'; - if ($plain_func =~ /strftime/) { - push @attrs, sprintf "%s(__strftime__,%s1,0)", $macro, $prefix; - } - else { - push @attrs, sprintf "%s(__printf__,%s%d,%s)", $macro, - $prefix, $pat, $args; - } - } - elsif ((grep { $_ eq '...' } @args) && $flags !~ /F/) { - die_at_end "$plain_func: Function with '...' arguments must have" - . " f or F flag"; - } - if ( @attrs ) { - $ret .= "\n"; - $ret .= join( "\n", map { "\t\t\t$_" } @attrs ); - } - $ret .= ";"; - $ret = "/* $ret */" if $commented_out; - - $ret .= "\n#define PERL_ARGS_ASSERT_\U$plain_func\E" - if $args_assert_line || @names_of_nn; - $ret .= "\t\\\n\t" . join '; ', map "assert($_)", @names_of_nn - if @names_of_nn; - - $ret = "#ifndef PERL_NO_INLINE_FUNCTIONS\n$ret\n#endif" if $static_inline; - $ret = "#ifndef NO_MATHOMS\n$ret\n#endif" if $binarycompat; - $ret .= @attrs ? "\n\n" : "\n"; - - print $pr $ret; + $ret .= ")"; + my @attrs; + if ( $flags =~ /r/ ) { + push @attrs, "__attribute__noreturn__"; + } + if ( $flags =~ /D/ ) { + push @attrs, "__attribute__deprecated__"; + } + if ( $is_malloc ) { + push @attrs, "__attribute__malloc__"; + } + if ( !$can_ignore ) { + push @attrs, "__attribute__warn_unused_result__"; + } + if ( $flags =~ /P/ ) { + push @attrs, "__attribute__pure__"; + } + if ( $flags =~ /I/ ) { + push @attrs, "__attribute__always_inline__"; + } + if( $flags =~ /f/ ) { + my $prefix = $has_context ? 'pTHX_' : ''; + my ($args, $pat); + if ($args[-1] eq '...') { + $args = scalar @args; + $pat = $args - 1; + $args = $prefix . $args; + } + else { + # don't check args, and guess which arg is the pattern + # (one of 'fmt', 'pat', 'f'), + $args = 0; + my @fmts = grep $args[$_] =~ /\b(f|pat|fmt)$/, 0..$#args; + if (@fmts != 1) { + die "embed.pl: '$plain_func': can't determine pattern arg\n"; + } + $pat = $fmts[0] + 1; + } + my $macro = grep($_ == $pat, @nonnull) + ? '__attribute__format__' + : '__attribute__format__null_ok__'; + if ($plain_func =~ /strftime/) { + push @attrs, sprintf "%s(__strftime__,%s1,0)", $macro, $prefix; + } + else { + push @attrs, sprintf "%s(__printf__,%s%d,%s)", $macro, + $prefix, $pat, $args; + } + } + elsif ((grep { $_ eq '...' } @args) && $flags !~ /F/) { + die_at_end "$plain_func: Function with '...' arguments must have" + . " f or F flag"; + } + if ( @attrs ) { + $ret .= "\n"; + $ret .= join( "\n", map { "\t\t\t$_" } @attrs ); + } + $ret .= ";"; + $ret = "/* $ret */" if $commented_out; + + $ret .= "\n#define PERL_ARGS_ASSERT_\U$plain_func\E" + if $args_assert_line || @names_of_nn; + $ret .= "\t\\\n\t" . join '; ', map "assert($_)", @names_of_nn + if @names_of_nn; + + $ret = "#ifndef PERL_NO_INLINE_FUNCTIONS\n$ret\n#endif" if $static_inline; + $ret = "#ifndef NO_MATHOMS\n$ret\n#endif" if $binarycompat; + $ret .= @attrs ? "\n\n" : "\n"; + + print $pr $ret; } print $pr <<'EOF'; @@ -282,13 +282,13 @@ sub readvars { local (*FILE, $_); my %seen; open(FILE, '<', $file) - or die "embed.pl: Can't open $file: $!\n"; + or die "embed.pl: Can't open $file: $!\n"; while (<FILE>) { - s/[ \t]*#.*//; # Delete comments. - if (/PERLVARA?I?C?\($pre,\s*(\w+)/) { - die_at_end "duplicate symbol $1 while processing $file line $.\n" - if $seen{$1}++; - } + s/[ \t]*#.*//; # Delete comments. + if (/PERLVARA?I?C?\($pre,\s*(\w+)/) { + die_at_end "duplicate symbol $1 while processing $file line $.\n" + if $seen{$1}++; + } } close(FILE); return sort keys %seen; @@ -334,37 +334,37 @@ sub embed_h { my $lines; foreach (@$funcs) { - if (@$_ == 1) { - my $cond = $_->[0]; - # Indent the conditionals if we are wrapped in an #if/#endif pair. - $cond =~ s/#(.*)/# $1/ if $guard; - $lines .= "$cond\n"; - next; - } - my $ret = ""; - my ($flags,$retval,$func,@args) = @$_; - unless ($flags =~ /[omM]/) { - my $args = scalar @args; - if ($flags =~ /T/) { - my $full_name = full_name($func, $flags); - next if $full_name eq $func; # Don't output a no-op. - $ret = hide($func, $full_name); - } - elsif ($args and $args[$args-1] =~ /\.\.\./) { - if ($flags =~ /p/) { - # we're out of luck for varargs functions under CPP - # So we can only do these macros for no implicit context: - $ret = "#ifndef PERL_IMPLICIT_CONTEXT\n" - . hide($func, full_name($func, $flags)) . "#endif\n"; - } - } - else { - my $alist = join(",", @az[0..$args-1]); - $ret = "#define $func($alist)"; - my $t = int(length($ret) / 8); - $ret .= "\t" x ($t < 4 ? 4 - $t : 1); - $ret .= full_name($func, $flags) . "(aTHX"; - $ret .= "_ " if $alist; + if (@$_ == 1) { + my $cond = $_->[0]; + # Indent the conditionals if we are wrapped in an #if/#endif pair. + $cond =~ s/#(.*)/# $1/ if $guard; + $lines .= "$cond\n"; + next; + } + my $ret = ""; + my ($flags,$retval,$func,@args) = @$_; + unless ($flags =~ /[omM]/) { + my $args = scalar @args; + if ($flags =~ /T/) { + my $full_name = full_name($func, $flags); + next if $full_name eq $func; # Don't output a no-op. + $ret = hide($func, $full_name); + } + elsif ($args and $args[$args-1] =~ /\.\.\./) { + if ($flags =~ /p/) { + # we're out of luck for varargs functions under CPP + # So we can only do these macros for no implicit context: + $ret = "#ifndef PERL_IMPLICIT_CONTEXT\n" + . hide($func, full_name($func, $flags)) . "#endif\n"; + } + } + else { + my $alist = join(",", @az[0..$args-1]); + $ret = "#define $func($alist)"; + my $t = int(length($ret) / 8); + $ret .= "\t" x ($t < 4 ? 4 - $t : 1); + $ret .= full_name($func, $flags) . "(aTHX"; + $ret .= "_ " if $alist; $ret .= $alist; if ($flags =~ /W/) { if ($alist) { @@ -374,10 +374,10 @@ sub embed_h { } } $ret .= ")\n"; - } - $ret = "#ifndef NO_MATHOMS\n$ret#endif\n" if $flags =~ /b/; - } - $lines .= $ret; + } + $ret = "#ifndef NO_MATHOMS\n$ret#endif\n" if $flags =~ /b/; + } + $lines .= $ret; } # Prune empty #if/#endif pairs. while ($lines =~ s/#\s*if[^\n]+\n#\s*endif\n//) { @@ -438,14 +438,14 @@ my @nocontext; { my (%has_va, %has_nocontext); foreach (@$embed) { - next unless @$_ > 1; - ++$has_va{$_->[2]} if $_->[-1] =~ /\.\.\./; - ++$has_nocontext{$1} if $_->[2] =~ /(.*)_nocontext/; + next unless @$_ > 1; + ++$has_va{$_->[2]} if $_->[-1] =~ /\.\.\./; + ++$has_nocontext{$1} if $_->[2] =~ /(.*)_nocontext/; } @nocontext = sort grep { - $has_nocontext{$_} - && !/printf/ # Not clear to me why these are skipped but they are. + $has_nocontext{$_} + && !/printf/ # Not clear to me why these are skipped but they are. } keys %has_va; } @@ -515,11 +515,11 @@ my $sym; for $sym (@intrp) { if ($sym eq 'sawampersand') { - print $em "#ifndef PL_sawampersand\n"; + print $em "#ifndef PL_sawampersand\n"; } print $em multon($sym,'I','vTHX->'); if ($sym eq 'sawampersand') { - print $em "#endif\n"; + print $em "#endif\n"; } } |