Author: pmichaud
Date: Sat May 10 13:30:41 2008
New Revision: 27420
Modified:
branches/pgeupdates/compilers/nqp/src/Grammar/Actions.pir
branches/pgeupdates/compilers/nqp/t/24-scalar_context.t
branches/pgeupdates/compilers/nqp/t/25-list_context.t
branches/pgeupdates/compilers/pct/src/PAST/Compiler.pir
branches/pgeupdates/compilers/pct/src/PCT/Grammar.pir
branches/pgeupdates/compilers/pct/src/PCT/HLLCompiler.pir
branches/pgeupdates/compilers/pct/src/PCT/Node.pir
branches/pgeupdates/compilers/pct/src/POST/Compiler.pir
branches/pgeupdates/compilers/pge/PGE/Exp.pir
branches/pgeupdates/compilers/pge/PGE/Match.pir
branches/pgeupdates/compilers/pge/PGE/OPTable.pir
branches/pgeupdates/compilers/pge/PGE/Perl6Regex.pir
branches/pgeupdates/runtime/parrot/library/PGE/Dumper.pir
branches/pgeupdates/runtime/parrot/library/PGE/Hs.pir
branches/pgeupdates/runtime/parrot/library/PGE/Util.pir
branches/pgeupdates/runtime/parrot/library/Parrot/Capture_PIR.pir
branches/pgeupdates/t/compilers/pge/02-match.t
branches/pgeupdates/t/compilers/pge/03-optable.t
branches/pgeupdates/t/compilers/pge/pge.t
Log:
[pge]:
Initial conversions to correspond to S05 updates:
'get_scalar' => 'item'
'get_array' => 'list'
'get_hash' => 'hash'
Modified: branches/pgeupdates/compilers/nqp/src/Grammar/Actions.pir
==============================================================================
--- branches/pgeupdates/compilers/nqp/src/Grammar/Actions.pir (original)
+++ branches/pgeupdates/compilers/nqp/src/Grammar/Actions.pir Sat May 10
13:30:41 2008
@@ -139,7 +139,7 @@
.param pmc match
.local pmc past
$P0 = match['statement_block']
- past = $P0.'get_scalar'()
+ past = $P0.'item'()
past.'blocktype'('declaration')
match.'result_object'(past)
.end
@@ -182,7 +182,7 @@
$P1 = $P0[0]
set_global '$?BLOCK', $P1
$P2 = match['statement_list']
- $P3 = $P2.'get_scalar'()
+ $P3 = $P2.'item'()
past.'push'($P3)
match.'result_object'(past)
.end
@@ -207,7 +207,7 @@
iter_loop:
unless iter goto iter_end
$P2 = shift iter
- $P2 = $P2.'get_scalar'()
+ $P2 = $P2.'item'()
past.'push'($P2)
goto iter_loop
iter_end:
@@ -222,7 +222,7 @@
.param pmc match
.param string key
$P0 = match[key]
- $P1 = $P0.'get_scalar'()
+ $P1 = $P0.'item'()
match.'result_object'($P1)
.end
@@ -262,7 +262,7 @@
unless $I0 goto while
block = match['else']
block = block[0]
- block = block.'get_scalar'()
+ block = block.'item'()
past.'push'( block )
while:
@@ -279,12 +279,12 @@
get_expr:
expr = match['EXPR']
expr = expr[cond]
- expr = expr.'get_scalar'()
+ expr = expr.'item'()
ret
get_block:
block = match['block']
block = block[cond]
- block = block.'get_scalar'()
+ block = block.'item'()
ret
end:
match.'result_object'(past)
@@ -304,10 +304,10 @@
.local pmc expr, block, past
expr = match['EXPR']
expr = expr
- expr = expr.'get_scalar'()
+ expr = expr.'item'()
block = match['block']
block = block
- block = block.'get_scalar'()
+ block = block.'item'()
$P0 = get_hll_global ['PAST'], 'Op'
past = $P0.'new'(expr, block, 'pasttype'=>'unless', 'node'=>match)
match.'result_object'(past)
@@ -324,9 +324,9 @@
.sub 'repeat_statement' :method
.param pmc match
$P1 = match['EXPR']
- $P1 = $P1.'get_scalar'()
+ $P1 = $P1.'item'()
$P2 = match['block']
- $P2 = $P2.'get_scalar'()
+ $P2 = $P2.'item'()
$S0 = match['sym']
$S0 = concat 'repeat_', $S0
$P0 = get_hll_global ['PAST'], 'Op'
@@ -345,9 +345,9 @@
.sub 'while_statement' :method
.param pmc match
$P1 = match['EXPR']
- $P1 = $P1.'get_scalar'()
+ $P1 = $P1.'item'()
$P2 = match['block']
- $P2 = $P2.'get_scalar'()
+ $P2 = $P2.'item'()
$S0 = match['sym']
$P0 = get_hll_global ['PAST'], 'Op'
$P5 = $P0.'new'( $P1, $P2, 'pasttype'=>$S0, 'node'=>match)
@@ -370,9 +370,9 @@
.param pmc match
.local pmc block, past
$P0 = match['EXPR']
- $P0 = $P0.'get_scalar'()
+ $P0 = $P0.'item'()
$P1 = match['block']
- block = $P1.'get_scalar'()
+ block = $P1.'item'()
block.'blocktype'('sub')
.local pmc params, topic_var
params = block[0]
@@ -399,7 +399,7 @@
$P0 = get_hll_global ['PAST'], 'Var'
$P1 = $P0.'new'( 'name'=>'$/', 'scope'=>'lexical' )
$P2 = match['EXPR']
- $P3 = $P2.'get_scalar'()
+ $P3 = $P2.'item'()
$P4 = get_hll_global ['PAST'], 'Op'
$P5 = $P4.'new'($P1, $P3, 'name'=>'result_object',
'pasttype'=>'callmethod')
match.'result_object'($P5)
@@ -423,7 +423,7 @@
if key != 'quote' goto not_quote
$P0 = match['quote']
$P0 = $P0['string_literal']
- inline = $P0.'get_scalar'()
+ inline = $P0.'item'()
goto make
not_quote:
if key != 'heredoc' goto not_heredoc
@@ -443,7 +443,7 @@
.sub 'block' :method
.param pmc match
$P0 = match['statement_block']
- $P0 = $P0.'get_scalar'()
+ $P0 = $P0.'item'()
match.'result_object'($P0)
.end
@@ -470,7 +470,7 @@
.param pmc match
.local pmc past
$P0 = match['block']
- past = $P0.'get_scalar'()
+ past = $P0.'item'()
$S0 = match['ident']
past.'name'($S0)
past.'node'(match)
@@ -491,7 +491,7 @@
$P1 = shift iter
.local pmc parameter
$P2 = $P1['parameter']
- parameter = $P2.'get_scalar'()
+ parameter = $P2.'item'()
$S0 = parameter.'name'()
past.'symbol'($S0, 'scope'=>'lexical')
params.'push'(parameter)
@@ -528,7 +528,7 @@
.param pmc key
.local pmc past, sigil
past = match['param_var']
- past = past.'get_scalar'()
+ past = past.'item'()
sigil = match['param_var';'sigil']
if key != 'slurp' goto not_slurp
if sigil != '@' goto not_slurpy_array
@@ -587,7 +587,7 @@
.param pmc key
.local pmc past
$P0 = match['noun']
- past = $P0.'get_scalar'()
+ past = $P0.'item'()
$P1 = match['postfix']
if null $P1 goto end
.local pmc iter, term
@@ -596,7 +596,7 @@
unless iter goto end
$P2 = shift iter
term = past
- past = $P2.'get_scalar'()
+ past = $P2.'item'()
past.'unshift'(term)
goto iter_loop
end:
@@ -611,7 +611,7 @@
.param pmc match
.param string key
$P0 = match[key]
- $P1 = $P0.'get_scalar'()
+ $P1 = $P0.'item'()
match.'result_object'($P1)
.end
@@ -628,7 +628,7 @@
.param string key
.local pmc past
$P0 = match['arglist']
- past = $P0.'get_scalar'()
+ past = $P0.'item'()
$S0 = match['ident']
past.'name'($S0)
past.'pasttype'('callmethod')
@@ -675,13 +675,13 @@
keyed_array:
$P0 = get_hll_global ['PAST'], 'Var'
$P1 = match['EXPR']
- $P2 = $P1.'get_scalar'()
+ $P2 = $P1.'item'()
$P3 = $P0.'new'( $P2, 'scope'=>'keyed', 'vivibase'=>vivibase,
'viviself'=>'Undef', 'node'=>match )
match.'result_object'($P3)
.return ()
subcall:
$P0 = match['arglist']
- past = $P0.'get_scalar'()
+ past = $P0.'item'()
past.'pasttype'('call')
past.'node'(match)
match.'result_object'(past)
@@ -689,7 +689,7 @@
keyed_const:
$P0 = get_hll_global ['PAST'], 'Val'
$P1 = match['string_literal']
- $P2 = $P1.'get_scalar'()
+ $P2 = $P1.'item'()
.local pmc value
value = $P0.'new'( 'value' => $P2, 'node'=> $P1 )
$P0 = get_hll_global ['PAST'], 'Var'
@@ -702,13 +702,13 @@
## my $expr := $($<EXPR>[0]);
## if $key eq '@( )' {
## make PAST::Op.new( $expr,
-## :name('get_array'),
+## :name('list'),
## :pasttype('callmethod'),
## :node($/) );
## }
## if $key eq '$( )' {
## make PAST::Op.new( $expr,
-## :name('get_scalar'),
+## :name('item'),
## :pasttype('callmethod'),
## :node($/) );
## }
@@ -725,7 +725,7 @@
have_expr:
$P1 = $P0[0]
get_past:
- $P1 = $P1.'get_scalar'()
+ $P1 = $P1.'item'()
$P0 = get_hll_global ['PAST'], 'Op'
if key == '@( )' goto list_context
if key == '$( )' goto scalar_context
@@ -733,11 +733,11 @@
match.'result_object'($P1)
.return ()
list_context:
- past = $P0.'new'($P1, 'name' => 'get_array', 'pasttype'=>'callmethod',
'node'=>match)
+ past = $P0.'new'($P1, 'name' => 'list', 'pasttype'=>'callmethod',
'node'=>match)
match.'result_object'(past)
.return ()
scalar_context:
- past = $P0.'new'($P1, 'name' => 'get_scalar', 'pasttype'=>'callmethod',
'node'=>match)
+ past = $P0.'new'($P1, 'name' => 'item', 'pasttype'=>'callmethod',
'node'=>match)
match.'result_object'(past)
.end
@@ -774,7 +774,7 @@
if null $P1 goto end
.local pmc expr, iter
$P2 = $P1[0]
- expr = $P2.'get_scalar'()
+ expr = $P2.'item'()
$S0 = expr.'name'()
if $S0 != 'infix:,' goto one_arg
comma_arg:
@@ -813,7 +813,7 @@
.param pmc match
.param pmc key
$P0 = match[key]
- $P1 = $P0.'get_scalar'()
+ $P1 = $P0.'item'()
match.'result_object'($P1)
.end
@@ -834,7 +834,7 @@
$P9 = get_hll_global ['PAST'], 'Val'
$P1 = $P9.'new'('value'=>$S0, 'node'=>$P0)
$P2 = match['EXPR']
- $P2 = $P2.'get_scalar'()
+ $P2 = $P2.'item'()
$P9 = get_hll_global ['PAST'], 'Op'
$P3 = $P9.'new'($P1, $P2, 'name'=>'infix:=>', 'returns'=>'Pair',
'node'=>match)
match.'result_object'($P3)
@@ -854,7 +854,7 @@
.param pmc key
.local pmc past
$P0 = match[key]
- past = $P0.'get_scalar'()
+ past = $P0.'item'()
$P1 = match['name']
$P1 = $P1['ident']
past.'namespace'($P1)
@@ -900,7 +900,7 @@
.local pmc past, block
.local string name
$P0 = match['variable']
- past = $P0.'get_scalar'()
+ past = $P0.'item'()
name = past.'name'()
block = get_global '$?BLOCK'
$P0 = block.'symbol'(name)
@@ -968,7 +968,7 @@
.param pmc match
.param pmc key
$P0 = match[key]
- $P1 = $P0.'get_scalar'()
+ $P1 = $P0.'item'()
match.'result_object'($P1)
.end
@@ -981,7 +981,7 @@
.param pmc key :optional
.local string value
$P0 = match['string_literal']
- value = $P0.'get_scalar'()
+ value = $P0.'item'()
$P0 = get_hll_global ['PAST'], 'Val'
$P1 = $P0.'new'('node'=>match, 'value'=>value)
match.'result_object'($P1)
@@ -1037,7 +1037,7 @@
.param pmc key :optional
.local pmc past
$P0 = match['arglist']
- past = $P0.'get_scalar'()
+ past = $P0.'item'()
$S0 = match['ident']
past.'name'($S0)
past.'pasttype'('call')
@@ -1068,7 +1068,7 @@
if key != 'end' goto expr_reduce
expr_end:
$P0 = match['expr']
- $P1 = $P0.'get_scalar'()
+ $P1 = $P0.'item'()
match.'result_object'($P1)
.return ()
expr_reduce:
@@ -1081,7 +1081,7 @@
lvalue = match['top'; 'lvalue']
$P0 = get_hll_global ['PAST'], 'Op'
past = $P0.'new'('node'=>match, 'name'=>name, 'pirop'=>pirop,
'pasttype'=>pasttype, 'inline'=>inline, 'lvalue'=>lvalue)
- $P1 = match.'get_array'()
+ $P1 = match.'list'()
if null $P1 goto iter_end
.local pmc iter
iter = new 'Iterator', $P1
@@ -1091,7 +1091,7 @@
$I0 = $P2.'from'()
$I1 = $P2.'to'()
if $I0 == $I1 goto iter_loop
- $P2 = $P2.'get_scalar'()
+ $P2 = $P2.'item'()
past.'push'($P2)
goto iter_loop
iter_end:
Modified: branches/pgeupdates/compilers/nqp/t/24-scalar_context.t
==============================================================================
--- branches/pgeupdates/compilers/nqp/t/24-scalar_context.t (original)
+++ branches/pgeupdates/compilers/nqp/t/24-scalar_context.t Sat May 10
13:30:41 2008
@@ -5,7 +5,7 @@
plan(1);
class XYZ {
- method get_scalar() {
+ method item() {
'ok 1';
}
}
Modified: branches/pgeupdates/compilers/nqp/t/25-list_context.t
==============================================================================
--- branches/pgeupdates/compilers/nqp/t/25-list_context.t (original)
+++ branches/pgeupdates/compilers/nqp/t/25-list_context.t Sat May 10
13:30:41 2008
@@ -5,7 +5,7 @@
plan(1);
class XYZ {
- method get_array() {
+ method list() {
'ok ', '1';
}
}
Modified: branches/pgeupdates/compilers/pct/src/PAST/Compiler.pir
==============================================================================
--- branches/pgeupdates/compilers/pct/src/PAST/Compiler.pir (original)
+++ branches/pgeupdates/compilers/pct/src/PAST/Compiler.pir Sat May 10
13:30:41 2008
@@ -234,7 +234,7 @@
.return $P0.'new'('result'=>result)
from_past:
- $P0 = node.'get_array'()
+ $P0 = node.'list'()
$I0 = elements $P0
$S0 = repeat 'v', $I0
concat $S0, 'P'
@@ -328,7 +328,7 @@
children_past:
## all children but last can return anything, last returns PMC
- $P0 = node.'get_array'()
+ $P0 = node.'list'()
$I0 = elements $P0
$S0 = repeat 'v', $I0
concat $S0, 'P'
@@ -474,7 +474,7 @@
ops = self.'post_children'(node, 'signature'=>signature)
.local pmc arglist
- arglist = ops.'get_array'()
+ arglist = ops.'list'()
$S0 = substr signature, 0, 1
if $S0 == 'v' goto pirop_void
@@ -1089,7 +1089,7 @@
have_result:
.local pmc arglist
- arglist = ops.'get_array'()
+ arglist = ops.'list'()
ops.'push_pirop'('inline', arglist :flat, 'inline'=>inline,
'result'=>result)
.return (ops)
.end
Modified: branches/pgeupdates/compilers/pct/src/PCT/Grammar.pir
==============================================================================
--- branches/pgeupdates/compilers/pct/src/PCT/Grammar.pir (original)
+++ branches/pgeupdates/compilers/pct/src/PCT/Grammar.pir Sat May 10
13:30:41 2008
@@ -47,14 +47,14 @@
.end
-=item get_scalar()
+=item item()
-Here we overload the get_scalar() method from PGE::Match to
+Here we overload the item() method from PGE::Match to
throw an exception if a result object hasn't been set.
=cut
-.sub 'get_scalar' :method
+.sub 'item' :method
.local pmc obj
obj = getattribute self, '$!result'
unless null obj goto end
Modified: branches/pgeupdates/compilers/pct/src/PCT/HLLCompiler.pir
==============================================================================
--- branches/pgeupdates/compilers/pct/src/PCT/HLLCompiler.pir (original)
+++ branches/pgeupdates/compilers/pct/src/PCT/HLLCompiler.pir Sat May 10
13:30:41 2008
@@ -382,7 +382,7 @@
compile_match:
push_eh err_past
.local pmc ast
- ast = source.'get_scalar'()
+ ast = source.'item'()
pop_eh
$I0 = isa ast, 'PAST::Node'
unless $I0 goto err_past
Modified: branches/pgeupdates/compilers/pct/src/PCT/Node.pir
==============================================================================
--- branches/pgeupdates/compilers/pct/src/PCT/Node.pir (original)
+++ branches/pgeupdates/compilers/pct/src/PCT/Node.pir Sat May 10 13:30:41 2008
@@ -202,7 +202,7 @@
.sub 'iterator' :method
.local pmc iter
- $P0 = self.'get_array'()
+ $P0 = self.'list'()
iter = new 'Iterator', $P0
iter = 0
.return (iter)
Modified: branches/pgeupdates/compilers/pct/src/POST/Compiler.pir
==============================================================================
--- branches/pgeupdates/compilers/pct/src/POST/Compiler.pir (original)
+++ branches/pgeupdates/compilers/pct/src/POST/Compiler.pir Sat May 10
13:30:41 2008
@@ -134,7 +134,7 @@
## get list of arguments to operation
.local pmc arglist
- arglist = node.'get_array'()
+ arglist = node.'list'()
## get format and arguments based on pirop
.local string fmt, name, invocant
Modified: branches/pgeupdates/compilers/pge/PGE/Exp.pir
==============================================================================
--- branches/pgeupdates/compilers/pge/PGE/Exp.pir (original)
+++ branches/pgeupdates/compilers/pge/PGE/Exp.pir Sat May 10 13:30:41 2008
@@ -375,7 +375,7 @@
.local pmc children, exp
.local int n
- children = self.'get_array'()
+ children = self.'list'()
n = elements children
reduce_loop:
if n <= 0 goto reduce_end
@@ -431,7 +431,7 @@
.local pmc iter, exp
code.emit(' %0: # concat', label)
- $P0 = self.get_array()
+ $P0 = self.'list'()
iter = new 'Iterator', $P0
exp = shift iter
$S0 = code.unique('R')
Modified: branches/pgeupdates/compilers/pge/PGE/Match.pir
==============================================================================
--- branches/pgeupdates/compilers/pge/PGE/Match.pir (original)
+++ branches/pgeupdates/compilers/pge/PGE/Match.pir Sat May 10 13:30:41 2008
@@ -208,7 +208,7 @@
.end
-=item C<get_scalar()>
+=item C<item()>
Returns the scalar value of this match -- the "result object"
if there is one, otherwise the substring matched by this match
@@ -216,7 +216,7 @@
=cut
-.sub 'get_scalar' :method
+.sub 'item' :method
.return self.'result_object'()
.end
@@ -263,7 +263,7 @@
unless $I0 goto loop
.return ($S0)
first_key:
- $P0 = self.'get_hash'()
+ $P0 = self.'hash'()
$P1 = new 'Iterator', $P0
unless $P1 goto not_found
$S0 = shift $P1
@@ -428,23 +428,23 @@
.end
-=item C<get_hash()>
+=item C<hash()>
Returns the hash component of the match object.
=cut
-.sub 'get_hash' :method
+.sub 'hash' :method
.return (self)
.end
-=item C<get_array()>
+=item C<list()>
Returns the array component of the match object.
=cut
-.sub 'get_array' :method
+.sub 'list' :method
.local pmc array
array = getattribute self, '@!capt'
.return (array)
Modified: branches/pgeupdates/compilers/pge/PGE/OPTable.pir
==============================================================================
--- branches/pgeupdates/compilers/pge/PGE/OPTable.pir (original)
+++ branches/pgeupdates/compilers/pge/PGE/OPTable.pir Sat May 10 13:30:41 2008
@@ -498,7 +498,7 @@
$S1 = $P1['type']
$S2 = $P2['type']
if $S1 != $S2 goto reduce_saveterm
- $P0 = $P2.get_array()
+ $P0 = $P2.'list'()
$P1 = $P1[1]
push $P0, $P1
$P1 = $P2
Modified: branches/pgeupdates/compilers/pge/PGE/Perl6Regex.pir
==============================================================================
--- branches/pgeupdates/compilers/pge/PGE/Perl6Regex.pir (original)
+++ branches/pgeupdates/compilers/pge/PGE/Perl6Regex.pir Sat May 10
13:30:41 2008
@@ -1169,7 +1169,7 @@
.local pmc array, exp
.local int i, j, n
- array = self.get_array()
+ array = self.'list'()
n = elements array
i = 0
j = 0
Modified: branches/pgeupdates/runtime/parrot/library/PGE/Dumper.pir
==============================================================================
--- branches/pgeupdates/runtime/parrot/library/PGE/Dumper.pir (original)
+++ branches/pgeupdates/runtime/parrot/library/PGE/Dumper.pir Sat May 10
13:30:41 2008
@@ -36,7 +36,7 @@
$I0 = self.from()
print $I0
hascapts = 0
- hash = self."get_hash"()
+ hash = self.'hash'()
if_null hash, dump_array
iter = new 'Iterator', hash
dump_hash_1:
@@ -55,7 +55,7 @@
dumper."dump"(label, val)
goto dump_hash_1
dump_array:
- array = self."get_array"()
+ array = self.'list'()
if_null array, dump_end
$I1 = elements array
$I0 = 0
@@ -142,7 +142,7 @@
goto subpats_1
subrules:
- capt = self.get_hash()
+ capt = self.'hash'()
if_null capt, end
iter = new 'Iterator', capt
subrules_1:
Modified: branches/pgeupdates/runtime/parrot/library/PGE/Hs.pir
==============================================================================
--- branches/pgeupdates/runtime/parrot/library/PGE/Hs.pir (original)
+++ branches/pgeupdates/runtime/parrot/library/PGE/Hs.pir Sat May 10
13:30:41 2008
@@ -203,7 +203,7 @@
subrules:
out .= "] ["
- capt = self."get_hash"()
+ capt = self.'hash'()
if_null capt, end
iter = new 'Iterator', capt
iter = 0
Modified: branches/pgeupdates/runtime/parrot/library/PGE/Util.pir
==============================================================================
--- branches/pgeupdates/runtime/parrot/library/PGE/Util.pir (original)
+++ branches/pgeupdates/runtime/parrot/library/PGE/Util.pir Sat May 10
13:30:41 2008
@@ -211,7 +211,7 @@
pos = match.to()
.local pmc captures
- captures = match.get_array()
+ captures = match.'list'()
if null captures goto capture_end
$I0 = elements captures
$I1 = 0
Modified: branches/pgeupdates/runtime/parrot/library/Parrot/Capture_PIR.pir
==============================================================================
--- branches/pgeupdates/runtime/parrot/library/Parrot/Capture_PIR.pir
(original)
+++ branches/pgeupdates/runtime/parrot/library/Parrot/Capture_PIR.pir Sat May
10 13:30:41 2008
@@ -21,7 +21,7 @@
.end
-.sub 'get_array' :method
+.sub 'list' :method
$P0 = getattribute self, '@!array'
unless null $P0 goto end
$P0 = new 'ResizablePMCArray'
@@ -31,21 +31,21 @@
.end
-.sub 'get_hash' :method
+.sub 'hash' :method
.return (self)
.end
.sub 'unshift_pmc' :vtable :method
.param pmc val
- $P0 = self.'get_array'()
+ $P0 = self.'list'()
unshift $P0, val
.return ()
.end
.sub 'shift_pmc' :vtable :method
- $P0 = self.'get_array'()
+ $P0 = self.'list'()
$P0 = shift $P0
.return ($P0)
.end
@@ -53,14 +53,14 @@
.sub 'push_pmc' :vtable :method
.param pmc val
- $P0 = self.'get_array'()
+ $P0 = self.'list'()
push $P0, val
.return ()
.end
.sub 'pop_pmc' :vtable :method
- $P0 = self.'get_array'()
+ $P0 = self.'list'()
$P0 = pop $P0
.return ($P0)
.end
@@ -90,7 +90,7 @@
.sub 'set_pmc_keyed_int' :vtable :method
.param int key
.param pmc val
- $P0 = self.'get_array'()
+ $P0 = self.'list'()
$P0[key] = val
.return ()
.end
@@ -106,7 +106,7 @@
(subindent, indent) = dumper.'newIndent'()
.local pmc hash, iter
- hash = self.'get_hash'()
+ hash = self.'hash'()
iter = new 'Iterator', hash
dump_hash_loop:
unless iter goto dump_hash_end
@@ -128,7 +128,7 @@
dump_hash_end:
.local pmc array
- array = self.'get_array'()
+ array = self.'list'()
if null array goto dump_array_end
$I1 = elements array
$I0 = 0
Modified: branches/pgeupdates/t/compilers/pge/02-match.t
==============================================================================
--- branches/pgeupdates/t/compilers/pge/02-match.t (original)
+++ branches/pgeupdates/t/compilers/pge/02-match.t Sat May 10 13:30:41 2008
@@ -53,7 +53,7 @@
str = new 'String'
str = 'foo'
push match, str
- arr = match.'get_array'()
+ arr = match.'list'()
$I0 = elements arr
print $I0
print "\n"
Modified: branches/pgeupdates/t/compilers/pge/03-optable.t
==============================================================================
--- branches/pgeupdates/t/compilers/pge/03-optable.t (original)
+++ branches/pgeupdates/t/compilers/pge/03-optable.t Sat May 10 13:30:41 2008
@@ -149,7 +149,7 @@
if type == 'term:' goto print_term
print '('
.local pmc iter
- $P0 = match.get_array()
+ $P0 = match.'list'()
if null $P0 goto iter_end
unless $P0 goto iter_end
iter = new 'Iterator', $P0
Modified: branches/pgeupdates/t/compilers/pge/pge.t
==============================================================================
--- branches/pgeupdates/t/compilers/pge/pge.t (original)
+++ branches/pgeupdates/t/compilers/pge/pge.t Sat May 10 13:30:41 2008
@@ -29,7 +29,7 @@
qw/
next from to __get_bool __get_integer __get_number
__get_string __get_pmc_keyed_int __set_pmc_keyed_int
- __delete_keyed_int __defined_keyed_int get_hash get_array
+ __delete_keyed_int __defined_keyed_int list hash
/
],
},
