Author: coke
Date: Mon Nov 10 22:12:27 2008
New Revision: 32515
Modified:
trunk/languages/pipp/src/common/php_info.pir
trunk/languages/pipp/src/common/php_math.pir
trunk/languages/pipp/src/common/php_pcre.pir
trunk/languages/pipp/src/common/php_string.pir
trunk/languages/pipp/src/common/pipp.pir
Log:
[pipp] RT #58974 - use of .return as a synonym for .tailcall is [DEPRECATED]
Modified: trunk/languages/pipp/src/common/php_info.pir
==============================================================================
--- trunk/languages/pipp/src/common/php_info.pir (original)
+++ trunk/languages/pipp/src/common/php_info.pir Mon Nov 10 22:12:27 2008
@@ -96,7 +96,7 @@
wrong_param_count()
.RETURN_NULL()
L1:
- .return logo_guid()
+ .tailcall logo_guid()
.end
=item C<string php_real_logo_guid(void)>
@@ -154,7 +154,7 @@
if $I0 goto L1
.RETURN_NULL()
L1:
- .return get_uname(mode)
+ .tailcall get_uname(mode)
.end
=item C<void phpcredits([int flag])>
Modified: trunk/languages/pipp/src/common/php_math.pir
==============================================================================
--- trunk/languages/pipp/src/common/php_math.pir (original)
+++ trunk/languages/pipp/src/common/php_math.pir Mon Nov 10 22:12:27 2008
@@ -647,7 +647,7 @@
unless argc == 1 goto L1
$P1 = shift args
$N1 = $P1
- .return _number_format($N1, 0, dec_point, thousand_sep)
+ .tailcall _number_format($N1, 0, dec_point, thousand_sep)
L1:
unless argc == 2 goto L2
$P1 = shift args
@@ -655,7 +655,7 @@
$N1 = $P1
$P2 = shift args
$I2 = $P2
- .return _number_format($N1, $I2, dec_point, thousand_sep)
+ .tailcall _number_format($N1, $I2, dec_point, thousand_sep)
L2:
unless argc == 4 goto L3
$P1 = shift args
@@ -679,7 +679,7 @@
unless $I4 goto L5
thousand_sep =substr thousand_sep, 0, 1
L5:
- .return _number_format($N1, $I2, dec_point, thousand_sep)
+ .tailcall _number_format($N1, $I2, dec_point, thousand_sep)
L3:
wrong_param_count()
.RETURN_NULL()
Modified: trunk/languages/pipp/src/common/php_pcre.pir
==============================================================================
--- trunk/languages/pipp/src/common/php_pcre.pir (original)
+++ trunk/languages/pipp/src/common/php_pcre.pir Mon Nov 10 22:12:27 2008
@@ -278,7 +278,7 @@
unless null pce goto L2
.RETURN_FALSE()
L2:
- .return preg_grep_impl(pce, input, flags)
+ .tailcall preg_grep_impl(pce, input, flags)
.end
.sub 'preg_grep_impl' :anon
@@ -336,7 +336,7 @@
unless $I0 >= 4 goto L3
use_flags = 1
L3:
- .return pcre_match_impl(pce, subject, subpats, 0, use_flags, flags,
start_offset)
+ .tailcall pcre_match_impl(pce, subject, subpats, 0, use_flags, flags,
start_offset)
.end
.sub 'pcre_match_impl' :anon
@@ -389,7 +389,7 @@
unless $I0 >= 4 goto L3
use_flags = 1
L3:
- .return pcre_match_impl(pce, subject, subpats, 1, use_flags, flags,
start_offset)
+ .tailcall pcre_match_impl(pce, subject, subpats, 1, use_flags, flags,
start_offset)
.end
=item C<string preg_quote(string str [, string delim_char])>
@@ -486,7 +486,7 @@
unless null pce goto L2
.RETURN_FALSE()
L2:
- .return pcre_split_impl(pce, subject, limit, flags)
+ .tailcall pcre_split_impl(pce, subject, limit, flags)
.end
.sub 'pcre_split_impl' :anon
Modified: trunk/languages/pipp/src/common/php_string.pir
==============================================================================
--- trunk/languages/pipp/src/common/php_string.pir (original)
+++ trunk/languages/pipp/src/common/php_string.pir Mon Nov 10 22:12:27 2008
@@ -85,9 +85,9 @@
unless argc > 1 goto L3
$P2 = shift args
$S2 = $P2
- .return _trim($S1, $S2, .mode)
+ .tailcall _trim($S1, $S2, .mode)
L3:
- .return _trim($S1, " \n\r\t\v\0", .mode)
+ .tailcall _trim($S1, " \n\r\t\v\0", .mode)
.endm
=item C<string addcslashes(string str, string charlist)>
@@ -303,7 +303,7 @@
.sub 'join'
.param pmc args :slurpy
- .return implode(args :flat)
+ .tailcall implode(args :flat)
.end
=item C<array localeconv(void)>
@@ -599,7 +599,7 @@
.sub 'strchr'
.param pmc args :slurpy
- .return strstr(args :flat)
+ .tailcall strstr(args :flat)
.end
=item C<int strcoll(string str1, string str2)>
Modified: trunk/languages/pipp/src/common/pipp.pir
==============================================================================
--- trunk/languages/pipp/src/common/pipp.pir (original)
+++ trunk/languages/pipp/src/common/pipp.pir Mon Nov 10 22:12:27 2008
@@ -196,7 +196,7 @@
.local pmc pipp_compiler
pipp_compiler = compreg 'Pipp'
- .return pipp_compiler.'evalfiles'( source_fn, 'target' => target )
+ .tailcall pipp_compiler.'evalfiles'( source_fn, 'target' => target )
VARIANT_PHC:
.local string phc_src_dir
@@ -224,7 +224,7 @@
ret = spawnw cmd
if ret goto ERROR
- .return run_nqp( 'pipp_phc_past.nqp', target )
+ .tailcall run_nqp( 'pipp_phc_past.nqp', target )
VARIANT_ANTLR3:
@@ -236,10 +236,10 @@
ret = spawnw cmd
if ret goto ERROR
- .return run_nqp( 'pipp_antlr_past.nqp', target )
+ .tailcall run_nqp( 'pipp_antlr_past.nqp', target )
RUN_NQP:
- .return run_nqp( source_fn, target )
+ .tailcall run_nqp( source_fn, target )
ERROR:
