Author: coke
Date: Mon Nov 10 22:00:00 2008
New Revision: 32513
Modified:
trunk/languages/cardinal/src/builtins/cmp.pir
trunk/languages/cardinal/src/builtins/eval.pir
trunk/languages/cardinal/src/classes/Any.pir
trunk/languages/cardinal/src/classes/Array.pir
trunk/languages/cardinal/src/classes/Hash.pir
trunk/languages/cardinal/src/classes/Integer.pir
trunk/languages/cardinal/src/classes/Kernel.pir
trunk/languages/cardinal/src/classes/Object.pir
trunk/languages/cardinal/src/classes/Range.pir
trunk/languages/cardinal/src/classes/String.pir
trunk/languages/cardinal/src/classes/Time.pir
Log:
[cardinal] RT #58974 - use of .return as a synonym for .tailcall is [DEPRECATED]
(getting some test failures which appear to be unrelated to this patch.)
Modified: trunk/languages/cardinal/src/builtins/cmp.pir
==============================================================================
--- trunk/languages/cardinal/src/builtins/cmp.pir (original)
+++ trunk/languages/cardinal/src/builtins/cmp.pir Mon Nov 10 22:00:00 2008
@@ -28,7 +28,7 @@
.param pmc a
.param pmc b
$I0 = iseq a, b
- .return 'prefix:?'($I0)
+ .tailcall 'prefix:?'($I0)
.end
.sub 'infix:==' :multi(Bool,Bool)
@@ -43,21 +43,21 @@
.param pmc a
.param pmc b
$I0 = iseq a, b
- .return 'prefix:?'($I0)
+ .tailcall 'prefix:?'($I0)
.end
.sub 'infix:==' :multi(NilClass,_)
.param pmc a
.param pmc b
$I0 = iseq a, b
- .return 'prefix:?'($I0)
+ .tailcall 'prefix:?'($I0)
.end
.sub 'infix:==' :multi(_,NilClass)
.param pmc a
.param pmc b
$I0 = iseq a, b
- .return 'prefix:?'($I0)
+ .tailcall 'prefix:?'($I0)
.end
.sub 'infix:==' :multi(CardinalArray,CardinalArray)
@@ -76,9 +76,9 @@
inc i
if $I0 goto loop
fail:
- .return 'prefix:?'(0)
+ .tailcall 'prefix:?'(0)
success:
- .return 'prefix:?'(1)
+ .tailcall 'prefix:?'(1)
.end
@@ -87,7 +87,7 @@
.param pmc b
$I0 = 'infix:=='(a, b)
$I0 = not $I0
- .return 'prefix:?'($I0)
+ .tailcall 'prefix:?'($I0)
.end
@@ -95,7 +95,7 @@
.param pmc a
.param pmc b
$I0 = islt a, b
- .return 'prefix:?'($I0)
+ .tailcall 'prefix:?'($I0)
.end
@@ -103,7 +103,7 @@
.param pmc a
.param pmc b
$I0 = isle a, b
- .return 'prefix:?'($I0)
+ .tailcall 'prefix:?'($I0)
.end
@@ -111,7 +111,7 @@
.param pmc a
.param pmc b
$I0 = isgt a, b
- .return 'prefix:?'($I0)
+ .tailcall 'prefix:?'($I0)
.end
@@ -119,7 +119,7 @@
.param pmc a
.param pmc b
$I0 = isge a, b
- .return 'prefix:?'($I0)
+ .tailcall 'prefix:?'($I0)
.end
@@ -133,7 +133,7 @@
.sub 'infix:=~'
.param pmc topic
.param pmc x
- .return x(topic)
+ .tailcall x(topic)
.end
.sub 'infix:!~'
Modified: trunk/languages/cardinal/src/builtins/eval.pir
==============================================================================
--- trunk/languages/cardinal/src/builtins/eval.pir (original)
+++ trunk/languages/cardinal/src/builtins/eval.pir Mon Nov 10 22:00:00 2008
@@ -37,7 +37,7 @@
lang_compile:
.local pmc compiler
compiler = compreg lang
- .return compiler.'evalfiles'(filename)
+ .tailcall compiler.'evalfiles'(filename)
lang_parrot:
load_bytecode filename
Modified: trunk/languages/cardinal/src/classes/Any.pir
==============================================================================
--- trunk/languages/cardinal/src/classes/Any.pir (original)
+++ trunk/languages/cardinal/src/classes/Any.pir Mon Nov 10 22:00:00 2008
@@ -30,7 +30,7 @@
.sub 'can' :method
.param pmc x
$P0 = self.'HOW'()
- .return $P0.'can'(self, x)
+ .tailcall $P0.'can'(self, x)
.end
=item isa($x)
@@ -40,7 +40,7 @@
.sub 'isa' :method
.param pmc x
$P0 = self.'HOW'()
- .return $P0.'isa'(self, x)
+ .tailcall $P0.'isa'(self, x)
.end
=back
Modified: trunk/languages/cardinal/src/classes/Array.pir
==============================================================================
--- trunk/languages/cardinal/src/classes/Array.pir (original)
+++ trunk/languages/cardinal/src/classes/Array.pir Mon Nov 10 22:00:00 2008
@@ -180,7 +180,7 @@
=cut
.sub 'class' :method
- .return self.'WHAT'()
+ .tailcall self.'WHAT'()
.end
=item sort()
@@ -214,7 +214,7 @@
goto fpa_loop
fpa_end:
fpa.'sort'(by)
- .return 'list'(fpa :flat)
+ .tailcall 'list'(fpa :flat)
.end
.sub 'sort!' :method
@@ -660,7 +660,7 @@
goto loop
done:
- .return 'prefix:?'(test)
+ .tailcall 'prefix:?'(test)
.end
=item kv()
@@ -1097,7 +1097,7 @@
.sub 'infix:,'
.param pmc args :slurpy
- .return 'list'(args :flat)
+ .tailcall 'list'(args :flat)
.end
@@ -1382,53 +1382,53 @@
.sub keys :multi('CardinalArray')
.param pmc list
- .return list.'keys'()
+ .tailcall list.'keys'()
.end
.sub values :multi('CardinalArray')
.param pmc list
- .return list.'values'()
+ .tailcall list.'values'()
.end
.sub delete :multi('CardinalArray')
.param pmc list
.param pmc indices :slurpy
- .return list.'delete'(indices :flat)
+ .tailcall list.'delete'(indices :flat)
.end
.sub exists :multi('CardinalArray')
.param pmc list
.param pmc indices :slurpy
- .return list.'exists'(indices :flat)
+ .tailcall list.'exists'(indices :flat)
.end
.sub kv :multi('CardinalArray')
.param pmc list
- .return list.'kv'()
+ .tailcall list.'kv'()
.end
.sub pairs :multi('CardinalArray')
.param pmc list
- .return list.'pairs'()
+ .tailcall list.'pairs'()
.end
.sub grep :multi(_,'CardinalArray')
.param pmc test
.param pmc list :slurpy
- .return list.'grep'(test)
+ .tailcall list.'grep'(test)
.end
.sub first :multi(_,'CardinalArray')
.param pmc test
.param pmc list :slurpy
- .return list.'first'(test)
+ .tailcall list.'first'(test)
.end
.sub 'infix:<<' :multi('CardinalArray',_)
Modified: trunk/languages/cardinal/src/classes/Hash.pir
==============================================================================
--- trunk/languages/cardinal/src/classes/Hash.pir (original)
+++ trunk/languages/cardinal/src/classes/Hash.pir Mon Nov 10 22:00:00 2008
@@ -236,7 +236,7 @@
.sub kv :multi('Hash')
.param pmc hash
- .return hash.'kv'()
+ .tailcall hash.'kv'()
.end
Modified: trunk/languages/cardinal/src/classes/Integer.pir
==============================================================================
--- trunk/languages/cardinal/src/classes/Integer.pir (original)
+++ trunk/languages/cardinal/src/classes/Integer.pir Mon Nov 10 22:00:00 2008
@@ -31,7 +31,7 @@
.sub 'ACCEPTS' :method
.param num topic
- .return 'infix:=='(topic, self)
+ .tailcall 'infix:=='(topic, self)
.end
Modified: trunk/languages/cardinal/src/classes/Kernel.pir
==============================================================================
--- trunk/languages/cardinal/src/classes/Kernel.pir (original)
+++ trunk/languages/cardinal/src/classes/Kernel.pir Mon Nov 10 22:00:00 2008
@@ -68,19 +68,19 @@
.sub 'print' :method
.param pmc args :slurpy
$P0 = get_hll_global 'print'
- .return $P0(self)
+ .tailcall $P0(self)
.end
.sub 'puts' :method
.param pmc args :slurpy
$P0 = get_hll_global 'puts'
- .return $P0(args :flat)
+ .tailcall $P0(args :flat)
.end
.sub 'readline' :method
.param pmc args :slurpy
$P0 = get_hll_global 'readline'
- .return $P0(args)
+ .tailcall $P0(args)
.end
.sub 'printf' :method
@@ -89,7 +89,7 @@
$P0 = get_hll_global 'print'
$P99 = get_hll_global ['Kernel'], '!CARDINALMETA'
$P1 = $P99.'sprintf'(fmt, args :flat)
- .return $P0($P1)
+ .tailcall $P0($P1)
.end
.sub 'sprintf' :method
Modified: trunk/languages/cardinal/src/classes/Object.pir
==============================================================================
--- trunk/languages/cardinal/src/classes/Object.pir (original)
+++ trunk/languages/cardinal/src/classes/Object.pir Mon Nov 10 22:00:00 2008
@@ -185,7 +185,7 @@
=cut
.sub 'true' :method
- .return 'prefix:?'(self)
+ .tailcall 'prefix:?'(self)
.end
=item get_bool(vtable)
@@ -209,12 +209,12 @@
.sub 'print' :method
$P0 = get_hll_global 'print'
- .return $P0(self)
+ .tailcall $P0(self)
.end
.sub 'puts' :method
$P0 = get_hll_global 'puts'
- .return $P0(self)
+ .tailcall $P0(self)
.end
=item to_s()
@@ -241,7 +241,7 @@
.sub 'puts' :method
$P0 = get_hll_global 'puts'
- .return $P0(self)
+ .tailcall $P0(self)
.end
=item !cloneattr(attrlist)
@@ -302,7 +302,7 @@
.end
.sub 'class' :method
- .return self.'WHAT'()
+ .tailcall self.'WHAT'()
.end
.sub 'defined' :method
Modified: trunk/languages/cardinal/src/classes/Range.pir
==============================================================================
--- trunk/languages/cardinal/src/classes/Range.pir (original)
+++ trunk/languages/cardinal/src/classes/Range.pir Mon Nov 10 22:00:00 2008
@@ -204,49 +204,49 @@
Return first element in CardinalRange. Will later be refactored as part of
the Enumerable module.
=cut
.sub 'min' :method
- .return self.'from'()
+ .tailcall self.'from'()
.end
=item
Return first element in CardinalRange.
=cut
.sub 'begin' :method
- .return self.'from'()
+ .tailcall self.'from'()
.end
=item
Return first element in CardinalRange.
=cut
.sub 'first' :method
- .return self.'from'()
+ .tailcall self.'from'()
.end
.sub 'minmax' :method
$P0 = self.'from'()
$P1 = self.'to'()
$P2 = get_hll_global 'list'
- .return $P2($P0, $P1)
+ .tailcall $P2($P0, $P1)
.end
=item
Return last element in CardinalRange. Will later be refactored as part of the
Enumerable module.
=cut
.sub 'max' :method
- .return self.'to'()
+ .tailcall self.'to'()
.end
=item
Return last element in CardinalRange.
=cut
.sub 'last' :method
- .return self.'to'()
+ .tailcall self.'to'()
.end
=item
Return last element in CardinalRange.
=cut
.sub 'end' :method
- .return self.'to'()
+ .tailcall self.'to'()
.end
=item
Modified: trunk/languages/cardinal/src/classes/String.pir
==============================================================================
--- trunk/languages/cardinal/src/classes/String.pir (original)
+++ trunk/languages/cardinal/src/classes/String.pir Mon Nov 10 22:00:00 2008
@@ -41,7 +41,7 @@
.sub 'ACCEPTS' :method
.param string topic
- .return 'infix:eq'(topic, self)
+ .tailcall 'infix:eq'(topic, self)
.end
=item chars()
@@ -187,7 +187,7 @@
.local pmc s
s = new 'CardinalString'
s = self
- .return s.'lc'()
+ .tailcall s.'lc'()
.end
=item upcase()
@@ -200,7 +200,7 @@
.local pmc s
s = new 'CardinalString'
s = self
- .return s.'uc'()
+ .tailcall s.'uc'()
.end
.sub uc :method
@@ -536,7 +536,7 @@
.local pmc s
s = new 'CardinalString'
s = a
- .return s.'lc'()
+ .tailcall s.'lc'()
.end
@@ -553,7 +553,7 @@
.local pmc s
s = new 'CardinalString'
s = a
- .return s.'lcfirst'()
+ .tailcall s.'lcfirst'()
.end
@@ -572,7 +572,7 @@
.local pmc s
s = new 'CardinalString'
s = a
- .return s.'uc'()
+ .tailcall s.'uc'()
.end
@@ -589,7 +589,7 @@
.local pmc s
s = new 'CardinalString'
s = a
- .return s.'ucfirst'()
+ .tailcall s.'ucfirst'()
.end
@@ -607,7 +607,7 @@
.local pmc s
s = new 'CardinalString'
s = a
- .return s.'capitalize'()
+ .tailcall s.'capitalize'()
.end
@@ -639,7 +639,7 @@
a = target
b = sep
- .return a.'split'(b)
+ .tailcall a.'split'(b)
.end
=item join
@@ -719,7 +719,7 @@
.local pmc s
s = new 'CardinalString'
s = a
- .return s.'chop'()
+ .tailcall s.'chop'()
.end
=back
Modified: trunk/languages/cardinal/src/classes/Time.pir
==============================================================================
--- trunk/languages/cardinal/src/classes/Time.pir (original)
+++ trunk/languages/cardinal/src/classes/Time.pir Mon Nov 10 22:00:00 2008
@@ -171,7 +171,7 @@
.end
.sub 'day' :method
- .return self.'mday'()
+ .tailcall self.'mday'()
.end
.sub 'mday' :method
