From: Jarkko Hietaniemi Date: Tue, 29 Feb 2000 23:02:45 +0000 (+0000) Subject: Integrate with Sarathy. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=61eff3bce55f37db01a97cd993ca4e73fb953a10;p=p5sagit%2Fp5-mst-13.2.git Integrate with Sarathy. p4raw-id: //depot/cfgperl@5376 --- diff --git a/gv.c b/gv.c index 317cbb0..5c50a1c 100644 --- a/gv.c +++ b/gv.c @@ -168,7 +168,7 @@ up caching info for this glob. Similarly for all the searched stashes. This function grants C<"SUPER"> token as a postfix of the stash name. The GV returned from C may be a method cache entry, which is not -visible to Perl code. So when calling C, you should not use +visible to Perl code. So when calling C, you should not use the GV directly; instead, you should use the method's CV, which can be obtained from the GV with the C macro. @@ -333,7 +333,7 @@ created via a side effect to do this. These functions have the same side-effects and as C with C. C should be writable if contains C<':'> or C<' ''>. The warning against passing the GV returned by C to -C apply equally to these functions. +C apply equally to these functions. =cut */ diff --git a/lib/Pod/Html.pm b/lib/Pod/Html.pm index e48e9b2..4df9599 100644 --- a/lib/Pod/Html.pm +++ b/lib/Pod/Html.pm @@ -1382,7 +1382,9 @@ sub process_puretext { # converted to html commands. # -sub process_text1($$;$); +sub process_text1($$;$$); +sub pattern ($) { $_[0] ? '[^\S\n]+'.('>' x ($_[0] + 1)) : '>' } +sub closing ($) { local($_) = shift; (defined && s/\s+$//) ? length : 0 } sub process_text { return if $ignore; @@ -1391,8 +1393,8 @@ sub process_text { $$tref = $res; } -sub process_text1($$;$){ - my( $lev, $rstr, $func ) = @_; +sub process_text1($$;$$){ + my( $lev, $rstr, $func, $closing ) = @_; $lev++ unless defined $func; my $res = ''; @@ -1404,7 +1406,7 @@ sub process_text1($$;$){ } elsif( $func eq 'C' ){ # C - can be a ref or # need to extract text - my $par = go_ahead( $rstr, 'C' ); + my $par = go_ahead( $rstr, 'C', $closing ); ## clean-up of the link target my $text = depod( $par ); @@ -1432,7 +1434,7 @@ sub process_text1($$;$){ ## L => produce text, use cross-ref for linking ## L => make text from cross-ref ## need to extract text - my $par = go_ahead( $rstr, 'L' ); + my $par = go_ahead( $rstr, 'L', $closing ); # some L<>'s that shouldn't be: # a) full-blown URL's are emitted as-is @@ -1557,15 +1559,16 @@ sub process_text1($$;$){ unless $$rstr =~ s/^>//; } else { - while( $$rstr =~ s/\A(.*?)([BCEFILSXZ]<|>)//s ){ + my $term = pattern $closing; + while( $$rstr =~ s/\A(.*?)(([BCEFILSXZ])<(<+[^\S\n]+)?|$term)//s ){ # all others: either recurse into new function or - # terminate at closing angle bracket + # terminate at closing angle bracket(s) my $pt = $1; - $pt .= '>' if $2 eq '>' && $lev == 1; + $pt .= $2 if !$3 && $lev == 1; $res .= $lev == 1 ? pure_text( $pt ) : inIS_text( $pt ); - return $res if $2 eq '>' && $lev > 1; - if( $2 ne '>' ){ - $res .= process_text1( $lev, $rstr, substr($2,0,1) ); + return $res if !$3 && $lev > 1; + if( $3 ){ + $res .= process_text1( $lev, $rstr, $3, closing $4 ); } } @@ -1581,16 +1584,18 @@ sub process_text1($$;$){ # # go_ahead: extract text of an IS (can be nested) # -sub go_ahead($$){ - my( $rstr, $func ) = @_; +sub go_ahead($$$){ + my( $rstr, $func, $closing ) = @_; my $res = ''; - my $level = 1; - while( $$rstr =~ s/\A(.*?)([BCEFILSXZ]<|>)//s ){ + my @closing = ($closing); + while( $$rstr =~ + s/\A(.*?)(([BCEFILSXZ])<(<+[^\S\n]+)?|@{[pattern $closing[0]]})//s ){ $res .= $1; - if( $2 eq '>' ){ - return $res if --$level == 0; + unless( $3 ){ + shift @closing; + return $res unless @closing; } else { - ++$level; + unshift @closing, closing $4; } $res .= $2; } @@ -1889,7 +1894,7 @@ $E2c{sol} = '/'; $E2c{verbar} = '|'; $E2c{amp} = '&'; # in Tk's pods -sub depod1($;$); +sub depod1($;$$); sub depod($){ my $string; @@ -1902,15 +1907,15 @@ sub depod($){ } } -sub depod1($;$){ - my( $rstr, $func ) = @_; +sub depod1($;$$){ + my( $rstr, $func, $closing ) = @_; my $res = ''; return $res unless defined $$rstr; if( ! defined( $func ) ){ # skip to next begin of an interior sequence - while( $$rstr =~ s/\A(.*?)([BCEFILSXZ]))// ){ + my $term = pattern $closing; + while( $$rstr =~ s/\A(.*?)(([BCEFILSXZ])<(<+[^\S\n]+)?|$term)// ){ $res .= $1; - last if $2 eq '>'; - $res .= depod1( $rstr, substr($2,0,1) ); + last unless $3; + $res .= depod1( $rstr, $3, closing $4 ); } ## If we're here and $2 ne '>': undelimited interior sequence. ## Ignored, as this is called without proper indication of where we are. diff --git a/malloc.c b/malloc.c index f27df88..f76a210 100644 --- a/malloc.c +++ b/malloc.c @@ -441,8 +441,8 @@ union overhead { double strut; /* alignment problems */ #endif struct { - u_char ovu_magic; /* magic number */ u_char ovu_index; /* bucket # */ + u_char ovu_magic; /* magic number */ #ifdef RCHECK u_short ovu_size; /* actual block size */ u_int ovu_rmagic; /* range magic number */ diff --git a/pod/perlapi.pod b/pod/perlapi.pod index e6191c0..e4dedbe 100644 --- a/pod/perlapi.pod +++ b/pod/perlapi.pod @@ -341,7 +341,7 @@ up caching info for this glob. Similarly for all the searched stashes. This function grants C<"SUPER"> token as a postfix of the stash name. The GV returned from C may be a method cache entry, which is not -visible to Perl code. So when calling C, you should not use +visible to Perl code. So when calling C, you should not use the GV directly; instead, you should use the method's CV, which can be obtained from the GV with the C macro. @@ -375,7 +375,7 @@ created via a side effect to do this. These functions have the same side-effects and as C with C. C should be writable if contains C<':'> or C<' ''>. The warning against passing the GV returned by C to -C apply equally to these functions. +C apply equally to these functions. GV* gv_fetchmethod_autoload(HV* stash, const char* name, I32 autoload) diff --git a/pod/perlcall.pod b/pod/perlcall.pod index e691e75..34f442a 100644 --- a/pod/perlcall.pod +++ b/pod/perlcall.pod @@ -45,7 +45,7 @@ Before you launch yourself head first into the rest of this document, it would be a good idea to have read the following two documents - L and L. -=head1 THE PERL_CALL FUNCTIONS +=head1 THE CALL_ FUNCTIONS Although this stuff is easier to explain using examples, you first need be aware of a few important definitions. @@ -53,17 +53,17 @@ be aware of a few important definitions. Perl has a number of C functions that allow you to call Perl subroutines. They are - I32 perl_call_sv(SV* sv, I32 flags) ; - I32 perl_call_pv(char *subname, I32 flags) ; - I32 perl_call_method(char *methname, I32 flags) ; - I32 perl_call_argv(char *subname, I32 flags, register char **argv) ; + I32 call_sv(SV* sv, I32 flags) ; + I32 call_pv(char *subname, I32 flags) ; + I32 call_method(char *methname, I32 flags) ; + I32 call_argv(char *subname, I32 flags, register char **argv) ; -The key function is I. All the other functions are +The key function is I. All the other functions are fairly simple wrappers which make it easier to call Perl subroutines in -special cases. At the end of the day they will all call I +special cases. At the end of the day they will all call I to invoke the Perl subroutine. -All the I functions have a C parameter which is +All the I functions have a C parameter which is used to pass a bit mask of options to Perl. This bit mask operates identically for each of the functions. The settings available in the bit mask are discussed in L. @@ -72,40 +72,40 @@ Each of the functions will now be discussed in turn. =over 5 -=item perl_call_sv +=item call_sv -I takes two parameters, the first, C, is an SV*. +I takes two parameters, the first, C, is an SV*. This allows you to specify the Perl subroutine to be called either as a C string (which has first been converted to an SV) or a reference to a -subroutine. The section, I, shows how you can make -use of I. +subroutine. The section, I, shows how you can make +use of I. -=item perl_call_pv +=item call_pv -The function, I, is similar to I except it +The function, I, is similar to I except it expects its first parameter to be a C char* which identifies the Perl -subroutine you want to call, e.g., C. If the +subroutine you want to call, e.g., C. If the subroutine you want to call is in another package, just include the package name in the string, e.g., C<"pkg::fred">. -=item perl_call_method +=item call_method -The function I is used to call a method from a Perl +The function I is used to call a method from a Perl class. The parameter C corresponds to the name of the method to be called. Note that the class that the method belongs to is passed on the Perl stack rather than in the parameter list. This class can be either the name of the class (for a static method) or a reference to an object (for a virtual method). See L for more information on -static and virtual methods and L for an example -of using I. +static and virtual methods and L for an example +of using I. -=item perl_call_argv +=item call_argv -I calls the Perl subroutine specified by the C string +I calls the Perl subroutine specified by the C string stored in the C parameter. It also takes the usual C parameter. The final parameter, C, consists of a NULL terminated list of C strings to be passed as parameters to the Perl subroutine. -See I. +See I. =back @@ -121,7 +121,7 @@ been warned. =head1 FLAG VALUES -The C parameter in all the I functions is a bit mask +The C parameter in all the I functions is a bit mask which can consist of any combination of the symbols defined below, OR'ed together. @@ -146,7 +146,7 @@ It ensures that nothing is actually returned from the subroutine. =back -The value returned by the I function indicates how many +The value returned by the I function indicates how many items have been returned by the Perl subroutine - in this case it will be 0. @@ -154,7 +154,7 @@ be 0. =head2 G_SCALAR Calls the Perl subroutine in a scalar context. This is the default -context flag setting for all the I functions. +context flag setting for all the I functions. This flag has 2 effects: @@ -174,7 +174,7 @@ returned. =back -The value returned by the I function indicates how many +The value returned by the I function indicates how many items have been returned by the Perl subroutine - in this case it will be either 0 or 1. @@ -187,7 +187,7 @@ many items the Perl subroutine returns, only the last one will be accessible from the stack - think of the case where only one value is returned as being a list with only one element. Any other items that were returned will not exist by the time control returns from the -I function. The section I function. The section I shows an example of this behavior. @@ -208,11 +208,11 @@ array context (if it executes I the result will be true). =item 2. It ensures that all items returned from the subroutine will be -accessible when control returns from the I function. +accessible when control returns from the I function. =back -The value returned by the I function indicates how many +The value returned by the I function indicates how many items have been returned by the Perl subroutine. If 0, then you have specified the G_DISCARD flag. @@ -225,7 +225,7 @@ Perl stack. =head2 G_DISCARD -By default, the I functions place the items returned from +By default, the I functions place the items returned from by the Perl subroutine on the stack. If you are not interested in these items, then setting this flag will make Perl get rid of them automatically for you. Note that it is still possible to indicate a @@ -241,7 +241,7 @@ can ignore the problem and let Perl deal with it for you. =head2 G_NOARGS -Whenever a Perl subroutine is called using one of the I +Whenever a Perl subroutine is called using one of the I functions, it is assumed by default that parameters are to be passed to the subroutine. If you are not passing any parameters to the Perl subroutine, you can save a bit of time by setting this flag. It has @@ -255,7 +255,7 @@ has been called to think that you have passed it parameters. In fact, what can happen is that the Perl subroutine you have called can access the C<@_> array from a previous Perl subroutine. This will -occur when the code that is executing the I function has +occur when the code that is executing the I function has itself been called from another Perl subroutine. The code below illustrates this @@ -284,10 +284,10 @@ process will terminate immediately. If you want to trap this type of event, specify the G_EVAL flag. It will put an I around the subroutine call. -Whenever control returns from the I function you need to +Whenever control returns from the I function you need to check the C<$@> variable as you would in a normal Perl script. -The value returned from the I function is dependent on +The value returned from the I function is dependent on what other flags have been specified and whether an error has occurred. Here are all the different cases that can occur: @@ -295,7 +295,7 @@ occurred. Here are all the different cases that can occur: =item * -If the I function returns normally, then the value +If the I function returns normally, then the value returned is as specified in the previous sections. =item * @@ -338,7 +338,7 @@ such situations, you will not want to clear C<$@> at all, but simply to append any new errors to any existing value of C<$@>. The G_KEEPERR flag is meant to be used in conjunction with G_EVAL in -I functions that are used to implement such code. This flag +I functions that are used to implement such code. This flag has no effect when G_EVAL is not used. When G_KEEPERR is used, any errors in the called code will be prefixed @@ -365,7 +365,7 @@ section I. =head1 KNOWN PROBLEMS This section outlines all known problems that exist in the -I functions. +I functions. =over 5 @@ -378,12 +378,12 @@ flags will not work as described in the section I. Specifically, if the two flags are used when calling a subroutine and that subroutine does not call I, the value returned by -I will be wrong. +I will be wrong. =item 2. -In Perl 5.000 and 5.001 there is a problem with using I if +In Perl 5.000 and 5.001 there is a problem with using I if the Perl sub you are calling attempts to trap a I. The symptom of this problem is that the called Perl sub will continue @@ -405,7 +405,7 @@ via this XSUB Call_fred() CODE: PUSHMARK(SP) ; - perl_call_pv("fred", G_DISCARD|G_NOARGS) ; + call_pv("fred", G_DISCARD|G_NOARGS) ; fprintf(stderr, "back in Call_fred\n") ; When C is executed it will print @@ -416,13 +416,13 @@ As control never returns to C, the C<"back in Call_fred"> string will not get printed. To work around this problem, you can either upgrade to Perl 5.002 or -higher, or use the G_EVAL flag with I as shown below +higher, or use the G_EVAL flag with I as shown below void Call_fred() CODE: PUSHMARK(SP) ; - perl_call_pv("fred", G_EVAL|G_DISCARD|G_NOARGS) ; + call_pv("fred", G_EVAL|G_DISCARD|G_NOARGS) ; fprintf(stderr, "back in Call_fred\n") ; =back @@ -439,11 +439,11 @@ to Perl internals. We hope this should make the code less vulnerable to any changes made to Perl in the future. Another point worth noting is that in the first series of examples I -have made use of only the I function. This has been done +have made use of only the I function. This has been done to keep the code simpler and ease you into the topic. Wherever -possible, if the choice is between using I and -I, you should always try to use I. See -I for details. +possible, if the choice is between using I and +I, you should always try to use I. See +I for details. =head2 No Parameters, Nothing returned @@ -463,7 +463,7 @@ and here is a C function to call it dSP ; PUSHMARK(SP) ; - perl_call_pv("PrintUID", G_DISCARD|G_NOARGS) ; + call_pv("PrintUID", G_DISCARD|G_NOARGS) ; } Simple, eh. @@ -487,18 +487,18 @@ specified. We aren't interested in anything returned from I, so G_DISCARD is specified. Even if I was changed to return some value(s), having specified G_DISCARD will mean that they -will be wiped by the time control returns from I. +will be wiped by the time control returns from I. =item 4. -As I is being used, the Perl subroutine is specified as a +As I is being used, the Perl subroutine is specified as a C string. In this case the subroutine name has been 'hard-wired' into the code. =item 5. Because we specified G_DISCARD, it is not necessary to check the value -returned from I. It will always be 0. +returned from I. It will always be 0. =back @@ -534,7 +534,7 @@ The C function required to call I would look like this. XPUSHs(sv_2mortal(newSViv(b))); PUTBACK ; - perl_call_pv("LeftString", G_DISCARD); + call_pv("LeftString", G_DISCARD); FREETMPS ; LEAVE ; @@ -578,11 +578,11 @@ The C macro tells Perl to make a mental note of the current stack pointer. Even if you aren't passing any parameters (like the example shown in the section I) you must still call the C macro before you can call any of the -I functions--Perl still needs to know that there are no +I functions--Perl still needs to know that there are no parameters. The C macro sets the global copy of the stack pointer to be -the same as our local copy. If we didn't do this I +the same as our local copy. If we didn't do this I wouldn't know where the two parameters we pushed were--remember that up to now all the stack pointer manipulation we have done is with our local copy, I the global copy. @@ -634,7 +634,7 @@ an alternative to using these macros. =item 7. -Finally, I can now be called via the I +Finally, I can now be called via the I function. =back @@ -672,7 +672,7 @@ function required to call it is now a bit more complex. XPUSHs(sv_2mortal(newSViv(b))); PUTBACK ; - count = perl_call_pv("Adder", G_SCALAR); + count = call_pv("Adder", G_SCALAR); SPAGAIN ; @@ -694,23 +694,23 @@ Points to note this time are The only flag specified this time was G_SCALAR. That means the C<@_> array will be created and that the value returned by I will -still exist after the call to I. +still exist after the call to I. =item 2. The purpose of the macro C is to refresh the local copy of the stack pointer. This is necessary because it is possible that the memory allocated to the Perl stack has been reallocated whilst in the -I call. +I call. If you are making use of the Perl stack pointer in your code you must always refresh the local copy using SPAGAIN whenever you make use -of the I functions or any other Perl internal function. +of the I functions or any other Perl internal function. =item 3. Although only a single value was expected to be returned from I, -it is still good practice to check the return code from I +it is still good practice to check the return code from I anyway. Expecting a single value is not quite the same as knowing that there @@ -776,7 +776,7 @@ and this is the C function XPUSHs(sv_2mortal(newSViv(b))); PUTBACK ; - count = perl_call_pv("AddSubtract", G_ARRAY); + count = call_pv("AddSubtract", G_ARRAY); SPAGAIN ; @@ -839,7 +839,7 @@ context, like this XPUSHs(sv_2mortal(newSViv(b))); PUTBACK ; - count = perl_call_pv("AddSubtract", G_SCALAR); + count = call_pv("AddSubtract", G_SCALAR); SPAGAIN ; @@ -907,7 +907,7 @@ and here is a C function to call it. XPUSHs(svb); PUTBACK ; - count = perl_call_pv("Inc", G_DISCARD); + count = call_pv("Inc", G_DISCARD); if (count != 0) croak ("call_Inc: expected 0 values from 'Inc', got %d\n", @@ -921,12 +921,12 @@ and here is a C function to call it. } To be able to access the two parameters that were pushed onto the stack -after they return from I it is necessary to make a note +after they return from I it is necessary to make a note of their addresses--thus the two variables C and C. The reason this is necessary is that the area of the Perl stack which held them will very likely have been overwritten by something else by -the time control returns from I. +the time control returns from I. @@ -964,7 +964,7 @@ and some C to call it XPUSHs(sv_2mortal(newSViv(b))); PUTBACK ; - count = perl_call_pv("Subtract", G_EVAL|G_SCALAR); + count = call_pv("Subtract", G_EVAL|G_SCALAR); SPAGAIN ; @@ -1031,7 +1031,7 @@ refers to the C equivalent of C<$@>. Note that the stack is popped using C in the block where C is true. This is necessary because whenever a -I function invoked with G_EVAL|G_SCALAR returns an error, +I function invoked with G_EVAL|G_SCALAR returns an error, the top of the stack holds the value I. Because we want the program to continue after detecting this error, it is essential that the stack is tidied up by removing the I. @@ -1061,18 +1061,18 @@ version of the call_Subtract example above inside a destructor: This example will fail to recognize that an error occurred inside the C. Here's why: the call_Subtract code got executed while perl was cleaning up temporaries when exiting the eval block, and because -call_Subtract is implemented with I using the G_EVAL +call_Subtract is implemented with I using the G_EVAL flag, it promptly reset C<$@>. This results in the failure of the outermost test for C<$@>, and thereby the failure of the error trap. -Appending the G_KEEPERR flag, so that the I call in +Appending the G_KEEPERR flag, so that the I call in call_Subtract reads: - count = perl_call_pv("Subtract", G_EVAL|G_SCALAR|G_KEEPERR); + count = call_pv("Subtract", G_EVAL|G_SCALAR|G_KEEPERR); will preserve the error and restore reliable error handling. -=head2 Using perl_call_sv +=head2 Using call_sv In all the previous examples I have 'hard-wired' the name of the Perl subroutine to be called from C. Most of the time though, it is more @@ -1095,23 +1095,23 @@ Here is a snippet of XSUB which defines I. char * name CODE: PUSHMARK(SP) ; - perl_call_pv(name, G_DISCARD|G_NOARGS) ; + call_pv(name, G_DISCARD|G_NOARGS) ; That is fine as far as it goes. The thing is, the Perl subroutine can be specified as only a string. For Perl 4 this was adequate, but Perl 5 allows references to subroutines and anonymous subroutines. -This is where I is useful. +This is where I is useful. The code below for I is identical to I except that the C parameter is now defined as an SV* and we use -I instead of I. +I instead of I. void CallSubSV(name) SV * name CODE: PUSHMARK(SP) ; - perl_call_sv(name, G_DISCARD|G_NOARGS) ; + call_sv(name, G_DISCARD|G_NOARGS) ; Because we are using an SV to call I the following can all be used @@ -1121,7 +1121,7 @@ Because we are using an SV to call I the following can all be used CallSubSV($ref) ; CallSubSV( sub { print "Hello there\n" } ) ; -As you can see, I gives you much greater flexibility in +As you can see, I gives you much greater flexibility in how you can specify the Perl subroutine. You should note that if it is necessary to store the SV (C in the @@ -1141,7 +1141,7 @@ pointer to the SV. Say the code above had been like this CallSavedSub1() CODE: PUSHMARK(SP) ; - perl_call_sv(rememberSub, G_DISCARD|G_NOARGS) ; + call_sv(rememberSub, G_DISCARD|G_NOARGS) ; The reason this is wrong is that by the time you come to use the pointer C in C, it may or may not still refer @@ -1217,7 +1217,7 @@ SV. The code below shows C modified to do that CallSavedSub2() CODE: PUSHMARK(SP) ; - perl_call_sv(keepSub, G_DISCARD|G_NOARGS) ; + call_sv(keepSub, G_DISCARD|G_NOARGS) ; To avoid creating a new SV every time C is called, the function first checks to see if it has been called before. If not, @@ -1227,7 +1227,7 @@ operation using C. Thereafter, whenever C is called the existing SV, C, is overwritten with the new value using C. -=head2 Using perl_call_argv +=head2 Using call_argv Here is a Perl subroutine which prints whatever parameters are passed to it. @@ -1239,7 +1239,7 @@ to it. foreach (@list) { print "$_\n" } } -and here is an example of I which will call +and here is an example of I which will call I. static char * words[] = {"alpha", "beta", "gamma", "delta", NULL} ; @@ -1249,13 +1249,13 @@ I. { dSP ; - perl_call_argv("PrintList", G_DISCARD, words) ; + call_argv("PrintList", G_DISCARD, words) ; } Note that it is not necessary to call C in this instance. -This is because I will do it for you. +This is because I will do it for you. -=head2 Using perl_call_method +=head2 Using call_method Consider the following Perl code @@ -1330,7 +1330,7 @@ the C and C methods from C. XPUSHs(sv_2mortal(newSViv(index))) ; PUTBACK; - perl_call_method(method, G_DISCARD) ; + call_method(method, G_DISCARD) ; void call_PrintID(class, method) @@ -1341,7 +1341,7 @@ the C and C methods from C. XPUSHs(sv_2mortal(newSVpv(class, 0))) ; PUTBACK; - perl_call_method(method, G_DISCARD) ; + call_method(method, G_DISCARD) ; So the methods C and C can be invoked like this @@ -1352,7 +1352,7 @@ So the methods C and C can be invoked like this The only thing to note is that in both the static and virtual methods, the method name is not passed via the stack--it is used as the first -parameter to I. +parameter to I. =head2 Using GIMME_V @@ -1385,14 +1385,14 @@ The output from that will be =head2 Using Perl to dispose of temporaries In the examples given to date, any temporaries created in the callback -(i.e., parameters passed on the stack to the I function or +(i.e., parameters passed on the stack to the I function or values returned via the stack) have been freed by one of these methods =over 5 =item * -specifying the G_DISCARD flag with I. +specifying the G_DISCARD flag with I. =item * @@ -1440,11 +1440,11 @@ situation ... error occurs ... - external library --> perl_call --> perl + external library --> call_* --> perl | - perl <-- XSUB <-- external library <-- perl_call <----+ + perl <-- XSUB <-- external library <-- call_* <----+ -After processing of the error using I is completed, +After processing of the error using I is completed, control reverts back to Perl more or less immediately. In the diagram, the further right you go the more deeply nested the @@ -1457,22 +1457,22 @@ will be more like this perl --> XSUB --> event handler ... - event handler --> perl_call --> perl + event handler --> call_* --> perl | - event handler <-- perl_call <----+ + event handler <-- call_* <----+ ... - event handler --> perl_call --> perl + event handler --> call_* --> perl | - event handler <-- perl_call <----+ + event handler <-- call_* <----+ ... - event handler --> perl_call --> perl + event handler --> call_* --> perl | - event handler <-- perl_call <----+ + event handler <-- call_* <----+ In this case the flow of control can consist of only the repeated sequence - event handler --> perl_call --> perl + event handler --> call_* --> perl for practically the complete duration of the program. This means that control may I drop back to the surrounding scope in Perl at the @@ -1532,7 +1532,7 @@ Now change that to call a Perl subroutine instead PUSHMARK(SP) ; /* Call the Perl sub to process the callback */ - perl_call_sv(callback, G_DISCARD) ; + call_sv(callback, G_DISCARD) ; } @@ -1638,7 +1638,7 @@ and C could look like this PUTBACK ; /* Call the Perl sub */ - perl_call_sv(*sv, G_DISCARD) ; + call_sv(*sv, G_DISCARD) ; } For completeness, here is C. This shows how to remove @@ -1721,7 +1721,7 @@ series of C functions to act as the interface to Perl, thus PUTBACK ; /* Call the Perl sub */ - perl_call_sv(Map[index].PerlSub, G_DISCARD) ; + call_sv(Map[index].PerlSub, G_DISCARD) ; } static void @@ -1875,7 +1875,7 @@ of values> recoded to use C instead of C. XPUSHs(sv_2mortal(newSViv(b))); PUTBACK ; - count = perl_call_pv("AddSubtract", G_ARRAY); + count = call_pv("AddSubtract", G_ARRAY); SPAGAIN ; SP -= count ; @@ -1924,22 +1924,22 @@ refers to the last. =head2 Creating and calling an anonymous subroutine in C -As we've already shown, C can be used to invoke an +As we've already shown, C can be used to invoke an anonymous subroutine. However, our example showed a Perl script invoking an XSUB to perform this operation. Let's see how it can be done inside our C code: ... - SV *cvrv = perl_eval_pv("sub { print 'You will not find me cluttering any namespace!' }", TRUE); + SV *cvrv = eval_pv("sub { print 'You will not find me cluttering any namespace!' }", TRUE); ... - perl_call_sv(cvrv, G_VOID|G_NOARGS); + call_sv(cvrv, G_VOID|G_NOARGS); -C is used to compile the anonymous subroutine, which -will be the return value as well (read more about C in -L). Once this code reference is in hand, it +C is used to compile the anonymous subroutine, which +will be the return value as well (read more about C in +L). Once this code reference is in hand, it can be mixed in with all the previous examples we've shown. =head1 SEE ALSO diff --git a/pod/perldiag.pod b/pod/perldiag.pod index 05e57c0..f95c7d5 100644 --- a/pod/perldiag.pod +++ b/pod/perldiag.pod @@ -576,7 +576,7 @@ so it was truncated to the string shown. =item Callback called exit -(F) A subroutine invoked from an external package via perl_call_sv() +(F) A subroutine invoked from an external package via call_sv() exited by calling exit. =item Can't "goto" out of a pseudo block diff --git a/pod/perlembed.pod b/pod/perlembed.pod index 3ea1736..b46c463 100644 --- a/pod/perlembed.pod +++ b/pod/perlembed.pod @@ -12,7 +12,7 @@ Do you want to: =item B -Read L, L, L, and L. +Read L, L, L, L, and L. =item B @@ -200,9 +200,9 @@ calling I. =head2 Calling a Perl subroutine from your C program -To call individual Perl subroutines, you can use any of the B +To call individual Perl subroutines, you can use any of the B functions documented in L. -In this example we'll use C. +In this example we'll use C. That's shown below, in a program I'll call I. @@ -221,7 +221,7 @@ That's shown below, in a program I'll call I. /*** skipping perl_run() ***/ - perl_call_argv("showtime", G_DISCARD | G_NOARGS, args); + call_argv("showtime", G_DISCARD | G_NOARGS, args); perl_destruct(my_perl); perl_free(my_perl); @@ -257,7 +257,7 @@ and package C blocks. If you want to pass arguments to the Perl subroutine, you can add strings to the C-terminated C list passed to -I. For other data types, or to examine return values, +I. For other data types, or to examine return values, you'll need to manipulate the Perl stack. That's demonstrated in the last section of this document: L. @@ -265,7 +265,7 @@ your C program>. =head2 Evaluating a Perl statement from your C program Perl provides two API functions to evaluate pieces of Perl code. -These are L and L. +These are L and L. Arguably, these are the only routines you'll ever need to execute snippets of Perl code from within your C program. Your code can be as @@ -273,7 +273,7 @@ long as you wish; it can contain multiple statements; it can employ L, L, and L to include external Perl files. -I lets us evaluate individual Perl strings, and then +I lets us evaluate individual Perl strings, and then extract variables for coercion into C types. The following program, I, executes three Perl strings, extracting an C from the first, a C from the second, and a C from the third. @@ -295,22 +295,22 @@ the first, a C from the second, and a C from the third. perl_run(my_perl); /** Treat $a as an integer **/ - perl_eval_pv("$a = 3; $a **= 2", TRUE); - printf("a = %d\n", SvIV(perl_get_sv("a", FALSE))); + eval_pv("$a = 3; $a **= 2", TRUE); + printf("a = %d\n", SvIV(get_sv("a", FALSE))); /** Treat $a as a float **/ - perl_eval_pv("$a = 3.14; $a **= 2", TRUE); - printf("a = %f\n", SvNV(perl_get_sv("a", FALSE))); + eval_pv("$a = 3.14; $a **= 2", TRUE); + printf("a = %f\n", SvNV(get_sv("a", FALSE))); /** Treat $a as a string **/ - perl_eval_pv("$a = 'rekcaH lreP rehtonA tsuJ'; $a = reverse($a);", TRUE); - printf("a = %s\n", SvPV(perl_get_sv("a", FALSE), n_a)); + eval_pv("$a = 'rekcaH lreP rehtonA tsuJ'; $a = reverse($a);", TRUE); + printf("a = %s\n", SvPV(get_sv("a", FALSE), n_a)); perl_destruct(my_perl); perl_free(my_perl); } -All of those strange functions with I in their names help convert Perl scalars to C types. They're described in L. +All of those strange functions with I in their names help convert Perl scalars to C types. They're described in L and L. If you compile and run I, you'll see the results of using I to create an C, I to create a C, and @@ -323,11 +323,11 @@ I to create a string: In the example above, we've created a global variable to temporarily store the computed value of our eval'd expression. It is also possible and in most cases a better strategy to fetch the return value -from I instead. Example: +from I instead. Example: ... STRLEN n_a; - SV *val = perl_eval_pv("reverse 'rekcaH lreP rehtonA tsuJ'", TRUE); + SV *val = eval_pv("reverse 'rekcaH lreP rehtonA tsuJ'", TRUE); printf("%s\n", SvPV(val,n_a)); ... @@ -336,7 +336,7 @@ variables and we've simplified our code as well. =head2 Performing Perl pattern matches and substitutions from your C program -The I function lets us evaluate strings of Perl code, so we can +The I function lets us evaluate strings of Perl code, so we can define some functions that use it to "specialize" in matches and substitutions: I, I, and I. @@ -365,18 +365,18 @@ been wrapped here): #include #include - /** my_perl_eval_sv(code, error_check) - ** kinda like perl_eval_sv(), + /** my_eval_sv(code, error_check) + ** kinda like eval_sv(), ** but we pop the return value off the stack **/ - SV* my_perl_eval_sv(SV *sv, I32 croak_on_error) + SV* my_eval_sv(SV *sv, I32 croak_on_error) { dSP; SV* retval; STRLEN n_a; PUSHMARK(SP); - perl_eval_sv(sv, G_SCALAR); + eval_sv(sv, G_SCALAR); SPAGAIN; retval = POPs; @@ -403,7 +403,7 @@ been wrapped here): sv_setpvf(command, "my $string = '%s'; $string =~ %s", SvPV(string,n_a), pattern); - retval = my_perl_eval_sv(command, TRUE); + retval = my_eval_sv(command, TRUE); SvREFCNT_dec(command); return SvIV(retval); @@ -425,10 +425,10 @@ been wrapped here): sv_setpvf(command, "$string = '%s'; ($string =~ %s)", SvPV(*string,n_a), pattern); - retval = my_perl_eval_sv(command, TRUE); + retval = my_eval_sv(command, TRUE); SvREFCNT_dec(command); - *string = perl_get_sv("string", FALSE); + *string = get_sv("string", FALSE); return SvIV(retval); } @@ -449,10 +449,10 @@ been wrapped here): sv_setpvf(command, "my $string = '%s'; @array = ($string =~ %s)", SvPV(string,n_a), pattern); - my_perl_eval_sv(command, TRUE); + my_eval_sv(command, TRUE); SvREFCNT_dec(command); - *match_list = perl_get_av("array", FALSE); + *match_list = get_av("array", FALSE); num_matches = av_len(*match_list) + 1; /** assume $[ is 0 **/ return num_matches; @@ -539,7 +539,7 @@ results--the return value of your Perl subroutine--off the stack. First you'll need to know how to convert between C types and Perl types, with newSViv() and sv_setnv() and newAV() and all their -friends. They're described in L. +friends. They're described in L and L. Then you'll need to know how to manipulate the Perl stack. That's described in L. @@ -576,7 +576,7 @@ deep breath... XPUSHs(sv_2mortal(newSViv(a))); /* push the base onto the stack */ XPUSHs(sv_2mortal(newSViv(b))); /* push the exponent onto stack */ PUTBACK; /* make local stack pointer global */ - perl_call_pv("expo", G_SCALAR); /* call the function */ + call_pv("expo", G_SCALAR); /* call the function */ SPAGAIN; /* refresh stack pointer */ /* pop the return value from stack */ printf ("%d to the %dth power is %d.\n", a, b, POPi); @@ -638,7 +638,7 @@ the filename into a guaranteed-unique package name, and then compile the code into that package using L. In the example below, each file will only be compiled once. Or, the application might choose to clean out the symbol table associated with the file -after it's no longer needed. Using L, We'll +after it's no longer needed. Using L, We'll call the subroutine C which lives in the file C and pass the filename and boolean cleanup/cache flag as arguments. @@ -750,7 +750,7 @@ with L whenever possible. /* call the subroutine, passing it the filename as an argument */ args[0] = filename; - perl_call_argv("Embed::Persistent::eval_file", + call_argv("Embed::Persistent::eval_file", G_DISCARD | G_EVAL, args); /* check $@ */ @@ -953,7 +953,7 @@ B can also automate writing the I glue code. % cc -c interp.c `perl -MExtUtils::Embed -e ccopts` % cc -o interp perlxsi.o interp.o `perl -MExtUtils::Embed -e ldopts` -Consult L and L for more details. +Consult L, L, and L for more details. =head1 Embedding Perl under Win32 diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod index e8f92d3..081709a 100644 --- a/pod/perlfunc.pod +++ b/pod/perlfunc.pod @@ -335,7 +335,7 @@ following a minus are interpreted as file tests. The C<-T> and C<-B> switches work as follows. The first block or so of the file is examined for odd characters such as strange control codes or -characters with the high bit set. If too many strange characters (E30%) +characters with the high bit set. If too many strange characters (>30%) are found, it's a C<-B> file, otherwise it's a C<-T> file. Also, any file containing null in the first block is considered a binary file. If C<-T> or C<-B> is used on a filehandle, the current stdio buffer is examined @@ -544,7 +544,7 @@ arguments with which the subroutine was invoked. Be aware that the optimizer might have optimized call frames away before C had a chance to get the information. That means that C might not return information about the call frame you expect it do, for -C 1>. In particular, C<@DB::args> might have information from the +C<< N > 1 >>. In particular, C<@DB::args> might have information from the previous time C was called. =item chdir EXPR @@ -1002,8 +1002,8 @@ lookup: Outside an C, prints the value of LIST to C and exits with the current value of C<$!> (errno). If C<$!> is C<0>, -exits with the value of C<($? EE 8)> (backtick `command` -status). If C<($? EE 8)> is C<0>, exits with C<255>. Inside +exits with the value of C<<< ($? >> 8) >>> (backtick `command` +status). If C<<< ($? >> 8) >>> is C<0>, exits with C<255>. Inside an C the error message is stuffed into C<$@> and the C is terminated with the undefined value. This makes C the way to raise an exception. @@ -1217,12 +1217,12 @@ as terminals may lose the end-of-file condition if you do. An C without an argument uses the last file read. Using C with empty parentheses is very different. It refers to the pseudo file formed from the files listed on the command line and accessed via the -CE> operator. Since CE> isn't explicitly opened, -as a normal filehandle is, an C before CE> has been +C<< <> >> operator. Since C<< <> >> isn't explicitly opened, +as a normal filehandle is, an C before C<< <> >> has been used will cause C<@ARGV> to be examined to determine if input is available. -In a CE)> loop, C or C can be used to +In a C<< while (<>) >> loop, C or C can be used to detect the end of each file, C will only detect the end of the last file. Examples: @@ -1465,7 +1465,7 @@ operation is a hash or array key lookup or subroutine name: Although the deepest nested array or hash will not spring into existence just because its existence was tested, any intervening ones will. -Thus C<$ref-E{"A"}> and C<$ref-E{"A"}-E{"B"}> will spring +Thus C<< $ref->{"A"} >> and C<< $ref->{"A"}->{"B"} >> will spring into existence due to the existence test for the $key element above. This happens anywhere the arrow operator is used, including even: @@ -1933,8 +1933,8 @@ Returns the socket option requested, or undef if there is an error. Returns the value of EXPR with filename expansions such as the standard Unix shell F would do. This is the internal function -implementing the C*.cE> operator, but you can use it directly. -If EXPR is omitted, C<$_> is used. The C*.cE> operator is +implementing the C<< <*.c> >> operator, but you can use it directly. +If EXPR is omitted, C<$_> is used. The C<< <*.c> >> operator is discussed in more detail in L. Beginning with v5.6.0, this operator is implemented using the standard @@ -2109,7 +2109,7 @@ Implements the ioctl(2) function. You'll probably first have to say to get the correct function definitions. If F doesn't exist or doesn't have the correct definitions you'll have to roll your -own, based on your C header files such as Fsys/ioctl.hE>. +own, based on your C header files such as F<< >>. (There is a Perl script called B that comes with the Perl kit that may help you in this, but it's nontrivial.) SCALAR will be read and/or written depending on the FUNCTION--a pointer to the string value of SCALAR @@ -2553,24 +2553,24 @@ for this purpose; so if you're using C, specify EXPR in your call to open.) See L for a kinder, gentler explanation of opening files. -If MODE is C<'E'> or nothing, the file is opened for input. -If MODE is C<'E'>, the file is truncated and opened for -output, being created if necessary. If MODE is C<'EE'>, +If MODE is C<< '<' >> or nothing, the file is opened for input. +If MODE is C<< '>' >>, the file is truncated and opened for +output, being created if necessary. If MODE is C<<< '>>' >>>, the file is opened for appending, again being created if necessary. -You can put a C<'+'> in front of the C<'E'> or C<'E'> to indicate that -you want both read and write access to the file; thus C<'+E'> is almost -always preferred for read/write updates--the C<'+E'> mode would clobber the +You can put a C<'+'> in front of the C<< '>' >> or C<< '<' >> to indicate that +you want both read and write access to the file; thus C<< '+<' >> is almost +always preferred for read/write updates--the C<< '+>' >> mode would clobber the file first. You can't usually use either read-write mode for updating textfiles, since they have variable length records. See the B<-i> switch in L for a better approach. The file is created with permissions of C<0666> modified by the process' C value. -These various prefixes correspond to the fopen(3) modes of C<'r'>, C<'r+'>, C<'w'>, -C<'w+'>, C<'a'>, and C<'a+'>. +These various prefixes correspond to the fopen(3) modes of C<'r'>, C<'r+'>, +C<'w'>, C<'w+'>, C<'a'>, and C<'a+'>. In the 2-arguments (and 1-argument) form of the call the mode and filename should be concatenated (in this order), possibly separated by -spaces. It is possible to omit the mode if the mode is C<'E'>. +spaces. It is possible to omit the mode if the mode is C<< '<' >>. If the filename begins with C<'|'>, the filename is interpreted as a command to which output is to be piped, and if the filename ends with a @@ -2590,7 +2590,7 @@ that pipes both in I out, but see L, L, and L for alternatives.) In the 2-arguments (and 1-argument) form opening C<'-'> opens STDIN -and opening C<'E-'> opens STDOUT. +and opening C<< '>-' >> opens STDOUT. Open returns nonzero upon success, the undefined value otherwise. If the C @@ -2662,10 +2662,10 @@ Examples: } You may also, in the Bourne shell tradition, specify an EXPR beginning -with C<'E&'>, in which case the rest of the string is interpreted as the +with C<< '>&' >>, in which case the rest of the string is interpreted as the name of a filehandle (or file descriptor, if numeric) to be -duped and opened. You may use C<&> after C>, CE>, -C>, C<+E>, C<+EE>, and C<+E>. The +duped and opened. You may use C<&> after C<< > >>, C<<< >> >>>, +C<< < >>, C<< +> >>, C<<< +>> >>>, and C<< +< >>. The mode you specify should match the mode of the original filehandle. (Duping a filehandle does not take into account any existing contents of stdio buffers.) Duping file handles is not yet supported for 3-argument @@ -2696,7 +2696,7 @@ STDERR: print STDOUT "stdout 2\n"; print STDERR "stderr 2\n"; -If you specify C<'E&=N'>, where C is a number, then Perl will do an +If you specify C<< '<&=N' >>, where C is a number, then Perl will do an equivalent of C's C of that file descriptor; this is more parsimonious of file descriptors. For example: @@ -3092,10 +3092,10 @@ are inherently non-portable between processors and operating systems because they obey the native byteorder and endianness. For example a 4-byte integer 0x12345678 (305419896 decimal) be ordered natively (arranged in and handled by the CPU registers) into bytes as - + 0x12 0x34 0x56 0x78 # little-endian 0x78 0x56 0x34 0x12 # big-endian - + Basically, the Intel, Alpha, and VAX CPUs are little-endian, while everybody else, for example Motorola m68k/88k, PPC, Sparc, HP PA, Power, and Cray are big-endian. MIPS can be either: Digital used it @@ -3105,12 +3105,12 @@ The names `big-endian' and `little-endian' are comic references to the classic "Gulliver's Travels" (via the paper "On Holy Wars and a Plea for Peace" by Danny Cohen, USC/ISI IEN 137, April 1, 1980) and the egg-eating habits of the Lilliputians. - + Some systems may have even weirder byte orders such as - + 0x56 0x78 0x12 0x34 0x34 0x12 0x78 0x56 - + You can see your system's preference with print join(" ", map { sprintf "%#02x", $_ } @@ -3432,8 +3432,8 @@ When C<$/> is set to C, when readline() is in scalar context (i.e. file slurp mode), and when an empty file is read, it returns C<''> the first time, followed by C subsequently. -This is the internal function implementing the CEXPRE> -operator, but you can use it directly. The CEXPRE> +This is the internal function implementing the C<< >> +operator, but you can use it directly. The C<< >> operator is discussed in more detail in L. $line = ; @@ -3769,7 +3769,7 @@ This is also useful for applications emulating C. Once you hit EOF on your read, and then sleep for a while, you might have to stick in a seek() to reset things. The C doesn't change the current position, but it I clear the end-of-file condition on the handle, so that the -next CFILEE> makes Perl try again to read something. We hope. +next C<< >> makes Perl try again to read something. We hope. If that doesn't work (some stdios are particularly cantankerous), then you may need something more like this: @@ -3863,7 +3863,7 @@ You can effect a sleep of 250 milliseconds this way: select(undef, undef, undef, 0.25); B: One should not attempt to mix buffered I/O (like C -or EFHE) with C, except as permitted by POSIX, and even then only on POSIX systems. You have to use C instead. =item semctl ID,SEMNUM,CMD,ARG @@ -4072,7 +4072,7 @@ Sorts the LIST and returns the sorted list value. If SUBNAME or BLOCK is omitted, Cs in standard string comparison order. If SUBNAME is specified, it gives the name of a subroutine that returns an integer less than, equal to, or greater than C<0>, depending on how the elements -of the list are to be ordered. (The C=E> and C +of the list are to be ordered. (The C<< <=> >> and C operators are extremely useful in such routines.) SUBNAME may be a scalar variable name (unsubscripted), in which case the value provides the name of (or a reference to) the actual subroutine to use. In place @@ -4168,7 +4168,7 @@ Examples: || $a->[2] cmp $b->[2] } map { [$_, /=(\d+)/, uc($_)] } @old; - + # using a prototype allows you to use any comparison subroutine # as a sort subroutine (including other package's subroutines) package other; @@ -4465,7 +4465,7 @@ the F device) or based on the current time and process ID, among other things. In versions of Perl prior to 5.004 the default seed was just the current C