Author: coke
Date: Sat Jan 10 21:59:55 2009
New Revision: 35386
Modified:
trunk/languages/BASIC/compiler/RT_aggregates.pir
trunk/languages/BASIC/compiler/RT_builtins.pir
Log:
[BASIC] integer type ids no longer user-facing
Modified: trunk/languages/BASIC/compiler/RT_aggregates.pir
==============================================================================
--- trunk/languages/BASIC/compiler/RT_aggregates.pir (original)
+++ trunk/languages/BASIC/compiler/RT_aggregates.pir Sat Jan 10 21:59:55 2009
@@ -50,9 +50,9 @@
.param pmc things :slurpy
# Assign a number
- .local int rhs_type
+ .local string rhs_type
rhs_type = typeof rhs
- if rhs_type == .String goto ASSIGN_STRING
+ if rhs_type == 'String' goto ASSIGN_STRING
.local string key
.local pmc BASICARR
BASICARR = get_global "BASICARR"
@@ -66,7 +66,7 @@
# Assign a string
ASSIGN_STRING:
- if rhs_type != .String goto ASSIGN_UNK
+ if rhs_type != 'String' goto ASSIGN_UNK
.local string key
.local pmc BASICARR
@@ -197,15 +197,15 @@
key = ""
.local pmc thing
- .local int key_type
+ .local string key_type
KEYLOOP:
if keycount ==0 goto KEYDONE
thing = shift things
key_type = typeof thing
key .= "|"
- if key_type == .Float goto ADDFLOAT
- if key_type == .String goto ADDSTRING
+ if key_type == 'Float' goto ADDFLOAT
+ if key_type == 'String' goto ADDSTRING
print "Wrong type on stack, key creation\n"
end
Modified: trunk/languages/BASIC/compiler/RT_builtins.pir
==============================================================================
--- trunk/languages/BASIC/compiler/RT_builtins.pir (original)
+++ trunk/languages/BASIC/compiler/RT_builtins.pir Sat Jan 10 21:59:55 2009
@@ -34,9 +34,9 @@
NEXT:
if argc==0 goto END_DISPLAY
dec argc
- $I0 = typeof printme
- if $I0 == .String goto DISPSTRING
- if $I0 != .Float goto DISPERR
+ $S0 = typeof printme
+ if $S0 == 'String' goto DISPSTRING
+ if $S0 != 'Float' goto DISPERR
# Now, do num
intver = printme