Change 29862 by [EMAIL PROTECTED] on 2007/01/17 22:53:30
Integrate:
[ 26296]
Subject: [PATCH] All args in embed.fnc should be named
From: Andy Lester <[EMAIL PROTECTED]>
Date: Wed, 7 Dec 2005 10:08:18 -0600
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/embed.fnc#167 integrate
... //depot/maint-5.8/perl/embed.pl#30 integrate
... //depot/maint-5.8/perl/pod/perlapi.pod#81 integrate
... //depot/maint-5.8/perl/proto.h#156 edit
Differences ...
==== //depot/maint-5.8/perl/embed.fnc#167 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#166~29854~ 2007-01-17 10:52:01.000000000 -0800
+++ perl/embed.fnc 2007-01-17 14:53:30.000000000 -0800
@@ -738,7 +738,7 @@
#endif
nop |Signal_t |sighandler |int sig
Anop |Signal_t |csighandler |int sig
-Ap |SV** |stack_grow |NN SV** sp|NN SV**p|int n
+Ap |SV** |stack_grow |NN SV** sp|NN SV** p|int n
Ap |I32 |start_subparse |I32 is_format|U32 flags
p |void |sub_crush_depth|NN CV* cv
Apd |bool |sv_2bool |NN SV* sv
@@ -1230,28 +1230,28 @@
Es |void |regoptail |NN struct RExC_state_t *state|NN regnode *p|NN
regnode *val
Es |void |regtail |NN struct RExC_state_t *state|NN regnode *p|NN
regnode *val
Es |char* |regwhite |NN char *p|NN const char *e
-Es |char* |nextchar |NN struct RExC_state_t*
+Es |char* |nextchar |NN struct RExC_state_t *state
# ifdef DEBUGGING
Es |regnode*|dumpuntil |NN regnode *start|NN regnode *node \
|NULLOK regnode *last|NN SV* sv|I32 l
Es |void |put_byte |NN SV* sv|int c
# endif
-Es |void |scan_commit |NN struct RExC_state_t*|NN struct scan_data_t
*data
-Es |void |cl_anything |NN struct RExC_state_t*|NN struct
regnode_charclass_class *cl
+Es |void |scan_commit |NN struct RExC_state_t* state|NN struct
scan_data_t *data
+Es |void |cl_anything |NN struct RExC_state_t* state|NN struct
regnode_charclass_class *cl
Es |int |cl_is_anything |NN const struct regnode_charclass_class *cl
-Es |void |cl_init |NN struct RExC_state_t*|NN struct
regnode_charclass_class *cl
-Es |void |cl_init_zero |NN struct RExC_state_t*|NN struct
regnode_charclass_class *cl
+Es |void |cl_init |NN struct RExC_state_t* state|NN struct
regnode_charclass_class *cl
+Es |void |cl_init_zero |NN struct RExC_state_t* state|NN struct
regnode_charclass_class *cl
Es |void |cl_and |NN struct regnode_charclass_class *cl \
|NN const struct regnode_charclass_class
*and_with
-Es |void |cl_or |NN struct RExC_state_t*|NN struct
regnode_charclass_class *cl \
+Es |void |cl_or |NN struct RExC_state_t* state|NN struct
regnode_charclass_class *cl \
|NN const struct regnode_charclass_class
*or_with
-Es |I32 |study_chunk |NN struct RExC_state_t* pRExC_state|NN regnode
**scanp \
+Es |I32 |study_chunk |NN struct RExC_state_t* state|NN regnode
**scanp \
|NN I32 *deltap|NN regnode *last|NULLOK struct
scan_data_t *data \
|U32 flags
-Es |I32 |add_data |NN struct RExC_state_t*|I32 n|NN const char *s
+Es |I32 |add_data |NN struct RExC_state_t* state|I32 n|NN const
char *s
rs |void |re_croak2 |NN const char* pat1|NN const char* pat2|...
-Es |I32 |regpposixcc |NN struct RExC_state_t*|I32 value
-Es |void |checkposixcc |NN struct RExC_state_t*
+Es |I32 |regpposixcc |NN struct RExC_state_t* state|I32 value
+Es |void |checkposixcc |NN struct RExC_state_t* state
#endif
#if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
@@ -1350,7 +1350,7 @@
sR |I32 |sublex_start
sR |char * |filter_gets |NN SV *sv|NN PerlIO *fp|STRLEN append
sR |HV * |find_in_my_stash|NN const char *pkgname|I32 len
-sR |char * |tokenize_use |int is_use|NN char*
+sR |char * |tokenize_use |int is_use|NN char *s
s |SV* |new_constant |NULLOK const char *s|STRLEN len|NN const char
*key|NN SV *sv \
|NULLOK SV *pv|NULLOK const char *type
s |int |ao |int toketype
==== //depot/maint-5.8/perl/embed.pl#30 (xtext) ====
Index: perl/embed.pl
--- perl/embed.pl#29~28128~ 2006-05-08 12:22:03.000000000 -0700
+++ perl/embed.pl 2007-01-17 14:53:30.000000000 -0800
@@ -124,26 +124,6 @@
} '/dev/null', '', '';
local $^I = '.bak';
while (<>) {
-# if (/^#\s*include\s+"perl.h"/) {
-# my $file = uc $ARGV;
-# $file =~ s/\./_/g;
-# print "#define PERL_IN_$file\n";
-# }
-# s{^(\w+)\s*\(}
-# {
-# my $f = $1;
-# my $repl = "$f(";
-# if (exists $functions->{$f}) {
-# my $flags = $functions->{$f}[0];
-# $repl = "Perl_$repl" if $flags =~ /p/;
-# unless ($flags =~ /n/) {
-# $repl .= "pTHX";
-# $repl .= "_ " if @{$functions->{$f}} > 3;
-# }
-# warn("$ARGV:$.:$repl\n");
-# }
-# $repl;
-# }e;
s{(\b(\w+)[ \t]*\([ \t]*(?!aTHX))}
{
my $repl = $1;
@@ -206,6 +186,15 @@
$arg =~ s/\s*\bNN\b\s+//;
$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+/) ) {
+ warn "$func: $arg doesn't have a name\n";
+ }
}
$ret .= join ", ", @args;
}
==== //depot/maint-5.8/perl/proto.h#156 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#155~29854~ 2007-01-17 10:52:01.000000000 -0800
+++ perl/proto.h 2007-01-17 14:53:30.000000000 -0800
@@ -1148,7 +1148,7 @@
#endif
PERL_CALLCONV Signal_t Perl_sighandler(int sig);
PERL_CALLCONV Signal_t Perl_csighandler(int sig);
-PERL_CALLCONV SV** Perl_stack_grow(pTHX_ SV** sp, SV**p, int n);
+PERL_CALLCONV SV** Perl_stack_grow(pTHX_ SV** sp, SV** p, int n);
PERL_CALLCONV I32 Perl_start_subparse(pTHX_ I32 is_format, U32 flags);
PERL_CALLCONV void Perl_sub_crush_depth(pTHX_ CV* cv);
PERL_CALLCONV bool Perl_sv_2bool(pTHX_ SV* sv);
@@ -1804,25 +1804,25 @@
STATIC void S_regoptail(pTHX_ struct RExC_state_t *state, regnode *p,
regnode *val);
STATIC void S_regtail(pTHX_ struct RExC_state_t *state, regnode *p, regnode
*val);
STATIC char* S_regwhite(pTHX_ char *p, const char *e);
-STATIC char* S_nextchar(pTHX_ struct RExC_state_t*);
+STATIC char* S_nextchar(pTHX_ struct RExC_state_t *state);
# ifdef DEBUGGING
STATIC regnode* S_dumpuntil(pTHX_ regnode *start, regnode *node,
regnode *last, SV* sv, I32 l);
STATIC void S_put_byte(pTHX_ SV* sv, int c);
# endif
-STATIC void S_scan_commit(pTHX_ struct RExC_state_t*, struct scan_data_t
*data);
-STATIC void S_cl_anything(pTHX_ struct RExC_state_t*, struct
regnode_charclass_class *cl);
+STATIC void S_scan_commit(pTHX_ struct RExC_state_t* state, struct
scan_data_t *data);
+STATIC void S_cl_anything(pTHX_ struct RExC_state_t* state, struct
regnode_charclass_class *cl);
STATIC int S_cl_is_anything(pTHX_ const struct regnode_charclass_class
*cl);
-STATIC void S_cl_init(pTHX_ struct RExC_state_t*, struct
regnode_charclass_class *cl);
-STATIC void S_cl_init_zero(pTHX_ struct RExC_state_t*, struct
regnode_charclass_class *cl);
+STATIC void S_cl_init(pTHX_ struct RExC_state_t* state, struct
regnode_charclass_class *cl);
+STATIC void S_cl_init_zero(pTHX_ struct RExC_state_t* state, struct
regnode_charclass_class *cl);
STATIC void S_cl_and(pTHX_ struct regnode_charclass_class *cl, const struct
regnode_charclass_class *and_with);
-STATIC void S_cl_or(pTHX_ struct RExC_state_t*, struct
regnode_charclass_class *cl, const struct regnode_charclass_class *or_with);
-STATIC I32 S_study_chunk(pTHX_ struct RExC_state_t* pRExC_state, regnode
**scanp, I32 *deltap, regnode *last, struct scan_data_t *data, U32 flags);
-STATIC I32 S_add_data(pTHX_ struct RExC_state_t*, I32 n, const char *s);
+STATIC void S_cl_or(pTHX_ struct RExC_state_t* state, struct
regnode_charclass_class *cl, const struct regnode_charclass_class *or_with);
+STATIC I32 S_study_chunk(pTHX_ struct RExC_state_t* state, regnode
**scanp, I32 *deltap, regnode *last, struct scan_data_t *data, U32 flags);
+STATIC I32 S_add_data(pTHX_ struct RExC_state_t* state, I32 n, const char
*s);
STATIC void S_re_croak2(pTHX_ const char* pat1, const char* pat2, ...)
__attribute__noreturn__;
-STATIC I32 S_regpposixcc(pTHX_ struct RExC_state_t*, I32 value);
-STATIC void S_checkposixcc(pTHX_ struct RExC_state_t*);
+STATIC I32 S_regpposixcc(pTHX_ struct RExC_state_t* state, I32 value);
+STATIC void S_checkposixcc(pTHX_ struct RExC_state_t* state);
#endif
#if defined(PERL_IN_REGEXEC_C) || defined(PERL_DECL_PROT)
@@ -1967,7 +1967,7 @@
STATIC HV * S_find_in_my_stash(pTHX_ const char *pkgname, I32 len)
__attribute__warn_unused_result__;
-STATIC char * S_tokenize_use(pTHX_ int is_use, char*)
+STATIC char * S_tokenize_use(pTHX_ int is_use, char *s)
__attribute__warn_unused_result__;
STATIC SV* S_new_constant(pTHX_ const char *s, STRLEN len, const char
*key, SV *sv, SV *pv, const char *type);
End of Patch.
