Author: jquelin
Date: Wed Oct 3 09:52:14 2007
New Revision: 21788
Modified:
branches/pdd15oo/languages/WMLScript/t/pmc/boolean.t
branches/pdd15oo/languages/WMLScript/t/pmc/float.t
branches/pdd15oo/languages/WMLScript/t/pmc/integer.t
branches/pdd15oo/languages/WMLScript/t/pmc/invalid.t
branches/pdd15oo/languages/WMLScript/t/pmc/string.t
branches/pdd15oo/languages/cardinal/src/PAST.pir
Log:
more find_type removal
Modified: branches/pdd15oo/languages/WMLScript/t/pmc/boolean.t
==============================================================================
--- branches/pdd15oo/languages/WMLScript/t/pmc/boolean.t (original)
+++ branches/pdd15oo/languages/WMLScript/t/pmc/boolean.t Wed Oct 3
09:52:14 2007
@@ -25,9 +25,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check inheritance' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsBoolean"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsBoolean"
.local int bool1
bool1 = isa pmc1, "Boolean"
print bool1
@@ -45,9 +44,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check interface' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsBoolean"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsBoolean"
.local int bool1
bool1 = does pmc1, "scalar"
print bool1
@@ -73,9 +71,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check name' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsBoolean"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsBoolean"
.local string str1
str1 = classname pmc1
print str1
@@ -93,9 +90,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check get_string' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsBoolean"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsBoolean"
pmc1 = 0
print pmc1
print "\n"
@@ -112,9 +108,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check clone' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsBoolean"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsBoolean"
pmc1 = 1
.local pmc pmc2
pmc2 = clone pmc1
Modified: branches/pdd15oo/languages/WMLScript/t/pmc/float.t
==============================================================================
--- branches/pdd15oo/languages/WMLScript/t/pmc/float.t (original)
+++ branches/pdd15oo/languages/WMLScript/t/pmc/float.t Wed Oct 3 09:52:14 2007
@@ -25,9 +25,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check inheritance' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsFloat"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsFloat"
.local int bool1
bool1 = isa pmc1, "Float"
print bool1
@@ -45,9 +44,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check interface' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsFloat"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsFloat"
.local int bool1
bool1 = does pmc1, "scalar"
print bool1
@@ -69,9 +67,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check name' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsFloat"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsFloat"
.local string str1
str1 = classname pmc1
print str1
@@ -89,9 +86,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check clone' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsFloat"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsFloat"
pmc1 = 3.14
.local pmc pmc2
pmc2 = clone pmc1
@@ -118,9 +114,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check get_bool' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsFloat"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsFloat"
pmc1 = 3.14
.local int bool1
bool1 = istrue pmc1
Modified: branches/pdd15oo/languages/WMLScript/t/pmc/integer.t
==============================================================================
--- branches/pdd15oo/languages/WMLScript/t/pmc/integer.t (original)
+++ branches/pdd15oo/languages/WMLScript/t/pmc/integer.t Wed Oct 3
09:52:14 2007
@@ -25,9 +25,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check inheritance' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsInteger"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsInteger"
.local int bool1
bool1 = isa pmc1, "Integer"
print bool1
@@ -45,9 +44,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check interface' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsInteger"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsInteger"
.local int bool1
bool1 = does pmc1, "scalar"
print bool1
@@ -69,9 +67,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check name' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsInteger"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsInteger"
.local string str1
str1 = classname pmc1
print str1
@@ -89,9 +86,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check clone' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsInteger"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsInteger"
pmc1 = 10
.local pmc pmc2
pmc2 = clone pmc1
@@ -118,9 +114,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check get_bool' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsInteger"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsInteger"
pmc1 = 42
.local int bool1
bool1 = istrue pmc1
Modified: branches/pdd15oo/languages/WMLScript/t/pmc/invalid.t
==============================================================================
--- branches/pdd15oo/languages/WMLScript/t/pmc/invalid.t (original)
+++ branches/pdd15oo/languages/WMLScript/t/pmc/invalid.t Wed Oct 3
09:52:14 2007
@@ -25,9 +25,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check inheritance' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsInvalid"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsInvalid"
.local int bool1
bool1 = isa pmc1, "Undef"
print bool1
@@ -45,9 +44,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check interface' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsInvalid"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsInvalid"
.local int bool1
bool1 = does pmc1, "scalar"
print bool1
@@ -65,9 +63,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check name' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsInvalid"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsInvalid"
.local string str1
str1 = classname pmc1
print str1
@@ -85,9 +82,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check get_string' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsInvalid"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsInvalid"
print pmc1
print "\n"
end
@@ -99,9 +95,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check clone' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsInvalid"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsInvalid"
.local pmc pmc2
pmc2 = clone pmc1
.local string str1
Modified: branches/pdd15oo/languages/WMLScript/t/pmc/string.t
==============================================================================
--- branches/pdd15oo/languages/WMLScript/t/pmc/string.t (original)
+++ branches/pdd15oo/languages/WMLScript/t/pmc/string.t Wed Oct 3 09:52:14 2007
@@ -25,9 +25,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check inheritance' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsString"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsString"
.local int bool1
bool1 = isa pmc1, "String"
print bool1
@@ -45,9 +44,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check interface' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsString"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsString"
.local int bool1
bool1 = does pmc1, "scalar"
print bool1
@@ -69,9 +67,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check name' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsString"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsString"
.local string str1
str1 = classname pmc1
print str1
@@ -89,9 +86,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check clone' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsString"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsString"
pmc1 = "str"
.local pmc pmc2
pmc2 = clone pmc1
@@ -118,9 +114,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check get_bool' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsString"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsString"
pmc1 = "str"
.local int bool1
bool1 = istrue pmc1
@@ -140,9 +135,8 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check embedded zero' );
.sub _main
loadlib P1, "wmls_group"
- find_type $I0, "WmlsString"
.local pmc pmc1
- pmc1 = new $I0
+ pmc1 = new "WmlsString"
pmc1 = "embe\0_dd\0_ed\0"
.local int len1
len1 = elements pmc1
Modified: branches/pdd15oo/languages/cardinal/src/PAST.pir
==============================================================================
--- branches/pdd15oo/languages/cardinal/src/PAST.pir (original)
+++ branches/pdd15oo/languages/cardinal/src/PAST.pir Wed Oct 3 09:52:14 2007
@@ -127,8 +127,7 @@
.param pmc children :slurpy
.param pmc adverbs :slurpy :named
- $I0 = find_type class
- $P0 = new $I0
+ $P0 = new class
$P0.'init'(children :flat, 'node'=>self, 'XXX'=>1, adverbs :flat :named)
.return ($P0)
.end