Author: fperrad
Date: Fri Nov 7 11:36:47 2008
New Revision: 32435
Modified:
trunk/languages/dotnet/build/SRM/OptRegister.pm
trunk/languages/dotnet/build/SRM/Stack.pm
trunk/languages/dotnet/build/builtins.pl
trunk/languages/dotnet/build/translator.pl
trunk/languages/dotnet/src/field.pir
trunk/languages/dotnet/src/method.pir
trunk/languages/dotnet/src/signature.pir
trunk/languages/dotnet/src/translation.rules
trunk/languages/dotnet/src/typeinfo.pir
Log:
[dotnet]
- fix, new syntax .const 'Name'
(see r32419)
Modified: trunk/languages/dotnet/build/SRM/OptRegister.pm
==============================================================================
--- trunk/languages/dotnet/build/SRM/OptRegister.pm (original)
+++ trunk/languages/dotnet/build/SRM/OptRegister.pm Fri Nov 7 11:36:47 2008
@@ -62,9 +62,9 @@
.local int stack_depth
.local pmc prop_type_state, prop_stack_depth, lazy_moves
stack_depth = -1
-prop_type_state = new Hash
-prop_stack_depth = new Hash
-lazy_moves = new ResizablePMCArray
+prop_type_state = new 'Hash'
+prop_stack_depth = new 'Hash'
+lazy_moves = new 'ResizablePMCArray'
PIR
}
@@ -506,7 +506,7 @@
}
sub pop_all {
- return "stack_depth = -1\nlazy_moves = new ResizablePMCArray\n";
+ return "stack_depth = -1\nlazy_moves = new 'ResizablePMCArray'\n";
}
# Local Variables:
Modified: trunk/languages/dotnet/build/SRM/Stack.pm
==============================================================================
--- trunk/languages/dotnet/build/SRM/Stack.pm (original)
+++ trunk/languages/dotnet/build/SRM/Stack.pm Fri Nov 7 11:36:47 2008
@@ -25,7 +25,7 @@
.local string strPC
${INS} = concat <<"CODE"
.local pmc s
- s = new ResizablePMCArray
+ s = new 'ResizablePMCArray'
CODE
PIR
}
@@ -388,7 +388,7 @@
# Pop everything on the stack.
sub pop_all {
return <<'PIR'
-${INS} = concat "s = new ResizablePMCArray\n"
+${INS} = concat "s = new 'ResizablePMCArray'\n"
PIR
}
Modified: trunk/languages/dotnet/build/builtins.pl
==============================================================================
--- trunk/languages/dotnet/build/builtins.pl (original)
+++ trunk/languages/dotnet/build/builtins.pl Fri Nov 7 11:36:47 2008
@@ -50,7 +50,7 @@
# Generic unimplemented internal method body (throws exception).
EXCEPTION_UNIMPLEMENTED:
body = <<"PIR"
-$P0 = new .Exception
+$P0 = new "Exception"
$P0 = "System.NotImplementedException"
$P1 = new "System.NotImplementedException"
$P0["obj"] = $P1
@@ -181,7 +181,7 @@
# Add failure.
$pir .= <<'PIR'
FAIL:
- $P0 = new .Exception
+ $P0 = new "Exception"
$P0 = "No body supplied for built-in method"
throw $P0
PIR
Modified: trunk/languages/dotnet/build/translator.pl
==============================================================================
--- trunk/languages/dotnet/build/translator.pl (original)
+++ trunk/languages/dotnet/build/translator.pl Fri Nov 7 11:36:47 2008
@@ -452,7 +452,7 @@
pc = 0
# Initialize stack types array.
- stypes = new ResizablePMCArray
+ stypes = new "ResizablePMCArray"
# Instantiate a bytecode escaper.
escaper = find_global "Data::Escape", "String"
@@ -490,7 +490,7 @@
if null ehs goto NO_EH_HEADER
i = elements ehs
gen_pir = concat ".local pmc cur_exception\n"
- gen_pir = concat ".local pmc saved_ehs\nsaved_ehs = new
.FixedPMCArray\nsaved_ehs = "
+ gen_pir = concat ".local pmc saved_ehs\nsaved_ehs = new
'FixedPMCArray'\nsaved_ehs = "
tmp = i
gen_pir = concat tmp
gen_pir = concat "\n"
@@ -498,7 +498,7 @@
gen_pir = concat "pushmark 0\n"
# Translation loop.
- ss_propogate = new .Hash
+ ss_propogate = new 'Hash'
TRANS_LOOP:
pc = bc.get_pos()
next_pc = pc
@@ -568,8 +568,8 @@
gen_pir = concat ":\n"
# Need to fix up stack type state. Create new empty array.
- stypes = new ResizablePMCArray
- type_trans = new Hash
+ stypes = new "ResizablePMCArray"
+ type_trans = new "Hash"
type_trans["type"] = ELEMENT_TYPE_CLASS
type_trans["byref"] = 0
annotate_reg_type(type_trans)
@@ -911,7 +911,7 @@
# jumptable
elsif (/^jumptable$/) {
$out = <<"PIR";
- \${P_ARG_$arg_num} = new FixedPMCArray
+ \${P_ARG_$arg_num} = new "FixedPMCArray"
i = bc.read_uint32()
next_pc += 4
\${P_ARG_$arg_num} = i
@@ -957,7 +957,7 @@
if ( $rule->{'class'} eq 'op' ) {
# Init destination types array.
- $pir .= " dtypes = new ResizablePMCArray\n";
+ $pir .= " dtypes = new 'ResizablePMCArray'\n";
# Insert typeinfo code (sets up dtypes).
$pir .= "### typeinfo\n";
@@ -1095,7 +1095,7 @@
$pir .= <<PIR
\$I1000000 = loadtype["type"]
if \$I1000000 != ELEMENT_TYPE_VALUETYPE goto $label
-dtypes = new ResizablePMCArray
+dtypes = new "ResizablePMCArray"
dtypes[0] = loadtype
$pre_op
gen_pir = concat dest0
@@ -1236,8 +1236,8 @@
elsif ( $rule->{'class'} eq 'calling' ) {
# Init destination types array and params array and set meta-variable.
- $pir .= " dtypes = new ResizablePMCArray\n";
- $pir .= " c_params = new ResizableStringArray\n";
+ $pir .= " dtypes = new 'ResizablePMCArray'\n";
+ $pir .= " c_params = new 'ResizableStringArray'\n";
$mv->{'PARAMS'} = 'c_params';
push @localmv, 'PARAMS';
Modified: trunk/languages/dotnet/src/field.pir
==============================================================================
--- trunk/languages/dotnet/src/field.pir (original)
+++ trunk/languages/dotnet/src/field.pir Fri Nov 7 11:36:47 2008
@@ -32,7 +32,7 @@
class_id = memberref.get_class_id()
dec class_id
if class_type == 1 goto TYPEREF
- ex = new .Exception
+ ex = new 'Exception'
ex["message"] = "Unsupported member reference type for field"
throw ex
Modified: trunk/languages/dotnet/src/method.pir
==============================================================================
--- trunk/languages/dotnet/src/method.pir (original)
+++ trunk/languages/dotnet/src/method.pir Fri Nov 7 11:36:47 2008
@@ -126,14 +126,14 @@
annotate_reg_type(rettype)
# Create parameter types array.
- ptypes = new .ResizablePMCArray
+ ptypes = new 'ResizablePMCArray'
# If it's an instance method and explicit not set, add "this" to the list.
this_offset = 0
pir_multi = ""
if static_check == 0 goto NOSELF
if explicit_check != 0 goto NOSELF
- ptype = new Hash
+ ptype = new 'Hash'
ptype["type"] = 0x1C
ptype["byref"] = 0
annotate_reg_type(ptype)
@@ -257,7 +257,7 @@
.local pmc ltypes, ltype
pir_output = ""
- ltypes = new .ResizablePMCArray
+ ltypes = new 'ResizablePMCArray'
# Get signature.
bc = meth.get_bytecode()
@@ -355,7 +355,7 @@
dec class_id
if class_type == 1 goto TYPEREF
if class_type == 3 goto METHODDEF
- ex = new .Exception
+ ex = new 'Exception'
ex["message"] = "Unsupported member reference type for method"
throw ex
Modified: trunk/languages/dotnet/src/signature.pir
==============================================================================
--- trunk/languages/dotnet/src/signature.pir (original)
+++ trunk/languages/dotnet/src/signature.pir Fri Nov 7 11:36:47 2008
@@ -32,7 +32,7 @@
.local pmc ex, ret, elems
# We return a hash with details of the return type or parameter in it.
- ret = new .Hash
+ ret = new 'Hash'
# Read type token.
t1 = signature.read_compressed()
@@ -99,7 +99,7 @@
.local pmc ex, ret, elems
# We return a hash with details of the return type or parameter in it.
- ret = new .Hash
+ ret = new 'Hash'
# First need to read a custom modifier.
#(cmod_req, cmod_type_def_or_ref) = get_signature_CustomMod(signature)
@@ -160,7 +160,7 @@
.local pmc ex, ret, elems
# We return a hash with details of the return type or parameter in it.
- ret = new .Hash
+ ret = new 'Hash'
# Read type token.
t1 = signature.read_compressed()
Modified: trunk/languages/dotnet/src/translation.rules
==============================================================================
--- trunk/languages/dotnet/src/translation.rules (original)
+++ trunk/languages/dotnet/src/translation.rules Fri Nov 7 11:36:47 2008
@@ -206,7 +206,7 @@
push = 1
instruction = net_conv_i1 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I1
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -220,7 +220,7 @@
push = 1
instruction = net_conv_i2 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I2
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -234,7 +234,7 @@
push = 1
instruction = net_conv_i4 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -248,7 +248,7 @@
push = 1
instruction = net_conv_i8 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I8
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -262,7 +262,7 @@
push = 1
instruction = net_conv_r4 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_R4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -276,7 +276,7 @@
push = 1
instruction = net_conv_r8 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_R8
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -290,7 +290,7 @@
push = 1
instruction = net_conv_u1 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U1
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -304,7 +304,7 @@
push = 1
instruction = net_conv_u2 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U2
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -318,7 +318,7 @@
push = 1
instruction = net_conv_u4 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -332,7 +332,7 @@
push = 1
instruction = net_conv_u8 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U8
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -352,13 +352,13 @@
${PTEMP0} = ${STYPES}[${ITEMP0}]
${ITEMP0} = ${PTEMP0}["type"]
if ${ITEMP0} != ELEMENT_TYPE_PTR goto conv_i_OK
-${PTEMP0} = new .Exception
+${PTEMP0} = new "Exception"
${PTEMP0}["_message"] = "Code does unverifiable pointer operation"
throw ${PTEMP0}
conv_i_OK:
# Set type.
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -378,12 +378,12 @@
${PTEMP0} = ${STYPES}[${ITEMP0}]
${ITEMP0} = ${PTEMP0}["type"]
if ${ITEMP0} != ELEMENT_TYPE_PTR goto conv_u_OK
-${PTEMP0} = new .Exception
+${PTEMP0} = new "Exception"
${PTEMP0}["_message"] = "Code does unverifiable pointer operation"
throw ${PTEMP0}
conv_u_OK:
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -397,7 +397,7 @@
push = 1
instruction = net_conv_r_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_R8
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -414,7 +414,7 @@
push = 1
instruction = net_conv_ovf_i1 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I1
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -428,7 +428,7 @@
push = 1
instruction = net_conv_ovf_i2 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I2
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -442,7 +442,7 @@
push = 1
instruction = net_conv_ovf_i4 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -456,7 +456,7 @@
push = 1
instruction = net_conv_ovf_i8 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I8
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -470,7 +470,7 @@
push = 1
instruction = net_conv_ovf_u1 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U1
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -484,7 +484,7 @@
push = 1
instruction = net_conv_ovf_u2 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U2
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -498,7 +498,7 @@
push = 1
instruction = net_conv_ovf_u4 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -512,7 +512,7 @@
push = 1
instruction = net_conv_ovf_u8 ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U8
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -526,7 +526,7 @@
push = 1
instruction = net_conv_ovf_i ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -540,7 +540,7 @@
push = 1
instruction = net_conv_ovf_u ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -554,7 +554,7 @@
push = 1
instruction = net_conv_ovf_i1_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I1
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -568,7 +568,7 @@
push = 1
instruction = net_conv_ovf_i2_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I2
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -582,7 +582,7 @@
push = 1
instruction = net_conv_ovf_i4_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -596,7 +596,7 @@
push = 1
instruction = net_conv_ovf_i8_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I8
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -610,7 +610,7 @@
push = 1
instruction = net_conv_ovf_u1_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U1
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -624,7 +624,7 @@
push = 1
instruction = net_conv_ovf_u2_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U2
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -638,7 +638,7 @@
push = 1
instruction = net_conv_ovf_u4_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -652,7 +652,7 @@
push = 1
instruction = net_conv_ovf_u8_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U8
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -666,7 +666,7 @@
push = 1
instruction = net_conv_ovf_i_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -680,7 +680,7 @@
push = 1
instruction = net_conv_ovf_u_un ${DEST0}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -733,7 +733,7 @@
push = 1
instruction = ${DEST0} = varargs
typeinfo = <<PIR
-${PTEMP0} = new .Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_PTR
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -1298,7 +1298,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -1319,7 +1319,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -1340,7 +1340,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -1361,7 +1361,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -1382,7 +1382,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -1719,7 +1719,7 @@
PIR
typeinfo = <<PIR
# This is an object type.
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_OBJECT
${PTEMP0}["byref"] = 0
@@ -1738,7 +1738,7 @@
push = 1
instruction = ${DEST0} = null
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_OBJECT
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -1796,7 +1796,7 @@
# Emit exception throwing code.
${INS} = concat <<"CCPIR"
-$P1000000 = new .Exception
+$P1000000 = new "Exception"
$P1000000["_message"] = "InvalidCastException"
throw $P1000000
CCPIR
@@ -1852,7 +1852,7 @@
inc ${LABELNUM}
${ITEMP1} = ${LABELNUM}
-# Emit check for if input is null; if it is, we jump to putting null on the
+# Emit check for if input is null; if it is, we jump to putting null on the
# stack.
${INS} = concat "if null "
${INS} = concat ${STACK0}
@@ -1935,7 +1935,7 @@
${DEST0} = clone $P1000000
INS
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_VALUETYPE
annotate_reg_type(${PTEMP0})
${DTYPES}[0] = ${PTEMP0}
@@ -2016,7 +2016,7 @@
if ${ITEMP0} == ELEMENT_TYPE_U goto box_U
if ${ITEMP0} == ELEMENT_TYPE_R4 goto box_R4
if ${ITEMP0} == ELEMENT_TYPE_R8 goto box_R8
-${PTEMP0} = new .Exception
+${PTEMP0} = new "Exception"
${PTEMP0}["_message"] = "Attempt to box non-value type"
throw ${PTEMP0}
box_I4:
@@ -2130,7 +2130,7 @@
if ${ITEMP0} == ELEMENT_TYPE_U goto unbox_integer
if ${ITEMP0} == ELEMENT_TYPE_R4 goto unbox_float
if ${ITEMP0} == ELEMENT_TYPE_R8 goto unbox_float
-${PTEMP0} = new .Exception
+${PTEMP0} = new "Exception"
${PTEMP0}["_message"] = "Attempt to unbox unknown built-in."
throw ${PTEMP0}
unbox_integer:
@@ -2176,7 +2176,7 @@
unbox_DONE_TYPE:
# Build new type info hash.
-${PTEMP0} = new .Hash
+${PTEMP0} = new "Hash"
# See if it's a special case.
if ${STEMP1} == "System.Int32" goto unbox_I4
@@ -2287,10 +2287,10 @@
PIR
typeinfo = <<PIR
# This is an array type.
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_SZARRAY
${PTEMP0}["byref"] = 0
-${PTEMP1} = new Hash
+${PTEMP1} = new "Hash"
${PTEMP0}["elements"] = ${PTEMP1}
# Look up class.
@@ -2390,7 +2390,7 @@
push = 1
instruction = ${DEST0} = elements ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2641,7 +2641,7 @@
${INS} = concat "\")\n"
PIR
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_STRING
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -2683,7 +2683,7 @@
class = op
pop = 1
instruction = <<INS
-$P1000000 = new .Exception
+$P1000000 = new "Exception"
$P1000000["obj"] = ${STACK0}
throw $P1000000
INS
@@ -2723,7 +2723,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_PTR
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -2742,7 +2742,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_PTR
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -2761,7 +2761,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_PTR
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -2780,7 +2780,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_PTR
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -2806,7 +2806,7 @@
${INS} = concat "\"\n"
PIR
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_PTR
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2834,7 +2834,7 @@
${INS} = concat " = net_pmc_ptr $P1000000\n"
PIR
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_PTR
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2849,7 +2849,7 @@
arguments = ttype
instruction = net_ldelema ${DEST0}, ${STACK1}, ${STACK0}
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_PTR
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2863,7 +2863,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_int()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I1
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2877,7 +2877,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_int()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U1
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2891,7 +2891,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_int()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I2
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2905,7 +2905,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_int()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U2
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2919,7 +2919,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_int()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2933,7 +2933,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_pmc()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I8
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2947,7 +2947,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_int()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_U4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2961,7 +2961,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_int()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_I
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2975,7 +2975,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_float()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_R4
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -2989,7 +2989,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_float()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_R8
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -3003,7 +3003,7 @@
push = 1
instruction = ${DEST0} = ${STACK0}.load_pmc()
typeinfo = <<PIR
-${PTEMP0} = new Hash
+${PTEMP0} = new "Hash"
${PTEMP0}["type"] = ELEMENT_TYPE_OBJECT
${PTEMP0}["byref"] = 0
annotate_reg_type(${PTEMP0})
@@ -3199,7 +3199,7 @@
push = 1
pir = ${LOADREG} = "0"
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3211,7 +3211,7 @@
push = 1
pir = ${LOADREG} = "1"
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3223,7 +3223,7 @@
push = 1
pir = ${LOADREG} = "2"
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3235,7 +3235,7 @@
push = 1
pir = ${LOADREG} = "3"
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3247,7 +3247,7 @@
push = 1
pir = ${LOADREG} = "4"
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3259,7 +3259,7 @@
push = 1
pir = ${LOADREG} = "5"
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3271,7 +3271,7 @@
push = 1
pir = ${LOADREG} = "6"
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3283,7 +3283,7 @@
push = 1
pir = ${LOADREG} = "7"
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3295,7 +3295,7 @@
push = 1
pir = ${LOADREG} = "8"
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3307,7 +3307,7 @@
push = 1
pir = ${LOADREG} = "-1"
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3320,7 +3320,7 @@
arguments = int8
pir = ${LOADREG} = ${ARG0}
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3333,7 +3333,7 @@
arguments = int32
pir = ${LOADREG} = ${ARG0}
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3359,7 +3359,7 @@
${INS} = concat ")\n"
PIR
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_I8
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3379,7 +3379,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_R4
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
@@ -3399,7 +3399,7 @@
${INS} = concat "\n"
PIR
typeinfo = <<PIR
-${LOADTYPE} = new Hash
+${LOADTYPE} = new "Hash"
${LOADTYPE}["type"] = ELEMENT_TYPE_R8
${LOADTYPE}["byref"] = 0
annotate_reg_type(${LOADTYPE})
Modified: trunk/languages/dotnet/src/typeinfo.pir
==============================================================================
--- trunk/languages/dotnet/src/typeinfo.pir (original)
+++ trunk/languages/dotnet/src/typeinfo.pir Fri Nov 7 11:36:47 2008
@@ -82,7 +82,7 @@
dtypes[0] = in_b
goto END
ENUM_TYPE:
- $P0 = new .Hash
+ $P0 = new "Hash"
$P0["type"] = ELEMENT_TYPE_I
$P0["byref"] = 0
annotate_reg_type($P0)
