Author: fperrad
Date: Fri Nov 7 08:26:59 2008
New Revision: 32427
Modified:
trunk/languages/WMLScript/runtime/wmlsconsole.pir
trunk/languages/WMLScript/runtime/wmlsfloat.pir
trunk/languages/WMLScript/runtime/wmlslang.pir
trunk/languages/WMLScript/runtime/wmlsstring.pir
trunk/languages/WMLScript/src/script.pir
trunk/languages/WMLScript/src/wmlsstdlibs.pir
trunk/languages/WMLScript/t/pmc/boolean.t
trunk/languages/WMLScript/t/pmc/float.t
trunk/languages/WMLScript/t/pmc/integer.t
trunk/languages/WMLScript/t/pmc/string.t
Log:
[WMLScript]
- fix, new syntax .const 'Name'
(see r32419)
Modified: trunk/languages/WMLScript/runtime/wmlsconsole.pir
==============================================================================
--- trunk/languages/WMLScript/runtime/wmlsconsole.pir (original)
+++ trunk/languages/WMLScript/runtime/wmlsconsole.pir Fri Nov 7 08:26:59 2008
@@ -20,9 +20,9 @@
.sub 'getConsole'
new $P0, 'Hash'
- .const .Sub _console_print = '_console_print'
+ .const 'Sub' _console_print = '_console_print'
$P0[0] = _console_print
- .const .Sub _console_println = '_console_println'
+ .const 'Sub' _console_println = '_console_println'
$P0[1] = _console_println
.return ($P0)
Modified: trunk/languages/WMLScript/runtime/wmlsfloat.pir
==============================================================================
--- trunk/languages/WMLScript/runtime/wmlsfloat.pir (original)
+++ trunk/languages/WMLScript/runtime/wmlsfloat.pir Fri Nov 7 08:26:59 2008
@@ -23,21 +23,21 @@
.sub 'getFloat'
new $P0, 'Hash'
- .const .Sub _float_int = '_float_int'
+ .const 'Sub' _float_int = '_float_int'
$P0[0] = _float_int
- .const .Sub _float_floor = '_float_floor'
+ .const 'Sub' _float_floor = '_float_floor'
$P0[1] = _float_floor
- .const .Sub _float_ceil = '_float_ceil'
+ .const 'Sub' _float_ceil = '_float_ceil'
$P0[2] = _float_ceil
- .const .Sub _float_pow = '_float_pow'
+ .const 'Sub' _float_pow = '_float_pow'
$P0[3] = _float_pow
- .const .Sub _float_round = '_float_round'
+ .const 'Sub' _float_round = '_float_round'
$P0[4] = _float_round
- .const .Sub _float_sqrt = '_float_sqrt'
+ .const 'Sub' _float_sqrt = '_float_sqrt'
$P0[5] = _float_sqrt
- .const .Sub _float_maxFloat = '_float_maxFloat'
+ .const 'Sub' _float_maxFloat = '_float_maxFloat'
$P0[6] = _float_maxFloat
- .const .Sub _float_minFloat = '_float_minFloat'
+ .const 'Sub' _float_minFloat = '_float_minFloat'
$P0[7] = _float_minFloat
.return ($P0)
Modified: trunk/languages/WMLScript/runtime/wmlslang.pir
==============================================================================
--- trunk/languages/WMLScript/runtime/wmlslang.pir (original)
+++ trunk/languages/WMLScript/runtime/wmlslang.pir Fri Nov 7 08:26:59 2008
@@ -23,35 +23,35 @@
.sub 'getLang'
new $P0, 'Hash'
- .const .Sub _lang_abs = '_lang_abs'
+ .const 'Sub' _lang_abs = '_lang_abs'
$P0[0] = _lang_abs
- .const .Sub _lang_min = '_lang_min'
+ .const 'Sub' _lang_min = '_lang_min'
$P0[1] = _lang_min
- .const .Sub _lang_max = '_lang_max'
+ .const 'Sub' _lang_max = '_lang_max'
$P0[2] = _lang_max
- .const .Sub _lang_parseInt = '_lang_parseInt'
+ .const 'Sub' _lang_parseInt = '_lang_parseInt'
$P0[3] = _lang_parseInt
- .const .Sub _lang_parseFloat = '_lang_parseFloat'
+ .const 'Sub' _lang_parseFloat = '_lang_parseFloat'
$P0[4] = _lang_parseFloat
- .const .Sub _lang_isInt = '_lang_isInt'
+ .const 'Sub' _lang_isInt = '_lang_isInt'
$P0[5] = _lang_isInt
- .const .Sub _lang_isFloat = '_lang_isFloat'
+ .const 'Sub' _lang_isFloat = '_lang_isFloat'
$P0[6] = _lang_isFloat
- .const .Sub _lang_maxInt = '_lang_maxInt'
+ .const 'Sub' _lang_maxInt = '_lang_maxInt'
$P0[7] = _lang_maxInt
- .const .Sub _lang_minInt = '_lang_minInt'
+ .const 'Sub' _lang_minInt = '_lang_minInt'
$P0[8] = _lang_minInt
- .const .Sub _lang_float = '_lang_float'
+ .const 'Sub' _lang_float = '_lang_float'
$P0[9] = _lang_float
- .const .Sub _lang_exit = '_lang_exit'
+ .const 'Sub' _lang_exit = '_lang_exit'
$P0[10] = _lang_exit
- .const .Sub _lang_abort = '_lang_abort'
+ .const 'Sub' _lang_abort = '_lang_abort'
$P0[11] = _lang_abort
- .const .Sub _lang_random = '_lang_random'
+ .const 'Sub' _lang_random = '_lang_random'
$P0[12] = _lang_random
- .const .Sub _lang_seed = '_lang_seed'
+ .const 'Sub' _lang_seed = '_lang_seed'
$P0[13] = _lang_seed
- .const .Sub _lang_characterSet = '_lang_characterSet'
+ .const 'Sub' _lang_characterSet = '_lang_characterSet'
$P0[14] = _lang_characterSet
.return ($P0)
Modified: trunk/languages/WMLScript/runtime/wmlsstring.pir
==============================================================================
--- trunk/languages/WMLScript/runtime/wmlsstring.pir (original)
+++ trunk/languages/WMLScript/runtime/wmlsstring.pir Fri Nov 7 08:26:59 2008
@@ -49,37 +49,37 @@
.sub 'getString'
new $P0, 'Hash'
- .const .Sub _string_length = '_string_length'
+ .const 'Sub' _string_length = '_string_length'
$P0[0] = _string_length
- .const .Sub _string_isEmpty = '_string_isEmpty'
+ .const 'Sub' _string_isEmpty = '_string_isEmpty'
$P0[1] = _string_isEmpty
- .const .Sub _string_charAt = '_string_charAt'
+ .const 'Sub' _string_charAt = '_string_charAt'
$P0[2] = _string_charAt
- .const .Sub _string_subString = '_string_subString'
+ .const 'Sub' _string_subString = '_string_subString'
$P0[3] = _string_subString
- .const .Sub _string_find = '_string_find'
+ .const 'Sub' _string_find = '_string_find'
$P0[4] = _string_find
- .const .Sub _string_replace = '_string_replace'
+ .const 'Sub' _string_replace = '_string_replace'
$P0[5] = _string_replace
- .const .Sub _string_elements = '_string_elements'
+ .const 'Sub' _string_elements = '_string_elements'
$P0[6] = _string_elements
- .const .Sub _string_elementAt = '_string_elementAt'
+ .const 'Sub' _string_elementAt = '_string_elementAt'
$P0[7] = _string_elementAt
- .const .Sub _string_removeAt = '_string_removeAt'
+ .const 'Sub' _string_removeAt = '_string_removeAt'
$P0[8] = _string_removeAt
- .const .Sub _string_replaceAt = '_string_replaceAt'
+ .const 'Sub' _string_replaceAt = '_string_replaceAt'
$P0[9] = _string_replaceAt
- .const .Sub _string_insertAt = '_string_insertAt'
+ .const 'Sub' _string_insertAt = '_string_insertAt'
$P0[10] = _string_insertAt
- .const .Sub _string_squeeze = '_string_squeeze'
+ .const 'Sub' _string_squeeze = '_string_squeeze'
$P0[11] = _string_squeeze
- .const .Sub _string_trim = '_string_trim'
+ .const 'Sub' _string_trim = '_string_trim'
$P0[12] = _string_trim
- .const .Sub _string_compare = '_string_compare'
+ .const 'Sub' _string_compare = '_string_compare'
$P0[13] = _string_compare
- .const .Sub _string_toString = '_string_toString'
+ .const 'Sub' _string_toString = '_string_toString'
$P0[14] = _string_toString
- .const .Sub _string_format = '_string_format'
+ .const 'Sub' _string_format = '_string_format'
$P0[15] = _string_format
.return ($P0)
Modified: trunk/languages/WMLScript/src/script.pir
==============================================================================
--- trunk/languages/WMLScript/src/script.pir (original)
+++ trunk/languages/WMLScript/src/script.pir Fri Nov 7 08:26:59 2008
@@ -412,7 +412,7 @@
couple = self[idx]
function_index = couple[0]
function_name = couple[1]
- pir .= " .const .Sub "
+ pir .= " .const 'Sub' "
pir .= function_name
pir .= " = 'function"
$S0 = function_index
Modified: trunk/languages/WMLScript/src/wmlsstdlibs.pir
==============================================================================
--- trunk/languages/WMLScript/src/wmlsstdlibs.pir (original)
+++ trunk/languages/WMLScript/src/wmlsstdlibs.pir Fri Nov 7 08:26:59 2008
@@ -69,7 +69,7 @@
$P2 = $P1[findex]
.return ($P2)
_handler:
- .const .Sub not_implemented = 'not_implemented'
+ .const 'Sub' not_implemented = 'not_implemented'
.return (not_implemented)
.end
Modified: trunk/languages/WMLScript/t/pmc/boolean.t
==============================================================================
--- trunk/languages/WMLScript/t/pmc/boolean.t (original)
+++ trunk/languages/WMLScript/t/pmc/boolean.t Fri Nov 7 08:26:59 2008
@@ -152,7 +152,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsBoolean cst1 = "1"
+ .const "WmlsBoolean" cst1 = "1"
print cst1
print "\n"
$P0 = istrue cst1
@@ -172,7 +172,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsBoolean cst1 = "1"
+ .const "WmlsBoolean" cst1 = "1"
print cst1
print "\n"
$P0 = typeof cst1
@@ -192,7 +192,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsBoolean cst1 = "1"
+ .const "WmlsBoolean" cst1 = "1"
print cst1
print "\n"
$P0 = defined cst1
Modified: trunk/languages/WMLScript/t/pmc/float.t
==============================================================================
--- trunk/languages/WMLScript/t/pmc/float.t (original)
+++ trunk/languages/WMLScript/t/pmc/float.t Fri Nov 7 08:26:59 2008
@@ -150,7 +150,7 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check HLL & .const' );
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsFloat cst1 = "3.14"
+ .const "WmlsFloat" cst1 = "3.14"
print cst1
print "\n"
.local int bool1
@@ -167,7 +167,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsFloat cst1 = "3.14"
+ .const "WmlsFloat" cst1 = "3.14"
print cst1
print "\n"
$P0 = istrue cst1
@@ -187,7 +187,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsFloat cst1 = "3.14"
+ .const "WmlsFloat" cst1 = "3.14"
print cst1
print "\n"
$P0 = typeof cst1
@@ -207,7 +207,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsFloat cst1 = "3.14"
+ .const "WmlsFloat" cst1 = "3.14"
print cst1
print "\n"
$P0 = defined cst1
Modified: trunk/languages/WMLScript/t/pmc/integer.t
==============================================================================
--- trunk/languages/WMLScript/t/pmc/integer.t (original)
+++ trunk/languages/WMLScript/t/pmc/integer.t Fri Nov 7 08:26:59 2008
@@ -150,7 +150,7 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check HLL & .const' );
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsInteger cst1 = "42"
+ .const "WmlsInteger" cst1 = "42"
print cst1
print "\n"
.local int bool1
@@ -167,7 +167,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsInteger cst1 = "42"
+ .const "WmlsInteger" cst1 = "42"
print cst1
print "\n"
$P0 = istrue cst1
@@ -187,7 +187,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsInteger cst1 = "42"
+ .const "WmlsInteger" cst1 = "42"
print cst1
print "\n"
$P0 = typeof cst1
@@ -207,7 +207,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsInteger cst1 = "42"
+ .const "WmlsInteger" cst1 = "42"
print cst1
print "\n"
$P0 = defined cst1
Modified: trunk/languages/WMLScript/t/pmc/string.t
==============================================================================
--- trunk/languages/WMLScript/t/pmc/string.t (original)
+++ trunk/languages/WMLScript/t/pmc/string.t Fri Nov 7 08:26:59 2008
@@ -165,7 +165,7 @@
pir_output_is( << 'CODE', << 'OUTPUT', 'check HLL & .const' );
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsString cst1 = "simple string"
+ .const "WmlsString" cst1 = "simple string"
print cst1
print "\n"
.local int bool1
@@ -181,7 +181,7 @@
pir_output_is( << 'CODE', << 'OUTPUT', '.const & empty string' );
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsString cst1 = ""
+ .const "WmlsString" cst1 = ""
print cst1
print "\n"
.local int bool1
@@ -198,7 +198,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsString cst1 = "simple string"
+ .const "WmlsString" cst1 = "simple string"
print cst1
print "\n"
$P0 = istrue cst1
@@ -218,7 +218,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsString cst1 = "simple string"
+ .const "WmlsString" cst1 = "simple string"
print cst1
print "\n"
$P0 = typeof cst1
@@ -238,7 +238,7 @@
.loadlib "wmls_ops"
.HLL "WMLScript", "wmls_group"
.sub _main
- .const .WmlsString cst1 = "simple string"
+ .const "WmlsString" cst1 = "simple string"
print cst1
print "\n"
$P0 = defined cst1