Author: coke
Date: Wed Nov 2 11:17:48 2005
New Revision: 9719
Modified:
trunk/languages/tcl/lib/commands/namespace.pir
trunk/languages/tcl/lib/tclcommand.pir
Log:
remove workaround for exceptions/variable register frames that leo
just fixed.
Conform to new PGE usage.
Modified: trunk/languages/tcl/lib/commands/namespace.pir
==============================================================================
--- trunk/languages/tcl/lib/commands/namespace.pir (original)
+++ trunk/languages/tcl/lib/commands/namespace.pir Wed Nov 2 11:17:48 2005
@@ -98,24 +98,18 @@ bad_args:
.local pmc p6r,match
p6r = find_global "PGE", "p6rule"
- match = p6r("(.*)\:\:+<-[:]>*$$")
+ match = p6r("(.*)\\:\\:+<-[:]>*$$")
$S0 = argv[0]
$P0 = match($S0)
unless $P0 goto WHOLE
-
- # XXX pre leo-ctx5 this requires a PMC arg, but we can switch later
- $P1 = new .String
- $P1 = "0"
-
- $P2 = $P0."__get_pmc_keyed"($P1)
-
- $S1 = $P2
+ $P1 = $P0[0]
+ $S1 = $P1
.return ($S1)
WHOLE:
- $P0 = argv[0]
- .return($P0)
+ $S0 = argv[0]
+ .return($S0)
bad_args:
.throw ("wrong # args: should be \"namespace qualifiers string\"")
@@ -137,11 +131,7 @@ WHOLE:
$P0 = match($S0)
unless $P0 goto WHOLE
- # XXX pre leo-ctx5 this requires a PMC arg, but we can switch later
- $P1 = new .String
- $P1 = "0"
-
- $P2 = $P0."__get_pmc_keyed"($P1)
+ $P2 = $P0[0]
$S1 = $P2
.return ($S1)
Modified: trunk/languages/tcl/lib/tclcommand.pir
==============================================================================
--- trunk/languages/tcl/lib/tclcommand.pir (original)
+++ trunk/languages/tcl/lib/tclcommand.pir Wed Nov 2 11:17:48 2005
@@ -155,7 +155,6 @@ arg_loop_done:
pir_code2 .= "\n"
inline_available = 1
dynamic:
- $P99 = P5 # XXX Curse you, variable register frames!
pir_code2 .= "dynamic_command"
pir_code2 .= label_num
pir_code2 .= ":\n"
