Author: mdiep
Date: Wed May 2 15:49:45 2007
New Revision: 18401
Modified:
trunk/compilers/past/Node.pir
trunk/compilers/pge/PGE/Match.pir
trunk/compilers/pge/PGE/OPTable.pir
trunk/compilers/tge/TGE/Compiler.pir
trunk/compilers/tge/TGE/Grammar.pir
trunk/compilers/tge/TGE/Tree.pir
trunk/languages/Zcode/z3main.pir
trunk/languages/forth/tokenstream.pir
trunk/languages/forth/variablestack.pir
trunk/languages/forth/virtualstack.pir
trunk/languages/perl6/src/builtins/hash.pir
trunk/languages/perl6/src/classes/List.pir
trunk/languages/pheme/lib/POST/Label.pir
trunk/languages/pheme/lib/POST/Node.pir
trunk/languages/pheme/lib/PhemeObjects.pir
trunk/languages/tcl/src/grammar/expr/past.pir
trunk/runtime/parrot/library/Getopt/Obj.pir
trunk/runtime/parrot/library/HTTP/Daemon.pir
trunk/runtime/parrot/library/Parrot/Capture_PIR.pir
trunk/runtime/parrot/library/Parrot/Coroutine.pir
trunk/runtime/parrot/library/Parrot/HLLCompiler.pir
trunk/runtime/parrot/library/Pg.pir
trunk/runtime/parrot/library/SDL/Button.pir
trunk/runtime/parrot/library/SDL/Color.pir
trunk/runtime/parrot/library/SDL/LCD.pir
trunk/runtime/parrot/library/SDL/StopWatch.pir
trunk/runtime/parrot/library/Stream/Base.pir
trunk/runtime/parrot/library/Stream/Combiner.pir
trunk/runtime/parrot/library/Stream/Lines.pir
trunk/runtime/parrot/library/Stream/ParrotIO.pir
trunk/runtime/parrot/library/Stream/Replay.pir
trunk/runtime/parrot/library/Stream/Writer.pir
trunk/runtime/parrot/library/Test/Builder.pir
trunk/runtime/parrot/library/Test/Builder/Output.pir
trunk/runtime/parrot/library/Test/Builder/Test.pir
trunk/runtime/parrot/library/Test/Builder/TestPlan.pir
trunk/runtime/parrot/library/Test/Builder/Tester.pir
trunk/t/compilers/imcc/syn/objects.t
trunk/t/compilers/tge/parser.t
trunk/t/op/calling.t
trunk/t/op/gc.t
trunk/t/op/string.t
trunk/t/pmc/delegate.t
trunk/t/pmc/exception.t
trunk/t/pmc/namespace.t
Log:
I've got a fever and the only prescription is more :vtable (part 2)
Modified: trunk/compilers/past/Node.pir
==============================================================================
--- trunk/compilers/past/Node.pir (original)
+++ trunk/compilers/past/Node.pir Wed May 2 15:49:45 2007
@@ -20,7 +20,7 @@
.end
-.sub __init :method
+.sub init :vtable :method
$P1 = new .Undef
$P2 = new .Integer
$P3 = new .ResizablePMCArray
@@ -125,13 +125,13 @@
=cut
-.sub '__elements' :method
+.sub 'elements' :vtable :method
$P1 = getattribute self, 'children'
$I1 = elements $P1
.return ($I1)
.end
-.sub '__get_bool' :method
+.sub 'get_bool' :vtable :method
.return( 1 )
.end
@@ -145,14 +145,14 @@
=cut
-.sub '__get_pmc_keyed_int' :method
+.sub 'get_pmc_keyed_int' :vtable :method
.param int key
$P0 = getattribute self, 'children'
$P0 = $P0[key]
.return ($P0)
.end
-.sub '__set_pmc_keyed_int' :method
+.sub 'set_pmc_keyed_int' :vtable :method
.param int key
.param pmc val
$P0 = getattribute self, 'children'
Modified: trunk/compilers/pge/PGE/Match.pir
==============================================================================
--- trunk/compilers/pge/PGE/Match.pir (original)
+++ trunk/compilers/pge/PGE/Match.pir Wed May 2 15:49:45 2007
@@ -379,7 +379,7 @@
=cut
-.sub '__get_bool' :method
+.sub 'get_bool' :vtable :method
$P1 = getattribute self, '$.pos'
$I0 = $P1
$I1 = isge $I0, 0
@@ -392,7 +392,7 @@
=cut
-.sub '__get_integer' :method
+.sub 'get_integer' :vtable :method
$I0 = self.'result_object'()
.return ($I0)
.end
@@ -403,7 +403,7 @@
=cut
-.sub '__get_number' :method
+.sub 'get_number' :vtable :method
$N0 = self.'result_object'()
.return ($N0)
.end
@@ -414,7 +414,7 @@
=cut
-.sub '__get_string' :method
+.sub 'get_string' :vtable :method
$S0 = self.'result_object'()
.return ($S0)
.end
@@ -427,7 +427,7 @@
=cut
-.sub '__get_string_keyed_int' :method
+.sub 'get_string_keyed_int' :vtable :method
.param int key
$P0 = getattribute self, '@!capt'
$S0 = ''
@@ -446,7 +446,7 @@
=cut
-.sub '__get_pmc_keyed_int' :method
+.sub 'get_pmc_keyed_int' :vtable :method
.param int key
$P0 = getattribute self, '@!capt'
if_null $P0, get_1
@@ -455,7 +455,7 @@
.return ($P0)
.end
-.sub '__set_pmc_keyed_int' :method
+.sub 'set_pmc_keyed_int' :vtable :method
.param int key
.param pmc val
.local pmc capt
@@ -467,14 +467,14 @@
capt[key] = val
.end
-.sub '__delete_keyed_int' :method
+.sub 'delete_keyed_int' :vtable :method
.param int key
.local pmc capt
capt = getattribute self, '@!capt'
delete capt[key]
.end
-.sub '__defined_keyed_int' :method
+.sub 'defined_keyed_int' :vtable :method
.param int key
.local pmc capt
$I0 = 0
@@ -485,7 +485,7 @@
.return ($I0)
.end
-.sub '__push_pmc' :method
+.sub 'push_pmc' :vtable :method
.param pmc val
.local pmc capt
capt = getattribute self, '@!capt'
Modified: trunk/compilers/pge/PGE/OPTable.pir
==============================================================================
--- trunk/compilers/pge/PGE/OPTable.pir (original)
+++ trunk/compilers/pge/PGE/OPTable.pir Wed May 2 15:49:45 2007
@@ -72,7 +72,7 @@
.end
-.sub "__init" :method
+.sub "init" :vtable :method
.local pmc tokentable, keytable, klentable
tokentable = self
keytable = new .Hash
Modified: trunk/compilers/tge/TGE/Compiler.pir
==============================================================================
--- trunk/compilers/tge/TGE/Compiler.pir (original)
+++ trunk/compilers/tge/TGE/Compiler.pir Wed May 2 15:49:45 2007
@@ -33,8 +33,7 @@
start_rule = find_global "TGE::Parser", "start"
match = start_rule(source, 'grammar'=>'TGE::Parser')
# Verify the parse
- $I0 = match.__get_bool()
- unless $I0 goto err_parse # if parse fails, stop
+ unless match goto err_parse # if parse fails, stop
# say 'parse succeeded'
# say 'Match tree dump:'
# load_bytecode "dumper.pbc"
@@ -55,7 +54,7 @@
end
.end
-.sub __init :method
+.sub init :vtable :method
self.add_rule("ROOT", "result", ".", "ROOT_result")
self.add_rule("statements", "result", ".", "statements_result")
self.add_rule("statement", "result", ".", "statement_result")
@@ -315,7 +314,7 @@
goto loop_start
loop_end:
- outstring .= "\n.sub __init :method\n"
+ outstring .= "\n.sub init :vtable :method\n"
outstring .= header_string
outstring .= "\n.end\n"
Modified: trunk/compilers/tge/TGE/Grammar.pir
==============================================================================
--- trunk/compilers/tge/TGE/Grammar.pir (original)
+++ trunk/compilers/tge/TGE/Grammar.pir Wed May 2 15:49:45 2007
@@ -32,7 +32,7 @@
=cut
-.sub __init :method
+.sub init :vtable :method
$P1 = new .ResizablePMCArray
setattribute self, 'rules', $P1
$P2 = new .Hash
Modified: trunk/compilers/tge/TGE/Tree.pir
==============================================================================
--- trunk/compilers/tge/TGE/Tree.pir (original)
+++ trunk/compilers/tge/TGE/Tree.pir Wed May 2 15:49:45 2007
@@ -37,7 +37,7 @@
=cut
-.sub __init :method
+.sub init :vtable :method
$P0 = new .Hash
$P1 = new .Hash
$P2 = new .Undef
Modified: trunk/languages/Zcode/z3main.pir
==============================================================================
--- trunk/languages/Zcode/z3main.pir (original)
+++ trunk/languages/Zcode/z3main.pir Wed May 2 15:49:45 2007
@@ -229,7 +229,7 @@
.namespace ["ZComp"]
-.sub "__init" :method
+.sub "init" :vtable :method
$P0 = new Hash
setattribute self, "ZComp\0labels", $P0
$P0 = new Hash
Modified: trunk/languages/forth/tokenstream.pir
==============================================================================
--- trunk/languages/forth/tokenstream.pir (original)
+++ trunk/languages/forth/tokenstream.pir Wed May 2 15:49:45 2007
@@ -31,7 +31,7 @@
.end
-.sub '__get_bool' :method
+.sub 'get_bool' :vtable :method
.local string code
.local pmc pos
pos = getattribute self, '$pos'
@@ -53,7 +53,7 @@
.return(0)
.end
-.sub '__shift_pmc' :method
+.sub 'shift_pmc' :vtable :method
.local pmc token, pos
.local string code, str
null token
Modified: trunk/languages/forth/variablestack.pir
==============================================================================
--- trunk/languages/forth/variablestack.pir (original)
+++ trunk/languages/forth/variablestack.pir Wed May 2 15:49:45 2007
@@ -10,7 +10,7 @@
addattribute class, '$next'
.end
-.sub __init :method
+.sub init :vtable :method
.local pmc stack, cell
stack = new .ResizableIntegerArray
cell = new .Integer
@@ -20,7 +20,7 @@
setattribute self, '$next', cell
.end
-.sub __get_integer :method
+.sub get_integer :vtable :method
.local pmc next
next = getattribute self, '$next'
$I0 = next
@@ -28,7 +28,7 @@
.return($I0)
.end
-.sub __get_pmc_keyed_int :method
+.sub get_pmc_keyed_int :vtable :method
.param int key
.local pmc stack
stack = getattribute self, '@stack'
@@ -37,7 +37,7 @@
.return($P0)
.end
-.sub __set_pmc_keyed_int :method
+.sub set_pmc_keyed_int :vtable :method
.param int key
.param pmc value
Modified: trunk/languages/forth/virtualstack.pir
==============================================================================
--- trunk/languages/forth/virtualstack.pir (original)
+++ trunk/languages/forth/virtualstack.pir Wed May 2 15:49:45 2007
@@ -9,32 +9,32 @@
addattribute class, '@cstack'
.end
-.sub __init :method
+.sub init :vtable :method
.local pmc cstack
cstack = new .ResizableStringArray
setattribute self, '@cstack', cstack
.end
-.sub __elements :method
+.sub elements :vtable :method
$P0 = getattribute self, '@cstack'
$I0 = elements $P0
.return($I0)
.end
-.sub __get_bool :method
+.sub get_bool :vtable :method
$P0 = getattribute self, '@cstack'
$I0 = elements $P0
.return($I0)
.end
-.sub __get_string_keyed_int :method
+.sub get_string_keyed_int :vtable :method
.param int key
$P0 = getattribute self, '@cstack'
$S0 = $P0[key]
.return($S0)
.end
-.sub __pop_string :method
+.sub pop_string :vtable :method
.local pmc cstack
cstack = getattribute self, '@cstack'
@@ -48,7 +48,7 @@
.return("pop stack")
.end
-.sub __push_string :method
+.sub push_string :vtable :method
.param string elem
.local pmc cstack
Modified: trunk/languages/perl6/src/builtins/hash.pir
==============================================================================
--- trunk/languages/perl6/src/builtins/hash.pir (original)
+++ trunk/languages/perl6/src/builtins/hash.pir Wed May 2 15:49:45 2007
@@ -25,7 +25,7 @@
.namespace [ 'Perl6Hash' ]
-.sub '__get_string' :method
+.sub 'get_string' :vtable :method
$S0 = ''
.local pmc iter
iter = new .Iterator, self
@@ -44,7 +44,7 @@
## FIXME: Parrot currently requires us to write our own "clone" method.
-.sub '__clone' :method
+.sub 'clone' :vtable :method
$P0 = new 'Perl6Hash'
.local pmc iter
iter = new .Iterator, self
Modified: trunk/languages/perl6/src/classes/List.pir
==============================================================================
--- trunk/languages/perl6/src/classes/List.pir (original)
+++ trunk/languages/perl6/src/classes/List.pir Wed May 2 15:49:45 2007
@@ -24,7 +24,7 @@
.namespace [ 'List' ]
-.sub '__clone' :method
+.sub 'clone' :vtable :method
$P0 = new 'List'
$I1 = elements self
$I0 = 0
@@ -39,7 +39,7 @@
.end
-.sub '__set_pmc' :method
+.sub 'set_pmc' :vtable :method
.param pmc value
self = 0
$P0 = new .Iterator, value
@@ -53,7 +53,7 @@
.end
-.sub '__get_string' :method
+.sub 'get_string' :vtable :method
$S0 = ''
$I1 = elements self
if $I1 < 1 goto end
Modified: trunk/languages/pheme/lib/POST/Label.pir
==============================================================================
--- trunk/languages/pheme/lib/POST/Label.pir (original)
+++ trunk/languages/pheme/lib/POST/Label.pir Wed May 2 15:49:45 2007
@@ -86,7 +86,7 @@
.return ($P2)
.end
-.sub __clone :method
+.sub clone :vtable :method
.local pmc result
result = new 'POST::Label'
$P1 = self.'name'()
Modified: trunk/languages/pheme/lib/POST/Node.pir
==============================================================================
--- trunk/languages/pheme/lib/POST/Node.pir (original)
+++ trunk/languages/pheme/lib/POST/Node.pir Wed May 2 15:49:45 2007
@@ -21,7 +21,7 @@
.end
-.sub __init :method
+.sub init :vtable :method
$P1 = new .Undef
$P2 = new .Integer
$P3 = new .ResizablePMCArray
@@ -33,7 +33,7 @@
setattribute self, 'symbols', $P4
.end
-.sub __get_bool :method
+.sub get_bool :vtable :method
.return( 1 )
.end
Modified: trunk/languages/pheme/lib/PhemeObjects.pir
==============================================================================
--- trunk/languages/pheme/lib/PhemeObjects.pir (original)
+++ trunk/languages/pheme/lib/PhemeObjects.pir Wed May 2 15:49:45 2007
@@ -8,11 +8,11 @@
addattribute cons_class, 'tail'
.end
-.sub '__get_bool'
+.sub 'get_bool' :vtable
.return( 1 )
.end
-.sub '__get_string' :method
+.sub 'get_string' :vtable :method
.local pmc head
.local string output
head = self.'head'()
@@ -50,7 +50,7 @@
.return( head )
.end
-.sub __get_integer :method
+.sub get_integer :vtable :method
.local pmc elem
elem = self.'head'()
Modified: trunk/languages/tcl/src/grammar/expr/past.pir
==============================================================================
--- trunk/languages/tcl/src/grammar/expr/past.pir (original)
+++ trunk/languages/tcl/src/grammar/expr/past.pir Wed May 2 15:49:45 2007
@@ -72,7 +72,7 @@
=cut
-.sub __init :method
+.sub init :vtable :method
$P0 = new .String
$P1 = new .Integer
$P2 = new .ResizablePMCArray
Modified: trunk/runtime/parrot/library/Getopt/Obj.pir
==============================================================================
--- trunk/runtime/parrot/library/Getopt/Obj.pir (original)
+++ trunk/runtime/parrot/library/Getopt/Obj.pir Wed May 2 15:49:45 2007
@@ -98,7 +98,7 @@
=cut
-.sub __init :method
+.sub init :vtable :method
$P0 = new .ResizablePMCArray
setattribute self, "Specs", $P0
$P0 = new .Boolean
@@ -375,7 +375,7 @@
=cut
-.sub "__push_string" :method
+.sub "push_string" :vtable :method
.param string format
.local string key, type, long, short
$P0 = self."add"()
@@ -570,7 +570,7 @@
=cut
-.sub __init :method
+.sub init :vtable :method
$P0 = new .String
$P0 = ''
setattribute self, "name", $P0
Modified: trunk/runtime/parrot/library/HTTP/Daemon.pir
==============================================================================
--- trunk/runtime/parrot/library/HTTP/Daemon.pir (original)
+++ trunk/runtime/parrot/library/HTTP/Daemon.pir Wed May 2 15:49:45 2007
@@ -121,7 +121,7 @@
=cut
-.sub __init :method
+.sub init_pmc :vtable :method
.param pmc args
.local pmc active
@@ -216,7 +216,7 @@
=cut
-.sub '__get_bool' :method
+.sub 'get_bool' :vtable :method
$P0 = getattribute self, 'socket'
$I0 = istrue $P0
.return ($I0)
@@ -506,13 +506,13 @@
=over
-=item __init(pio)
+=item init_pmc(pio)
Create a new connection object with the given socket pio.
=cut
-.sub __init :method
+.sub init_pmc :vtable :method
.param pmc sock
setattribute self, 'socket', sock
$P0 = new .Boolean
@@ -928,7 +928,7 @@
=cut
-.sub __init :method
+.sub init :vtable :method
$P0 = new .OrderedHash
setattribute self, 'headers', $P0
$P0 = new .String
@@ -1033,7 +1033,7 @@
.return ('')
.end
-.sub __get_bool :method
+.sub get_bool :vtable :method
.local pmc hdrs
hdrs = self.'headers'()
$I0 = elements hdrs
Modified: trunk/runtime/parrot/library/Parrot/Capture_PIR.pir
==============================================================================
--- trunk/runtime/parrot/library/Parrot/Capture_PIR.pir (original)
+++ trunk/runtime/parrot/library/Parrot/Capture_PIR.pir Wed May 2 15:49:45 2007
@@ -36,7 +36,7 @@
.end
-.sub '__push_pmc' :method
+.sub 'push_pmc' :vtable :method
.param pmc val
$P0 = self.'get_array'()
push $P0, val
@@ -44,7 +44,7 @@
.end
-.sub '__get_string_keyed_int' :method
+.sub 'get_string_keyed_int' :vtable :method
.param int key
$S0 = ''
$P0 = getattribute self, '@!array'
@@ -55,7 +55,7 @@
.end
-.sub '__get_pmc_keyed_int' :method
+.sub 'get_pmc_keyed_int' :vtable :method
.param int key
$P0 = getattribute self, '@!array'
if null $P0 goto end
@@ -65,7 +65,7 @@
.end
-.sub '__set_pmc_keyed_int' :method
+.sub 'set_pmc_keyed_int' :vtable :method
.param int key
.param pmc val
$P0 = self.'get_array'()
Modified: trunk/runtime/parrot/library/Parrot/Coroutine.pir
==============================================================================
--- trunk/runtime/parrot/library/Parrot/Coroutine.pir (original)
+++ trunk/runtime/parrot/library/Parrot/Coroutine.pir Wed May 2 15:49:45 2007
@@ -120,7 +120,7 @@
=cut
-.sub __init_pmc :method
+.sub init_pmc :vtable :method
.param pmc sub
## [should complain if sub is not a sub or closure. -- rgr, 8-Oct-06.]
@@ -132,7 +132,7 @@
.end
## [it would be nice to include a pointer value. -- rgr, 8-Oct-06.]
-.sub __get_string :method
+.sub get_string :vtable :method
$S0 = '<Parrot::Coroutine ?>'
.return ($S0)
.end
Modified: trunk/runtime/parrot/library/Parrot/HLLCompiler.pir
==============================================================================
--- trunk/runtime/parrot/library/Parrot/HLLCompiler.pir (original)
+++ trunk/runtime/parrot/library/Parrot/HLLCompiler.pir Wed May 2 15:49:45 2007
@@ -42,7 +42,7 @@
.include 'cclass.pasm'
-.sub '__init' :method
+.sub 'init' :vtable :method
$P0 = split ' ', 'parse past post pir run'
setattribute self, '@stages', $P0
.end
Modified: trunk/runtime/parrot/library/Pg.pir
==============================================================================
--- trunk/runtime/parrot/library/Pg.pir (original)
+++ trunk/runtime/parrot/library/Pg.pir Wed May 2 15:49:45 2007
@@ -98,12 +98,12 @@
=cut
-.sub __init_pmc :method
+.sub init_pmc :vtable :method
.param pmc con
setattribute self, 'con', con
.end
-.sub __get_bool :method
+.sub get_bool :vtable :method
.local pmc con
con = getattribute self, 'con'
$I0 = typeof con
@@ -301,7 +301,7 @@
=cut
-.sub __init_pmc :method
+.sub init_pmc :vtable :method
.param pmc res
setattribute self, 'res', res
need_finalize self
Modified: trunk/runtime/parrot/library/SDL/Button.pir
==============================================================================
--- trunk/runtime/parrot/library/SDL/Button.pir (original)
+++ trunk/runtime/parrot/library/SDL/Button.pir Wed May 2 15:49:45 2007
@@ -63,7 +63,7 @@
=cut
-.sub __init :method
+.sub init_pmc :vtable :method
.param pmc name
$I0 = classoffset self, 'SDL::Button'
@@ -103,11 +103,11 @@
setattribute self, $I0, $P0
.end
-=item __set_integer_native
+=item set_integer_native
=cut
-.sub __set_integer_native :method
+.sub set_integer_native :vtable :method
.param int val
$I0 = classoffset self, 'SDL::Button'
@@ -116,11 +116,11 @@
$P0 = val
.end
-=item __get_integer
+=item get_integer
=cut
-.sub __get_integer :method
+.sub get_integer :vtable :method
$I0 = classoffset self, 'SDL::Button'
inc $I0
$P0 = getattribute self, $I0
Modified: trunk/runtime/parrot/library/SDL/Color.pir
==============================================================================
--- trunk/runtime/parrot/library/SDL/Color.pir (original)
+++ trunk/runtime/parrot/library/SDL/Color.pir Wed May 2 15:49:45 2007
@@ -118,7 +118,7 @@
.return()
.end
-.sub __get_integer :method
+.sub get_integer :vtable :method
.local pmc color
color = self.'color'()
Modified: trunk/runtime/parrot/library/SDL/LCD.pir
==============================================================================
--- trunk/runtime/parrot/library/SDL/LCD.pir (original)
+++ trunk/runtime/parrot/library/SDL/LCD.pir Wed May 2 15:49:45 2007
@@ -60,7 +60,7 @@
END:
.end
-.sub __init :method
+.sub init :vtable :method
$I0 = classoffset self, "SDL::LCD"
$P0 = new .String
@@ -97,13 +97,13 @@
$P0 = val
.end
-=item __set_integer_native( val )
+=item set_integer_native( val )
Sets the LCD content to display.
=cut
-.sub __set_integer_native :method
+.sub set_integer_native :vtable :method
.param int val
$I0 = classoffset self, "SDL::LCD"
@@ -111,13 +111,13 @@
$P0 = val
.end
-=item __set_string_native( val )
+=item set_string_native( val )
Sets the LCD content to display.
=cut
-.sub __set_string_native :method
+.sub set_string_native :vtable :method
.param string val
$I0 = classoffset self, "SDL::LCD"
Modified: trunk/runtime/parrot/library/SDL/StopWatch.pir
==============================================================================
--- trunk/runtime/parrot/library/SDL/StopWatch.pir (original)
+++ trunk/runtime/parrot/library/SDL/StopWatch.pir Wed May 2 15:49:45 2007
@@ -58,7 +58,7 @@
=cut
-.sub __init :method
+.sub init :vtable :method
.param pmc screen
$I0 = classoffset self, 'SDL::StopWatch'
Modified: trunk/runtime/parrot/library/Stream/Base.pir
==============================================================================
--- trunk/runtime/parrot/library/Stream/Base.pir (original)
+++ trunk/runtime/parrot/library/Stream/Base.pir Wed May 2 15:49:45 2007
@@ -41,7 +41,7 @@
END:
.end
-.sub __init :method
+.sub init :vtable :method
.local pmc close
# call our own close
@@ -53,7 +53,7 @@
=cut
-.sub __set_pmc :method
+.sub set_pmc :vtable :method
.param pmc source
classoffset $I0, self, "Stream::Base"
Modified: trunk/runtime/parrot/library/Stream/Combiner.pir
==============================================================================
--- trunk/runtime/parrot/library/Stream/Combiner.pir (original)
+++ trunk/runtime/parrot/library/Stream/Combiner.pir Wed May 2 15:49:45 2007
@@ -54,7 +54,7 @@
.namespace ["Stream::Combiner"]
-.sub __init :method
+.sub init :vtable :method
.const .Sub temp = "_default_combiner"
self."combiner"( temp )
@@ -92,7 +92,7 @@
=cut
-.sub __set_pmc :method
+.sub set_pmc :vtable :method
.param pmc arg
.local pmc source
Modified: trunk/runtime/parrot/library/Stream/Lines.pir
==============================================================================
--- trunk/runtime/parrot/library/Stream/Lines.pir (original)
+++ trunk/runtime/parrot/library/Stream/Lines.pir Wed May 2 15:49:45 2007
@@ -43,7 +43,7 @@
.namespace ["Stream::Lines"]
-.sub __init :method
+.sub init :vtable :method
.local pmc temp
classoffset $I0, self, "Stream::Lines"
Modified: trunk/runtime/parrot/library/Stream/ParrotIO.pir
==============================================================================
--- trunk/runtime/parrot/library/Stream/ParrotIO.pir (original)
+++ trunk/runtime/parrot/library/Stream/ParrotIO.pir Wed May 2 15:49:45 2007
@@ -41,7 +41,7 @@
.namespace ["Stream::ParrotIO"]
-.sub __init :method
+.sub init :vtable :method
self."blockSize"( 50 )
.end
Modified: trunk/runtime/parrot/library/Stream/Replay.pir
==============================================================================
--- trunk/runtime/parrot/library/Stream/Replay.pir (original)
+++ trunk/runtime/parrot/library/Stream/Replay.pir Wed May 2 15:49:45 2007
@@ -62,7 +62,7 @@
=cut
-.sub __init :method
+.sub init :vtable :method
.local pmc temp
classoffset $I0, self, "Stream::Replay"
@@ -78,7 +78,7 @@
=cut
-.sub __set_pmc :method
+.sub set_pmc :vtable :method
.param pmc val
.local pmc buffer
@@ -152,7 +152,7 @@
=cut
-.sub __clone :method
+.sub clone :vtable :method
.local pmc ret
.local pmc temp
@@ -172,7 +172,7 @@
.namespace ["Stream::Replay::Buffer"]
-.sub __init :method
+.sub init :vtable :method
.local pmc temp
classoffset $I0, self, "Stream::Replay::Buffer"
Modified: trunk/runtime/parrot/library/Stream/Writer.pir
==============================================================================
--- trunk/runtime/parrot/library/Stream/Writer.pir (original)
+++ trunk/runtime/parrot/library/Stream/Writer.pir Wed May 2 15:49:45 2007
@@ -77,7 +77,7 @@
status = 0
.end
-.sub __init :method
+.sub init :vtable :method
.local pmc status
new status, .Integer
@@ -87,7 +87,7 @@
setattribute self, $I0, status
.end
-.sub __set_pmc :method
+.sub set_pmc :vtable :method
.param pmc source
.local pmc status
Modified: trunk/runtime/parrot/library/Test/Builder.pir
==============================================================================
--- trunk/runtime/parrot/library/Test/Builder.pir (original)
+++ trunk/runtime/parrot/library/Test/Builder.pir Wed May 2 15:49:45 2007
@@ -93,7 +93,7 @@
.sub __fake_init :method
.end
-.sub __init :method
+.sub init :vtable :method
.local pmc args
.local pmc output
.local pmc testplan
@@ -104,7 +104,7 @@
self.'_assign_args'( output, testplan, results )
.end
-.sub __init_pmc :method
+.sub init_pmc :vtable :method
.param pmc args
.local pmc output
.local pmc testplan
Modified: trunk/runtime/parrot/library/Test/Builder/Output.pir
==============================================================================
--- trunk/runtime/parrot/library/Test/Builder/Output.pir (original)
+++ trunk/runtime/parrot/library/Test/Builder/Output.pir Wed May 2
15:49:45 2007
@@ -49,7 +49,7 @@
=cut
-.sub __init_pmc :method
+.sub init_pmc :vtable :method
.param pmc args
.local pmc output
Modified: trunk/runtime/parrot/library/Test/Builder/Test.pir
==============================================================================
--- trunk/runtime/parrot/library/Test/Builder/Test.pir (original)
+++ trunk/runtime/parrot/library/Test/Builder/Test.pir Wed May 2 15:49:45 2007
@@ -129,7 +129,7 @@
.namespace [ 'Test::Builder::Test::Base' ]
-.sub __init_pmc :method
+.sub init_pmc :vtable :method
.param pmc args
.local int offset
@@ -266,7 +266,7 @@
.namespace [ 'Test::Builder::Test::WithReason' ]
-.sub __init_pmc :method
+.sub init_pmc :vtable :method
.param pmc args
.local int offset
Modified: trunk/runtime/parrot/library/Test/Builder/TestPlan.pir
==============================================================================
--- trunk/runtime/parrot/library/Test/Builder/TestPlan.pir (original)
+++ trunk/runtime/parrot/library/Test/Builder/TestPlan.pir Wed May 2
15:49:45 2007
@@ -44,7 +44,7 @@
=cut
-.sub __init_pmc :method
+.sub init_pmc :vtable :method
.param pmc args
.local int valid_args
Modified: trunk/runtime/parrot/library/Test/Builder/Tester.pir
==============================================================================
--- trunk/runtime/parrot/library/Test/Builder/Tester.pir (original)
+++ trunk/runtime/parrot/library/Test/Builder/Tester.pir Wed May 2
15:49:45 2007
@@ -74,7 +74,7 @@
addattribute tbto_class, 'diagnostics'
.end
-.sub __init :method
+.sub init :vtable :method
.local int offset
classoffset offset, self, 'Test::Builder::Tester::Output'
Modified: trunk/t/compilers/imcc/syn/objects.t
==============================================================================
--- trunk/t/compilers/imcc/syn/objects.t (original)
+++ trunk/t/compilers/imcc/syn/objects.t Wed May 2 15:49:45 2007
@@ -135,17 +135,17 @@
.end
.namespace ["Foo"]
-.sub __init :method
+.sub init :vtable :method
print "foo_init\n"
.end
.namespace ["Bar"]
-.sub __init :method
+.sub init :vtable :method
print "bar_init\n"
.end
.namespace ["Baz"]
-.sub __init :method
+.sub init :vtable :method
print "baz_init\n"
.end
Modified: trunk/t/compilers/tge/parser.t
==============================================================================
--- trunk/t/compilers/tge/parser.t (original)
+++ trunk/t/compilers/tge/parser.t Wed May 2 15:49:45 2007
@@ -46,8 +46,7 @@
print "matched start rule\n"
# Verify the match
- $I0 = match.__get_bool()
- unless $I0 goto match_fail # if match fails stop
+ unless match goto match_fail # if match fails stop
print "parse succeeded\n"
goto cleanup
Modified: trunk/t/op/calling.t
==============================================================================
--- trunk/t/op/calling.t (original)
+++ trunk/t/op/calling.t Wed May 2 15:49:45 2007
@@ -999,7 +999,7 @@
print " "
print s
.end
-.sub __get_string :method
+.sub get_string :vtable :method
$S0 = typeof self
.return ($S0)
.end
@@ -1022,13 +1022,13 @@
print $S0
.end
.namespace ["Foo"]
-.sub __get_string :method
+.sub get_string :vtable :method
$S0 = typeof self
print $S0
print " "
.return ("ok 1\n")
.end
-.sub __get_string_keyed_int :method
+.sub get_string_keyed_int :vtable :method
.param int key
$S0 = "ok "
$S1 = key
@@ -1055,7 +1055,7 @@
.return (arg) # force conversion to string
.end
.namespace ["Foo"]
-.sub __get_string :method
+.sub get_string :vtable :method
$S0 = typeof self
print $S0
print " "
@@ -1422,7 +1422,7 @@
# values because in the called sub frame the original refered
# registers just don't exist #' for vim
-.sub __set_integer_keyed :method
+.sub set_integer_keyed :vtable :method
.param pmc key
.param int val
print key # print first key
@@ -1681,7 +1681,7 @@
.local pmc cl, o
cl = newclass "Foo"
s = ".namespace ['Foo']\n"
- s .= ".sub __get_integer_keyed_int :method\n"
+ s .= ".sub get_integer_keyed_int :vtable :method\n"
s .= ".param int i\n"
s .= "i += 5\n"
s .= ".return(i)\n"
Modified: trunk/t/op/gc.t
==============================================================================
--- trunk/t/op/gc.t (original)
+++ trunk/t/op/gc.t Wed May 2 15:49:45 2007
@@ -185,7 +185,7 @@
.end
.namespace ["Foo"]
-.sub __init :method
+.sub init :vtable :method
print "init\n"
sweep 1
new P6, .String
Modified: trunk/t/op/string.t
==============================================================================
--- trunk/t/op/string.t (original)
+++ trunk/t/op/string.t Wed May 2 15:49:45 2007
@@ -2653,7 +2653,7 @@
a--b
OUTPUT
-pir_output_is( <<'CODE', <<'OUTPUT', 'join: __get_string returns a null
string' );
+pir_output_is( <<'CODE', <<'OUTPUT', 'join: get_string returns a null string'
);
.sub _main
newclass P0, "Foo"
@@ -2675,7 +2675,7 @@
.namespace ["Foo"]
-.sub __get_string :method
+.sub get_string :vtable :method
.local string ret
null ret
Modified: trunk/t/pmc/delegate.t
==============================================================================
--- trunk/t/pmc/delegate.t (original)
+++ trunk/t/pmc/delegate.t Wed May 2 15:49:45 2007
@@ -146,7 +146,7 @@
end
.end
.namespace ["delegate"]
-.sub __set_integer_native :method
+.sub set_integer_native :vtable :method
.param int i
# just return
print i
@@ -184,7 +184,7 @@
end
.end
.namespace ["delegate"]
-.sub __set_integer_native :method
+.sub set_integer_native :vtable :method
.param int i
# cant keep state yet
# just print arg and return
@@ -205,7 +205,7 @@
d = 3
.return (d)
.end
-.sub __get_string :method
+.sub get_string :vtable :method
.return("one")
.end
CODE
Modified: trunk/t/pmc/exception.t
==============================================================================
--- trunk/t/pmc/exception.t (original)
+++ trunk/t/pmc/exception.t Wed May 2 15:49:45 2007
@@ -548,12 +548,12 @@
.namespace ['Foo']
.sub load
- $P0 = newclass 'Foo'
+ $P0 = newclass 'Foo'
.end
-.sub __get_string :method
- $P0 = new .Exception
- throw $P0
+.sub get_string :vtable :method
+ $P0 = new .Exception
+ throw $P0
.end
CODE
caught
Modified: trunk/t/pmc/namespace.t
==============================================================================
--- trunk/t/pmc/namespace.t (original)
+++ trunk/t/pmc/namespace.t Wed May 2 15:49:45 2007
@@ -365,14 +365,14 @@
pir_output_is( <<'CODE', <<'OUT', "latin1 namespace, global" );
.namespace [ iso-8859-1:"Fran�ois" ]
-.sub '__init'
+.sub 'test'
print "latin1 namespaces are fun\n"
.end
.namespace
.sub 'main' :main
- $P0 = find_global iso-8859-1:"Fran�ois", '__init'
+ $P0 = find_global iso-8859-1:"Fran�ois", 'test'
$P0()
.end
CODE
@@ -382,14 +382,14 @@
pir_output_is( <<'CODE', <<'OUT', "unicode namespace, global" );
.namespace [ unicode:"Fran\xe7ois" ]
-.sub '__init'
+.sub 'test'
print "unicode namespaces are fun\n"
.end
.namespace
.sub 'main' :main
- $P0 = find_global unicode:"Fran\xe7ois", '__init'
+ $P0 = find_global unicode:"Fran\xe7ois", 'test'
$P0()
.end
CODE
