Author: coke
Date: Tue Jan 6 22:27:32 2009
New Revision: 35097
Modified:
trunk/PBC_COMPAT
trunk/runtime/parrot/library/PGE/Glob.pir
trunk/runtime/parrot/library/PGE/Hs.pir
trunk/runtime/parrot/library/Test/Builder.pir
trunk/runtime/parrot/library/Test/Builder/Tester.pir
trunk/src/ops/ops.num
trunk/src/ops/var.ops
Log:
remove [DEPRECATED] find_global_p_p_s opcode
Modified: trunk/PBC_COMPAT
==============================================================================
--- trunk/PBC_COMPAT (original)
+++ trunk/PBC_COMPAT Tue Jan 6 22:27:32 2009
@@ -26,7 +26,8 @@
# Also, if you're removing an opcode, be sure to run "make opsrenumber"
# please insert tab separated entries at the top of the list
-
+
+3.27 2008.01.07 coke removed find_global_p_p_s
3.26 2008.12.30 chromatic removed deprecated infix, n_infix,
get_mro opcodes
3.25 2008.11.15 tewk changed size of Parrot_sub structure which
effects frozen sub pmc size
3.24 2008.11.24 pmichaud added capture_lex opcode
Modified: trunk/runtime/parrot/library/PGE/Glob.pir
==============================================================================
--- trunk/runtime/parrot/library/PGE/Glob.pir (original)
+++ trunk/runtime/parrot/library/PGE/Glob.pir Tue Jan 6 22:27:32 2009
@@ -130,7 +130,7 @@
.param pmc adverbs :slurpy :named
.local pmc optable, match
- optable = find_global ['PGE';'Glob'], '$optable'
+ optable = get_hll_global ['PGE';'Glob'], '$optable'
match = optable.'parse'(mob)
.return (match)
.end
Modified: trunk/runtime/parrot/library/PGE/Hs.pir
==============================================================================
--- trunk/runtime/parrot/library/PGE/Hs.pir (original)
+++ trunk/runtime/parrot/library/PGE/Hs.pir Tue Jan 6 22:27:32 2009
@@ -9,7 +9,7 @@
.sub _main
load_bytecode "PGE.pbc"
load_bytecode "PGE/Hs.pir"
- $P0 = find_global ["PGE";"Hs"], "match"
+ $P0 = get_hll_global ["PGE";"Hs"], "match"
$S0 = $P0("Hello", "(...)*$")
print $S0 # PGE_Match 2 5 [PGE_Array [PGE_Match 2 5 [] []]] []
.end
Modified: trunk/runtime/parrot/library/Test/Builder.pir
==============================================================================
--- trunk/runtime/parrot/library/Test/Builder.pir (original)
+++ trunk/runtime/parrot/library/Test/Builder.pir Tue Jan 6 22:27:32 2009
@@ -166,7 +166,7 @@
.param pmc args
.local pmc single
- single = find_global [ 'Test'; 'Builder'; '_singleton' ], 'singleton'
+ single = get_hll_global [ 'Test'; 'Builder'; '_singleton' ],
'singleton'
.local pmc output
.local pmc testplan
@@ -532,7 +532,7 @@
push results, test
.local pmc tbt_create
- find_global tbt_create, [ 'Test'; 'Builder'; 'Test' ], 'create'
+ get_hll_global tbt_create, [ 'Test'; 'Builder'; 'Test' ], 'create'
test = tbt_create( test_args )
.local pmc output
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 Tue Jan 6
22:27:32 2009
@@ -15,10 +15,10 @@
.local pmc test_diag
.local pmc test_test
- plan = find_global [ 'Test'; 'Builder'; 'Tester' ], 'plan'
- test_out = find_global [ 'Test'; 'Builder'; 'Tester' ], 'test_out'
- test_diag = find_global [ 'Test'; 'Builder'; 'Tester' ], 'test_diag'
- test_test = find_global [ 'Test'; 'Builder'; 'Tester' ], 'test_test'
+ plan = get_hll_global [ 'Test'; 'Builder'; 'Tester' ], 'plan'
+ test_out = get_hll_global [ 'Test'; 'Builder'; 'Tester' ], 'test_out'
+ test_diag = get_hll_global [ 'Test'; 'Builder'; 'Tester' ], 'test_diag'
+ test_test = get_hll_global [ 'Test'; 'Builder'; 'Tester' ], 'test_test'
# create a new Test::Builder object
.local pmc tb_args
@@ -175,7 +175,7 @@
# create the Test::Builder object that this uses
.local pmc tb_create
- tb_create = find_global [ 'Test'; 'Builder' ], 'create'
+ tb_create = get_hll_global [ 'Test'; 'Builder' ], 'create'
args = new 'Hash'
output = new [ 'Test'; 'Builder'; 'Output' ], args
@@ -207,7 +207,7 @@
.param int tests
.local pmc test
- test = find_global [ 'Test'; 'Builder'; 'Tester' ], '_test'
+ test = get_hll_global [ 'Test'; 'Builder'; 'Tester' ], '_test'
test.'plan'( tests )
.end
@@ -251,7 +251,7 @@
.local int result_count
.local pmc next_result
- test = find_global [ 'Test'; 'Builder'; 'Tester' ], '_default_test'
+ test = get_hll_global [ 'Test'; 'Builder'; 'Tester' ],
'_default_test'
results = test.'results'()
result_count = results
inc result_count
@@ -273,7 +273,7 @@
SET_EXPECT_OUTPUT:
.local pmc expect_out
- expect_out = find_global [ 'Test'; 'Builder'; 'Tester' ], '_expect_out'
+ expect_out = get_hll_global [ 'Test'; 'Builder'; 'Tester' ], '_expect_out'
push expect_out, line_string
.end
@@ -294,7 +294,7 @@
set line_string, line
.local pmc expect_out
- expect_out = find_global [ 'Test'; 'Builder'; 'Tester' ], '_expect_out'
+ expect_out = get_hll_global [ 'Test'; 'Builder'; 'Tester' ], '_expect_out'
push expect_out, line_string
.end
@@ -314,7 +314,7 @@
set line_string, line
.local pmc expect_diag
- expect_diag = find_global [ 'Test'; 'Builder'; 'Tester' ], '_expect_diag'
+ expect_diag = get_hll_global [ 'Test'; 'Builder'; 'Tester' ],
'_expect_diag'
push expect_diag, line_string
.end
@@ -336,7 +336,7 @@
set line_string, line
.local pmc expect_diag
- expect_diag = find_global [ 'Test'; 'Builder'; 'Tester' ], '_expect_diag'
+ expect_diag = get_hll_global [ 'Test'; 'Builder'; 'Tester' ],
'_expect_diag'
push expect_diag, line_string
.end
@@ -364,10 +364,10 @@
.local pmc expect_diag
.local pmc test_output
- test = find_global [ 'Test'; 'Builder'; 'Tester' ], '_test'
- expect_out = find_global [ 'Test'; 'Builder'; 'Tester' ], '_expect_out'
- expect_diag = find_global [ 'Test'; 'Builder'; 'Tester' ], '_expect_diag'
- test_output = find_global [ 'Test'; 'Builder'; 'Tester' ], '_test_output'
+ test = get_hll_global [ 'Test'; 'Builder'; 'Tester' ], '_test'
+ expect_out = get_hll_global [ 'Test'; 'Builder'; 'Tester' ],
'_expect_out'
+ expect_diag = get_hll_global [ 'Test'; 'Builder'; 'Tester' ],
'_expect_diag'
+ test_output = get_hll_global [ 'Test'; 'Builder'; 'Tester' ],
'_test_output'
.local string received_out_string
.local string received_diag_string
Modified: trunk/src/ops/ops.num
==============================================================================
--- trunk/src/ops/ops.num (original)
+++ trunk/src/ops/ops.num Tue Jan 6 22:27:32 2009
@@ -1281,9 +1281,5 @@
find_global_p_sc_s 1251
find_global_p_s_sc 1252
find_global_p_sc_sc 1253
-find_global_p_p_s 1254
-find_global_p_pc_s 1255
-find_global_p_p_sc 1256
-find_global_p_pc_sc 1257
-find_name_p_s 1258
-find_name_p_sc 1259
+find_name_p_s 1254
+find_name_p_sc 1255
Modified: trunk/src/ops/var.ops
==============================================================================
--- trunk/src/ops/var.ops (original)
+++ trunk/src/ops/var.ops Tue Jan 6 22:27:32 2009
@@ -412,14 +412,6 @@
If the global doesn't exist either throws an exception or sets $1 to the
Null PMC, depending on current errors settings. See B<errorson>.
-=item B<find_global>(out PMC, in PMC, in STR)
-
-Find the global named $3 in the namespace designated by $2 and store it in
-$1. $2 may be a key, a string, or an array of strings.
-
-If the global doesn't exist either throws an exception or sets $1 to the
-Null PMC, depending on current errors settings. See B<errorson>.
-
=cut
op find_global(out PMC, in STR) :deprecated {
@@ -434,13 +426,6 @@
$1 = Parrot_find_global_op(interp, ns, $3, expr NEXT());
}
-op find_global(out PMC, in PMC, in STR) :deprecated {
- PMC * const ns = Parrot_get_namespace_keyed(interp,
-
Parrot_get_ctx_HLL_namespace(interp),
- $2);
- $1 = Parrot_find_global_op(interp, ns, $3, expr NEXT());
-}
-
=item B<find_name>(out PMC, in STR)
Find the name $2 in lexical, current, global, or builtin namespace and
