cvsuser 04/11/27 16:46:38
Modified: languages/tcl/lib expression.imc
languages/tcl/lib/commands concat.imc puts.imc
Log:
remove more perl references
Revision Changes Path
1.7 +10 -14 parrot/languages/tcl/lib/expression.imc
Index: expression.imc
===================================================================
RCS file: /cvs/public/parrot/languages/tcl/lib/expression.imc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- expression.imc 10 Nov 2004 05:29:39 -0000 1.6
+++ expression.imc 28 Nov 2004 00:46:37 -0000 1.7
@@ -101,8 +101,7 @@
(return_type,retval) = __expression_interpret(retval)
if return_type == TCL_ERROR goto die_horribly
- chunk = new FixedPMCArray
- chunk = 2
+ chunk = new TclList
chunk[0] = INTEGER
chunk[1] = retval
@@ -124,8 +123,7 @@
#error_S = retval
#if return_type == TCL_ERROR goto die_horribly
# Temporarily pump this out to the array.
- chunk = new FixedPMCArray
- chunk = 2
+ chunk = new TclList
chunk[0] = INTEGER
chunk[1] = retval
push chunks, chunk
@@ -143,8 +141,7 @@
(op_length,func,result) = __expr_get_function(expr,chunk_start)
if op_length == 0 goto get_number
- chunk = new FixedPMCArray
- chunk = 3
+ chunk = new TclList
chunk[0] = FUNC
chunk[1] = func
chunk[2] = -1 # functions trump operands, for now.
@@ -212,8 +209,7 @@
$I6 = ops[test_op]
- chunk = new FixedPMCArray
- chunk= 3
+ chunk = new TclList
chunk[0] = OP
chunk[1] = $I6 # op lookup
chunk[2] = $I5 # precedence
@@ -592,8 +588,7 @@
#print "DID OP:"
#print func
#print "\n"
- $P5 = new FixedPMCArray
- $P5 = 2
+ $P5 = new TclList
$P5[0] = INTEGER
$P5[1] = op_result
push result_stack, $P5
@@ -644,6 +639,9 @@
.local pmc value
value = new Integer
+ .local int TclList
+ TclList = find_type "TclList"
+
pos = start
if pos >= len goto failure
@@ -679,8 +677,7 @@
dec pos
substr $S0, expr, start,pos
- $P1 = new FixedPMCArray
- $P1 = 2
+ $P1 = new TclList
$P1[0] = $S0
sprintf $S0, "%o", $P1
@@ -710,8 +707,7 @@
finish_up:
substr $S0, expr, start,pos
$I0 = $S0
- value = new FixedPMCArray
- value = 2
+ value = new TclList
value[0] = INTEGER
value[1] = $I0
1.4 +6 -8 parrot/languages/tcl/lib/commands/concat.imc
Index: concat.imc
===================================================================
RCS file: /cvs/public/parrot/languages/tcl/lib/commands/concat.imc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- concat.imc 10 Nov 2004 05:31:11 -0000 1.3
+++ concat.imc 28 Nov 2004 00:46:38 -0000 1.4
@@ -3,7 +3,6 @@
.namespace [ "Tcl" ]
-
.sub _concat
.local pmc argv
argv = foldup
@@ -16,14 +15,13 @@
.local int arg_num
arg_num = 0
- .local string current_arg
- .local int start_pos
- .local int end_pos
- .local int str_length
- .local string trimmed_string
- .local int current_char
+ .local string current_arg, trimmed_string
+ .local int start_pos,end_pos,str_length,current_char
.local pmc results
- results = new PerlArray
+
+ .local int TclList
+ TclList = find_type "TclList"
+ results = new TclList
arg_loop:
if arg_num == argc goto arg_loop_done
1.11 +2 -4 parrot/languages/tcl/lib/commands/puts.imc
Index: puts.imc
===================================================================
RCS file: /cvs/public/parrot/languages/tcl/lib/commands/puts.imc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- puts.imc 21 Nov 2004 21:11:38 -0000 1.10
+++ puts.imc 28 Nov 2004 00:46:38 -0000 1.11
@@ -29,8 +29,7 @@
channels = find_global "_Tcl", "channels"
$S2 = argv[1]
$P1 = channels[$S2]
- $I0 = typeof $P1
- if $I0 == .PerlUndef goto bad_channel
+ isnull $P1, bad_channel
$S3 = argv[2]
print $P1, $S3
goto done
@@ -50,8 +49,7 @@
.local pmc channels
channels = find_global "_Tcl", "channels"
$P1 = channels[$S2]
- $I0 = typeof $P1
- if $I0 == .PerlUndef goto bad_channel
+ isnull $P1, bad_channel
print $P1, $S3
print $P1, "\n"
goto done
