[svn:parrot] r42916 - in trunk/src: dynoplibs ops
fperrad at svn.parrot.org
fperrad at svn.parrot.org
Sun Dec 6 14:47:20 UTC 2009
Author: fperrad
Date: Sun Dec 6 14:47:19 2009
New Revision: 42916
URL: https://trac.parrot.org/parrot/changeset/42916
Log:
[cage] improve C indentation, see TT #1329
Modified:
trunk/src/dynoplibs/math.ops
trunk/src/dynoplibs/obscure.ops
trunk/src/ops/bit.ops
trunk/src/ops/cmp.ops
trunk/src/ops/core.ops
trunk/src/ops/debug.ops
trunk/src/ops/io.ops
trunk/src/ops/math.ops
trunk/src/ops/object.ops
trunk/src/ops/pmc.ops
trunk/src/ops/set.ops
trunk/src/ops/string.ops
trunk/src/ops/sys.ops
Modified: trunk/src/dynoplibs/math.ops
==============================================================================
--- trunk/src/dynoplibs/math.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/dynoplibs/math.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -34,7 +34,7 @@
=cut
inline op rand(out NUM) {
- $1 = Parrot_float_rand(0);
+ $1 = Parrot_float_rand(0);
}
=item B<rand>(out INT)
@@ -44,7 +44,7 @@
=cut
inline op rand(out INT) {
- $1 = Parrot_int_rand(0);
+ $1 = Parrot_int_rand(0);
}
=item B<rand>(out NUM, in NUM)
@@ -54,7 +54,7 @@
=cut
inline op rand(out NUM, in NUM) {
- $1 = $2 * Parrot_float_rand(0);
+ $1 = $2 * Parrot_float_rand(0);
}
=item B<rand>(out INT, in INT)
@@ -64,7 +64,7 @@
=cut
inline op rand(out INT, in INT) {
- $1 = Parrot_range_rand(0, $2, 0);
+ $1 = Parrot_range_rand(0, $2, 0);
}
=item B<rand>(out NUM, in NUM, in NUM)
@@ -74,7 +74,7 @@
=cut
inline op rand(out NUM, in NUM, in NUM) {
- $1 = $2 + ($3 - $2) * Parrot_float_rand(0);
+ $1 = $2 + ($3 - $2) * Parrot_float_rand(0);
}
=item B<srand>(in NUM)
@@ -104,7 +104,7 @@
=cut
inline op rand(out INT, in INT, in INT) {
- $1 = Parrot_range_rand($2, $3, 0);
+ $1 = Parrot_range_rand($2, $3, 0);
}
=back
Modified: trunk/src/dynoplibs/obscure.ops
==============================================================================
--- trunk/src/dynoplibs/obscure.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/dynoplibs/obscure.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -51,7 +51,7 @@
=cut
inline op covers(out NUM, in NUM) :advanced_math {
- $1 = 1.0 - sin($2);
+ $1 = 1.0 - sin($2);
}
@@ -65,7 +65,7 @@
inline op exsec(out NUM, in NUM) :advanced_math {
- $1 = (1.0 / cos($2)) - 1.0;
+ $1 = (1.0 / cos($2)) - 1.0;
}
@@ -78,7 +78,7 @@
=cut
inline op hav(out NUM, in NUM) {
- $1 = 0.5 * (1.0 - cos($2));
+ $1 = 0.5 * (1.0 - cos($2));
}
@@ -91,7 +91,7 @@
=cut
inline op vers(out NUM, in NUM) :advanced_math {
- $1 = 1.0 - cos($2);
+ $1 = 1.0 - cos($2);
}
Modified: trunk/src/ops/bit.ops
==============================================================================
--- trunk/src/ops/bit.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/bit.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -59,27 +59,27 @@
=cut
inline op band(inout INT, in INT) :base_core {
- $1 &= $2;
+ $1 &= $2;
}
inline op band(invar PMC, in INT) :base_core {
- VTABLE_i_bitwise_and_int(interp, $1, $2);
+ VTABLE_i_bitwise_and_int(interp, $1, $2);
}
inline op band(invar PMC, invar PMC) :base_core {
- VTABLE_i_bitwise_and(interp, $1, $2);
+ VTABLE_i_bitwise_and(interp, $1, $2);
}
inline op band(out INT, in INT, in INT) :base_core {
- $1 = $2 & $3;
+ $1 = $2 & $3;
}
inline op band(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_bitwise_and_int(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_and_int(interp, $2, $3, $1);
}
inline op band(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_and(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_and(interp, $2, $3, $1);
}
=item B<bands>(inout STR, in STR)
@@ -103,27 +103,27 @@
=cut
inline op bands(inout STR, in STR) :base_core {
- Parrot_str_bitwise_and(interp, $1, $2, &$1);
+ Parrot_str_bitwise_and(interp, $1, $2, &$1);
}
inline op bands(invar PMC, in STR) :base_core {
- VTABLE_i_bitwise_ands_str(interp, $1, $2);
+ VTABLE_i_bitwise_ands_str(interp, $1, $2);
}
inline op bands(invar PMC, invar PMC) :base_core {
- VTABLE_i_bitwise_ands(interp, $1, $2);
+ VTABLE_i_bitwise_ands(interp, $1, $2);
}
inline op bands(out STR, in STR, in STR) :base_core {
- $1 = Parrot_str_bitwise_and(interp, $2, $3, NULL);
+ $1 = Parrot_str_bitwise_and(interp, $2, $3, NULL);
}
inline op bands(invar PMC, invar PMC, in STR) :base_core {
- $1 = VTABLE_bitwise_ands_str(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_ands_str(interp, $2, $3, $1);
}
inline op bands(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_ands(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_ands(interp, $2, $3, $1);
}
########################################
@@ -141,19 +141,19 @@
=cut
inline op bnot(inout INT) :base_core {
- $1 = ~ $1;
+ $1 = ~ $1;
}
inline op bnot(out INT, in INT) :base_core {
- $1 = ~ $2;
+ $1 = ~ $2;
}
inline op bnot(invar PMC) :base_core {
- VTABLE_i_bitwise_not(interp, $1);
+ VTABLE_i_bitwise_not(interp, $1);
}
inline op bnot(out PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_not(interp, $2, $1);
+ $1 = VTABLE_bitwise_not(interp, $2, $1);
}
=item B<bnots>(inout STR)
@@ -167,19 +167,19 @@
=cut
inline op bnots(inout STR) :base_core {
- Parrot_str_bitwise_not(interp, $1, &$1);
+ Parrot_str_bitwise_not(interp, $1, &$1);
}
inline op bnots(out STR, in STR) :base_core {
- Parrot_str_bitwise_not(interp, $2, &$1);
+ Parrot_str_bitwise_not(interp, $2, &$1);
}
inline op bnots(invar PMC) :base_core {
- VTABLE_i_bitwise_nots(interp, $1);
+ VTABLE_i_bitwise_nots(interp, $1);
}
inline op bnots(out PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_nots(interp, $2, $1);
+ $1 = VTABLE_bitwise_nots(interp, $2, $1);
}
########################################
@@ -205,27 +205,27 @@
=cut
inline op bor(inout INT, in INT) :base_core {
- $1 |= $2;
+ $1 |= $2;
}
inline op bor(invar PMC, in INT) :base_core {
- VTABLE_i_bitwise_or_int(interp, $1, $2);
+ VTABLE_i_bitwise_or_int(interp, $1, $2);
}
inline op bor(invar PMC, invar PMC) :base_core {
- VTABLE_i_bitwise_or(interp, $1, $2);
+ VTABLE_i_bitwise_or(interp, $1, $2);
}
inline op bor(out INT, in INT, in INT) :base_core {
- $1 = $2 | $3;
+ $1 = $2 | $3;
}
inline op bor(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_bitwise_or_int(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_or_int(interp, $2, $3, $1);
}
inline op bor(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_or(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_or(interp, $2, $3, $1);
}
=item B<bors>(inout STR, in STR)
@@ -249,27 +249,27 @@
=cut
inline op bors(inout STR, in STR) :base_core {
- Parrot_str_bitwise_or(interp, $1, $2, &$1);
+ Parrot_str_bitwise_or(interp, $1, $2, &$1);
}
inline op bors(invar PMC, in STR) :base_core {
- VTABLE_i_bitwise_ors_str(interp, $1, $2);
+ VTABLE_i_bitwise_ors_str(interp, $1, $2);
}
inline op bors(invar PMC, invar PMC) :base_core {
- VTABLE_i_bitwise_ors(interp, $1, $2);
+ VTABLE_i_bitwise_ors(interp, $1, $2);
}
inline op bors(out STR, in STR, in STR) :base_core {
- $1 = Parrot_str_bitwise_or(interp, $2, $3, NULL);
+ $1 = Parrot_str_bitwise_or(interp, $2, $3, NULL);
}
inline op bors(invar PMC, invar PMC, in STR) :base_core {
- $1 = VTABLE_bitwise_ors_str(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_ors_str(interp, $2, $3, $1);
}
inline op bors(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_ors(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_ors(interp, $2, $3, $1);
}
########################################
@@ -293,27 +293,27 @@
=cut
inline op shl(inout INT, in INT) :base_core {
- $1 = bit_shift_left($1, $2);
+ $1 = bit_shift_left($1, $2);
}
inline op shl(invar PMC, in INT) :base_core {
- VTABLE_i_bitwise_shl_int(interp, $1, $2);
+ VTABLE_i_bitwise_shl_int(interp, $1, $2);
}
inline op shl(invar PMC, invar PMC) :base_core {
- VTABLE_i_bitwise_shl(interp, $1, $2);
+ VTABLE_i_bitwise_shl(interp, $1, $2);
}
inline op shl(out INT, in INT, in INT) :base_core {
- $1 = bit_shift_left($2, $3);
+ $1 = bit_shift_left($2, $3);
}
inline op shl(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_bitwise_shl_int(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_shl_int(interp, $2, $3, $1);
}
inline op shl(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_shl(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_shl(interp, $2, $3, $1);
}
########################################
@@ -337,29 +337,29 @@
=cut
inline op shr(inout INT, in INT) :base_core {
- const INTVAL signed_shift = -$2;
- $1 = bit_shift_left($1, signed_shift);
+ const INTVAL signed_shift = -$2;
+ $1 = bit_shift_left($1, signed_shift);
}
inline op shr(invar PMC, in INT) :base_core {
- VTABLE_i_bitwise_shr_int(interp, $1, $2);
+ VTABLE_i_bitwise_shr_int(interp, $1, $2);
}
inline op shr(invar PMC, invar PMC) :base_core {
- VTABLE_i_bitwise_shr(interp, $1, $2);
+ VTABLE_i_bitwise_shr(interp, $1, $2);
}
inline op shr(out INT, in INT, in INT) :base_core {
- const INTVAL signed_shift = -$3;
- $1 = bit_shift_left($2, signed_shift);
+ const INTVAL signed_shift = -$3;
+ $1 = bit_shift_left($2, signed_shift);
}
inline op shr(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_bitwise_shr_int(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_shr_int(interp, $2, $3, $1);
}
inline op shr(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_shr(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_shr(interp, $2, $3, $1);
}
########################################
@@ -383,31 +383,31 @@
=cut
inline op lsr(out INT, in INT) :base_core {
- /*
- * lvalue casts are evil, but this one isn't evil enough to kill.
- * it's just casting a signed integral to the equivalent unsigned.
- */
- LVALUE_CAST(UINTVAL, $1) >>= $2;
+ /*
+ * lvalue casts are evil, but this one isn't evil enough to kill.
+ * it's just casting a signed integral to the equivalent unsigned.
+ */
+ LVALUE_CAST(UINTVAL, $1) >>= $2;
}
inline op lsr(invar PMC, in INT) :base_core {
- VTABLE_i_bitwise_lsr_int(interp, $1, $2);
+ VTABLE_i_bitwise_lsr_int(interp, $1, $2);
}
inline op lsr(invar PMC, invar PMC) :base_core {
- VTABLE_i_bitwise_lsr(interp, $1, $2);
+ VTABLE_i_bitwise_lsr(interp, $1, $2);
}
inline op lsr(out INT, in INT, in INT) :base_core {
- $1 = (INTVAL)((UINTVAL)$2 >> $3);
+ $1 = (INTVAL)((UINTVAL)$2 >> $3);
}
inline op lsr(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_bitwise_lsr_int(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_lsr_int(interp, $2, $3, $1);
}
inline op lsr(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_lsr(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_lsr(interp, $2, $3, $1);
}
=item B<rot>(out INT, in INT, in INT, inconst INT)
@@ -420,17 +420,17 @@
=cut
inline op rot(out INT, in INT, in INT, inconst INT) {
- const INTVAL r = $2;
- INTVAL s = $3;
- const INTVAL w = $4;
- INTVAL d, t;
- if (s < 0)
- s += w;
- d = r << s;
- t = w - s;
- t = (INTVAL)((UINTVAL)r >> t);
- d |= t;
- $1 = d;
+ const INTVAL r = $2;
+ INTVAL s = $3;
+ const INTVAL w = $4;
+ INTVAL d, t;
+ if (s < 0)
+ s += w;
+ d = r << s;
+ t = w - s;
+ t = (INTVAL)((UINTVAL)r >> t);
+ d |= t;
+ $1 = d;
}
@@ -459,27 +459,27 @@
=cut
inline op bxor(inout INT, in INT) :base_core {
- $1 ^= $2;
+ $1 ^= $2;
}
inline op bxor(invar PMC, in INT) :base_core {
- VTABLE_i_bitwise_xor_int(interp, $1, $2);
+ VTABLE_i_bitwise_xor_int(interp, $1, $2);
}
inline op bxor(invar PMC, invar PMC) :base_core {
- VTABLE_i_bitwise_xor(interp, $1, $2);
+ VTABLE_i_bitwise_xor(interp, $1, $2);
}
inline op bxor(out INT, in INT, in INT) :base_core {
- $1 = $2 ^ $3;
+ $1 = $2 ^ $3;
}
inline op bxor(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_bitwise_xor_int(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_xor_int(interp, $2, $3, $1);
}
inline op bxor(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_xor(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_xor(interp, $2, $3, $1);
}
=item B<bxors>(inout STR, in STR)
@@ -503,27 +503,27 @@
=cut
inline op bxors(inout STR, in STR) :base_core {
- Parrot_str_bitwise_xor(interp, $1, $2, &$1);
+ Parrot_str_bitwise_xor(interp, $1, $2, &$1);
}
inline op bxors(invar PMC, in STR) :base_core {
- VTABLE_i_bitwise_xors_str(interp, $1, $2);
+ VTABLE_i_bitwise_xors_str(interp, $1, $2);
}
inline op bxors(invar PMC, invar PMC) :base_core {
- VTABLE_i_bitwise_xors(interp, $1, $2);
+ VTABLE_i_bitwise_xors(interp, $1, $2);
}
inline op bxors(out STR, in STR, in STR) :base_core {
- $1 = Parrot_str_bitwise_xor(interp, $2, $3, NULL);
+ $1 = Parrot_str_bitwise_xor(interp, $2, $3, NULL);
}
inline op bxors(invar PMC, invar PMC, in STR) :base_core {
- $1 = VTABLE_bitwise_xors_str(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_xors_str(interp, $2, $3, $1);
}
inline op bxors(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_bitwise_xors(interp, $2, $3, $1);
+ $1 = VTABLE_bitwise_xors(interp, $2, $3, $1);
}
=back
Modified: trunk/src/ops/cmp.ops
==============================================================================
--- trunk/src/ops/cmp.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/cmp.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -63,82 +63,81 @@
=cut
inline op eq(in INT, in INT, inconst LABEL) :base_core {
- if ($1 == $2) {
- goto OFFSET($3);
- }
+ if ($1 == $2) {
+ goto OFFSET($3);
+ }
}
inline op eq(in NUM, in NUM, inconst LABEL) :base_core {
- if ($1 == $2) {
- goto OFFSET($3);
- }
+ if ($1 == $2) {
+ goto OFFSET($3);
+ }
}
op eq(in STR, in STR, inconst LABEL) :base_core {
- if (Parrot_str_equal(interp, $1, $2)) {
- goto OFFSET($3);
- }
+ if (Parrot_str_equal(interp, $1, $2)) {
+ goto OFFSET($3);
+ }
}
op eq(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_is_equal(interp, $1, $2)) {
- goto OFFSET($3);
- }
+ if (VTABLE_is_equal(interp, $1, $2)) {
+ goto OFFSET($3);
+ }
}
op eq(invar PMC, in INT, inconst LABEL) :base_core {
- PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
- VTABLE_set_integer_native(interp, temp, $2);
+ PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
+ VTABLE_set_integer_native(interp, temp, $2);
- if (VTABLE_is_equal(interp, $1, temp)) {
- temporary_pmc_free(interp, temp);
- goto OFFSET($3);
- }
+ if (VTABLE_is_equal(interp, $1, temp)) {
+ temporary_pmc_free(interp, temp);
+ goto OFFSET($3);
+ }
- temporary_pmc_free(interp, temp);
+ temporary_pmc_free(interp, temp);
}
op eq(invar PMC, in NUM, inconst LABEL) :base_core {
- /*
- * the get_number and get_string should probably
- * be also replaced with code like above, as
- * overriding the compare multi subs wouldn't
- * have any effect with the current code
- */
- if (VTABLE_get_number(interp, $1) == $2) {
- goto OFFSET($3);
- }
+ /*
+ * the get_number and get_string should probably
+ * be also replaced with code like above, as
+ * overriding the compare multi subs wouldn't
+ * have any effect with the current code
+ */
+ if (VTABLE_get_number(interp, $1) == $2) {
+ goto OFFSET($3);
+ }
}
op eq(invar PMC, in STR, inconst LABEL) :base_core {
- if (Parrot_str_equal(interp,
- VTABLE_get_string(interp, $1), $2)) {
- goto OFFSET($3);
- }
+ if (Parrot_str_equal(interp, VTABLE_get_string(interp, $1), $2)) {
+ goto OFFSET($3);
+ }
}
op eq_str(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_is_equal_string(interp, $1, $2)) {
- goto OFFSET($3);
- }
+ if (VTABLE_is_equal_string(interp, $1, $2)) {
+ goto OFFSET($3);
+ }
}
op eq_num(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_is_equal_num(interp, $1, $2)) {
- goto OFFSET($3);
- }
+ if (VTABLE_is_equal_num(interp, $1, $2)) {
+ goto OFFSET($3);
+ }
}
op eq_addr(in STR, in STR, inconst LABEL) :base_core {
- if ($1 == $2) {
- goto OFFSET($3);
- }
+ if ($1 == $2) {
+ goto OFFSET($3);
+ }
}
op eq_addr(invar PMC, invar PMC, inconst LABEL) :base_core {
- if ($1 == $2) {
- goto OFFSET($3);
- }
+ if ($1 == $2) {
+ goto OFFSET($3);
+ }
}
########################################
@@ -170,76 +169,75 @@
=cut
inline op ne(in INT, in INT, inconst LABEL) :base_core {
- if ($1 != $2) {
- goto OFFSET($3);
- }
+ if ($1 != $2) {
+ goto OFFSET($3);
+ }
}
inline op ne(in NUM, in NUM, inconst LABEL) :base_core {
- if ($1 != $2) {
- goto OFFSET($3);
- }
+ if ($1 != $2) {
+ goto OFFSET($3);
+ }
}
op ne(in STR, in STR, inconst LABEL) :base_core {
- if (Parrot_str_not_equal(interp, $1, $2)) {
- goto OFFSET($3);
- }
+ if (Parrot_str_not_equal(interp, $1, $2)) {
+ goto OFFSET($3);
+ }
}
op ne(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (!VTABLE_is_equal(interp, $1, $2)) {
- goto OFFSET($3);
- }
+ if (!VTABLE_is_equal(interp, $1, $2)) {
+ goto OFFSET($3);
+ }
}
op ne(invar PMC, in INT, inconst LABEL) :base_core {
- PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
- VTABLE_set_integer_native(interp, temp, $2);
+ PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
+ VTABLE_set_integer_native(interp, temp, $2);
- if (!VTABLE_is_equal(interp, $1, temp)) {
- temporary_pmc_free(interp, temp);
- goto OFFSET($3);
- }
+ if (!VTABLE_is_equal(interp, $1, temp)) {
+ temporary_pmc_free(interp, temp);
+ goto OFFSET($3);
+ }
- temporary_pmc_free(interp, temp);
+ temporary_pmc_free(interp, temp);
}
op ne(invar PMC, in NUM, inconst LABEL) :base_core {
- if (VTABLE_get_number(interp, $1) != $2) {
- goto OFFSET($3);
- }
+ if (VTABLE_get_number(interp, $1) != $2) {
+ goto OFFSET($3);
+ }
}
op ne(invar PMC, in STR, inconst LABEL) :base_core {
- if (Parrot_str_not_equal(interp,
- VTABLE_get_string(interp, $1), $2)) {
- goto OFFSET($3);
- }
+ if (Parrot_str_not_equal(interp, VTABLE_get_string(interp, $1), $2)) {
+ goto OFFSET($3);
+ }
}
op ne_str(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp_string(interp, $1, $2) != 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp_string(interp, $1, $2) != 0) {
+ goto OFFSET($3);
+ }
}
op ne_num(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp_num(interp, $1, $2) != 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp_num(interp, $1, $2) != 0) {
+ goto OFFSET($3);
+ }
}
op ne_addr(in STR, in STR, inconst LABEL) :base_core {
- if ($1 != $2) {
- goto OFFSET($3);
- }
+ if ($1 != $2) {
+ goto OFFSET($3);
+ }
}
op ne_addr(invar PMC, invar PMC, inconst LABEL) :base_core {
- if ($1 != $2) {
- goto OFFSET($3);
- }
+ if ($1 != $2) {
+ goto OFFSET($3);
+ }
}
########################################
@@ -267,64 +265,63 @@
=cut
inline op lt(in INT, in INT, inconst LABEL) :base_core {
- if ($1 < $2) {
- goto OFFSET($3);
- }
+ if ($1 < $2) {
+ goto OFFSET($3);
+ }
}
inline op lt(in NUM, in NUM, inconst LABEL) :base_core {
- if ($1 < $2) {
- goto OFFSET($3);
- }
+ if ($1 < $2) {
+ goto OFFSET($3);
+ }
}
op lt(in STR, in STR, inconst LABEL) :base_core {
- if (Parrot_str_compare(interp, $1, $2) < 0) {
- goto OFFSET($3);
- }
+ if (Parrot_str_compare(interp, $1, $2) < 0) {
+ goto OFFSET($3);
+ }
}
op lt(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp(interp, $1, $2) < 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp(interp, $1, $2) < 0) {
+ goto OFFSET($3);
+ }
}
op lt(invar PMC, in INT, inconst LABEL) :base_core {
- PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
- VTABLE_set_integer_native(interp, temp, $2);
+ PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
+ VTABLE_set_integer_native(interp, temp, $2);
- if (VTABLE_cmp(interp, $1, temp) < 0) {
- temporary_pmc_free(interp, temp);
- goto OFFSET($3);
- }
+ if (VTABLE_cmp(interp, $1, temp) < 0) {
+ temporary_pmc_free(interp, temp);
+ goto OFFSET($3);
+ }
- temporary_pmc_free(interp, temp);
+ temporary_pmc_free(interp, temp);
}
op lt(invar PMC, in NUM, inconst LABEL) :base_core {
- if (VTABLE_get_number(interp, $1) < $2) {
- goto OFFSET($3);
- }
+ if (VTABLE_get_number(interp, $1) < $2) {
+ goto OFFSET($3);
+ }
}
op lt(invar PMC, in STR, inconst LABEL) :base_core {
- if (Parrot_str_compare(interp,
- VTABLE_get_string(interp, $1), $2) < 0) {
- goto OFFSET($3);
- }
+ if (Parrot_str_compare(interp, VTABLE_get_string(interp, $1), $2) < 0) {
+ goto OFFSET($3);
+ }
}
op lt_str(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp_string(interp, $1, $2) < 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp_string(interp, $1, $2) < 0) {
+ goto OFFSET($3);
+ }
}
op lt_num(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp_num(interp, $1, $2) < 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp_num(interp, $1, $2) < 0) {
+ goto OFFSET($3);
+ }
}
########################################
@@ -352,64 +349,63 @@
=cut
inline op le(in INT, in INT, inconst LABEL) :base_core {
- if ($1 <= $2) {
- goto OFFSET($3);
- }
+ if ($1 <= $2) {
+ goto OFFSET($3);
+ }
}
inline op le(in NUM, in NUM, inconst LABEL) :base_core {
- if ($1 <= $2) {
- goto OFFSET($3);
- }
+ if ($1 <= $2) {
+ goto OFFSET($3);
+ }
}
op le(in STR, in STR, inconst LABEL) :base_core {
- if (Parrot_str_compare(interp, $1, $2) <= 0) {
- goto OFFSET($3);
- }
+ if (Parrot_str_compare(interp, $1, $2) <= 0) {
+ goto OFFSET($3);
+ }
}
op le(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp(interp, $1, $2) <= 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp(interp, $1, $2) <= 0) {
+ goto OFFSET($3);
+ }
}
op le(invar PMC, in INT, inconst LABEL) :base_core {
- PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
- VTABLE_set_integer_native(interp, temp, $2);
+ PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
+ VTABLE_set_integer_native(interp, temp, $2);
- if (VTABLE_cmp(interp, $1, temp) <= 0) {
- temporary_pmc_free(interp, temp);
- goto OFFSET($3);
- }
+ if (VTABLE_cmp(interp, $1, temp) <= 0) {
+ temporary_pmc_free(interp, temp);
+ goto OFFSET($3);
+ }
- temporary_pmc_free(interp, temp);
+ temporary_pmc_free(interp, temp);
}
op le(invar PMC, in NUM, inconst LABEL) :base_core {
- if (VTABLE_get_number(interp, $1) <= $2) {
- goto OFFSET($3);
- }
+ if (VTABLE_get_number(interp, $1) <= $2) {
+ goto OFFSET($3);
+ }
}
op le(invar PMC, in STR, inconst LABEL) :base_core {
- if (Parrot_str_compare(interp,
- VTABLE_get_string(interp, $1), $2) <= 0) {
- goto OFFSET($3);
- }
+ if (Parrot_str_compare(interp, VTABLE_get_string(interp, $1), $2) <= 0) {
+ goto OFFSET($3);
+ }
}
op le_str(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp_string(interp, $1, $2) <= 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp_string(interp, $1, $2) <= 0) {
+ goto OFFSET($3);
+ }
}
op le_num(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp_num(interp, $1, $2) <= 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp_num(interp, $1, $2) <= 0) {
+ goto OFFSET($3);
+ }
}
########################################
@@ -431,46 +427,45 @@
=cut
op gt(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp(interp, $1, $2) > 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp(interp, $1, $2) > 0) {
+ goto OFFSET($3);
+ }
}
op gt(invar PMC, in INT, inconst LABEL) :base_core {
- PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
- VTABLE_set_integer_native(interp, temp, $2);
+ PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
+ VTABLE_set_integer_native(interp, temp, $2);
- if (VTABLE_cmp(interp, $1, temp) > 0) {
- temporary_pmc_free(interp, temp);
- goto OFFSET($3);
- }
+ if (VTABLE_cmp(interp, $1, temp) > 0) {
+ temporary_pmc_free(interp, temp);
+ goto OFFSET($3);
+ }
- temporary_pmc_free(interp, temp);
+ temporary_pmc_free(interp, temp);
}
op gt(invar PMC, in NUM, inconst LABEL) :base_core {
- if (VTABLE_get_number(interp, $1) > $2) {
- goto OFFSET($3);
- }
+ if (VTABLE_get_number(interp, $1) > $2) {
+ goto OFFSET($3);
+ }
}
op gt(invar PMC, in STR, inconst LABEL) :base_core {
- if (Parrot_str_compare(interp,
- VTABLE_get_string(interp, $1), $2) > 0) {
- goto OFFSET($3);
- }
+ if (Parrot_str_compare(interp, VTABLE_get_string(interp, $1), $2) > 0) {
+ goto OFFSET($3);
+ }
}
op gt_str(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp_string(interp, $1, $2) > 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp_string(interp, $1, $2) > 0) {
+ goto OFFSET($3);
+ }
}
op gt_num(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp_num(interp, $1, $2) > 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp_num(interp, $1, $2) > 0) {
+ goto OFFSET($3);
+ }
}
########################################
@@ -492,45 +487,45 @@
=cut
op ge(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp(interp, $1, $2) >= 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp(interp, $1, $2) >= 0) {
+ goto OFFSET($3);
+ }
}
op ge(invar PMC, in INT, inconst LABEL) :base_core {
- PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
- VTABLE_set_integer_native(interp, temp, $2);
+ PMC * temp = temporary_pmc_new(interp, enum_class_Integer);
+ VTABLE_set_integer_native(interp, temp, $2);
- if (VTABLE_cmp(interp, $1, temp) >= 0) {
- temporary_pmc_free(interp, temp);
- goto OFFSET($3);
- }
+ if (VTABLE_cmp(interp, $1, temp) >= 0) {
+ temporary_pmc_free(interp, temp);
+ goto OFFSET($3);
+ }
- temporary_pmc_free(interp, temp);
+ temporary_pmc_free(interp, temp);
}
op ge(invar PMC, in NUM, inconst LABEL) :base_core {
- if (VTABLE_get_number(interp, $1) >= $2) {
- goto OFFSET($3);
- }
+ if (VTABLE_get_number(interp, $1) >= $2) {
+ goto OFFSET($3);
+ }
}
op ge(invar PMC, in STR, inconst LABEL) :base_core {
- if (Parrot_str_compare(interp, VTABLE_get_string(interp, $1), $2) >= 0) {
- goto OFFSET($3);
- }
+ if (Parrot_str_compare(interp, VTABLE_get_string(interp, $1), $2) >= 0) {
+ goto OFFSET($3);
+ }
}
op ge_str(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp_string(interp, $1, $2) >= 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp_string(interp, $1, $2) >= 0) {
+ goto OFFSET($3);
+ }
}
op ge_num(invar PMC, invar PMC, inconst LABEL) :base_core {
- if (VTABLE_cmp_num(interp, $1, $2) >= 0) {
- goto OFFSET($3);
- }
+ if (VTABLE_cmp_num(interp, $1, $2) >= 0) {
+ goto OFFSET($3);
+ }
}
########################################
@@ -546,15 +541,15 @@
=cut
op if_null(invar PMC, inconst LABEL) {
- if (PMC_IS_NULL($1)) {
- goto OFFSET($2);
- }
+ if (PMC_IS_NULL($1)) {
+ goto OFFSET($2);
+ }
}
op if_null(invar STR, inconst LABEL) {
- if (STRING_IS_NULL($1)) {
- goto OFFSET($2);
- }
+ if (STRING_IS_NULL($1)) {
+ goto OFFSET($2);
+ }
}
########################################
@@ -570,15 +565,15 @@
=cut
op unless_null(invar PMC, inconst LABEL) {
- if (!PMC_IS_NULL($1)) {
- goto OFFSET($2);
- }
+ if (!PMC_IS_NULL($1)) {
+ goto OFFSET($2);
+ }
}
op unless_null(invar STR, inconst LABEL) {
- if (!STRING_IS_NULL($1)) {
- goto OFFSET($2);
- }
+ if (!STRING_IS_NULL($1)) {
+ goto OFFSET($2);
+ }
}
=back
@@ -617,50 +612,50 @@
=cut
inline op cmp(out INT, in INT, in INT) :base_core {
- $1 = $2 < $3 ? -1 :
- $2 > $3 ? +1 :
- 0;
+ $1 = $2 < $3 ? -1 :
+ $2 > $3 ? +1 :
+ 0;
}
inline op cmp(out INT, in NUM, in NUM) :base_core {
- $1 = $2 < $3 ? -1 :
- $2 > $3 ? +1 :
- 0;
+ $1 = $2 < $3 ? -1 :
+ $2 > $3 ? +1 :
+ 0;
}
inline op cmp(out INT, in STR, in STR) :base_core {
- $1 = Parrot_str_compare(interp, $2, $3);
+ $1 = Parrot_str_compare(interp, $2, $3);
}
inline op cmp(out INT, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_cmp(interp, $2, $3);
+ $1 = VTABLE_cmp(interp, $2, $3);
}
inline op cmp(out INT, invar PMC, in INT) :base_core {
- const INTVAL l = VTABLE_get_integer(interp, $2);
- $1 = l < $3 ? -1 :
- l > $3 ? +1 :
- 0;
+ const INTVAL l = VTABLE_get_integer(interp, $2);
+ $1 = l < $3 ? -1 :
+ l > $3 ? +1 :
+ 0;
}
inline op cmp(out INT, invar PMC, in NUM) :base_core {
- const FLOATVAL l = VTABLE_get_number(interp, $2);
- $1 = l < $3 ? -1 :
- l > $3 ? +1 :
- 0;
+ const FLOATVAL l = VTABLE_get_number(interp, $2);
+ $1 = l < $3 ? -1 :
+ l > $3 ? +1 :
+ 0;
}
inline op cmp(out INT, invar PMC, in STR) :base_core {
- STRING* const l = VTABLE_get_string(interp, $2);
- $1 = Parrot_str_compare(interp, l, $3);
+ STRING* const l = VTABLE_get_string(interp, $2);
+ $1 = Parrot_str_compare(interp, l, $3);
}
inline op cmp_str(out INT, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_cmp_string(interp, $2, $3);
+ $1 = VTABLE_cmp_string(interp, $2, $3);
}
inline op cmp_num(out INT, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_cmp_num(interp, $2, $3);
+ $1 = VTABLE_cmp_num(interp, $2, $3);
}
=item B<cmp_pmc>(out PMC, invar PMC, invar PMC)
@@ -672,7 +667,7 @@
=cut
inline op cmp_pmc(out PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_cmp_pmc(interp, $2, $3);
+ $1 = VTABLE_cmp_pmc(interp, $2, $3);
}
########################################
@@ -761,7 +756,7 @@
=cut
inline op isgt(out INT, invar PMC, invar PMC) {
- $1 = (VTABLE_cmp(interp, $2, $3) > 0);
+ $1 = (VTABLE_cmp(interp, $2, $3) > 0);
}
=item B<isge>(out INT, in INT, in INT)
@@ -779,7 +774,7 @@
=cut
inline op isge(out INT, invar PMC, invar PMC) {
- $1 = (VTABLE_cmp(interp, $2, $3) >= 0);
+ $1 = (VTABLE_cmp(interp, $2, $3) >= 0);
}
=item B<isle>(out INT, in INT, in INT)
@@ -795,19 +790,19 @@
=cut
inline op isle(out INT, in INT, in INT) {
- $1 = $2 <= $3;
+ $1 = $2 <= $3;
}
inline op isle(out INT, in NUM, in NUM) {
- $1 = $2 <= $3;
+ $1 = $2 <= $3;
}
inline op isle(out INT, in STR, in STR) {
- $1 = Parrot_str_compare(interp, $2, $3) <= 0;
+ $1 = Parrot_str_compare(interp, $2, $3) <= 0;
}
inline op isle(out INT, invar PMC, invar PMC) {
- $1 = (VTABLE_cmp(interp, $2, $3) <= 0);
+ $1 = (VTABLE_cmp(interp, $2, $3) <= 0);
}
=item B<islt>(out INT, in INT, in INT)
@@ -823,19 +818,19 @@
=cut
inline op islt(out INT, in INT, in INT) {
- $1 = ($2 < $3) ? 1 : 0;
+ $1 = ($2 < $3) ? 1 : 0;
}
inline op islt(out INT, in NUM, in NUM) {
- $1 = $2 < $3;
+ $1 = $2 < $3;
}
inline op islt(out INT, in STR, in STR) {
- $1 = Parrot_str_compare(interp, $2, $3) < 0;
+ $1 = Parrot_str_compare(interp, $2, $3) < 0;
}
inline op islt(out INT, invar PMC, invar PMC) {
- $1 = (VTABLE_cmp(interp, $2, $3) < 0);
+ $1 = (VTABLE_cmp(interp, $2, $3) < 0);
}
=item B<iseq>(out INT, in INT, in INT)
@@ -851,22 +846,22 @@
=cut
inline op iseq(out INT, in INT, in INT) {
- $1 = ($2 == $3) ? 1 : 0;
+ $1 = ($2 == $3) ? 1 : 0;
}
inline op iseq(out INT, in NUM, in NUM) {
- $1 = $2 == $3;
+ $1 = $2 == $3;
}
inline op iseq(out INT, in STR, in STR) {
- $1 = (Parrot_str_equal(interp, $2, $3) ? 1 : 0);
+ $1 = (Parrot_str_equal(interp, $2, $3) ? 1 : 0);
}
inline op iseq(out INT, invar PMC, invar PMC) {
- if (&$2 == &$3)
- $1 = 1;
- else
- $1 = VTABLE_is_equal(interp, $2, $3);
+ if (&$2 == &$3)
+ $1 = 1;
+ else
+ $1 = VTABLE_is_equal(interp, $2, $3);
}
=item B<isne>(out INT, in INT, in INT)
@@ -882,22 +877,22 @@
=cut
inline op isne(out INT, in INT, in INT) {
- $1 = ($2 == $3) ? 0 : 1;
+ $1 = ($2 == $3) ? 0 : 1;
}
inline op isne(out INT, in NUM, in NUM) {
- $1 = $2 != $3;
+ $1 = $2 != $3;
}
inline op isne(out INT, in STR, in STR) {
- $1 = (Parrot_str_not_equal(interp, $2, $3) ? 1 : 0);
+ $1 = (Parrot_str_not_equal(interp, $2, $3) ? 1 : 0);
}
inline op isne(out INT, invar PMC, invar PMC) {
- if (&$2 == &$3)
- $1 = 0;
- else
- $1 = !VTABLE_is_equal(interp, $2, $3);
+ if (&$2 == &$3)
+ $1 = 0;
+ else
+ $1 = !VTABLE_is_equal(interp, $2, $3);
}
=back
@@ -926,11 +921,11 @@
=cut
inline op and(out INT, in INT, in INT) :base_core {
- $1 = $2 ? $3 : $2;
+ $1 = $2 ? $3 : $2;
}
inline op and(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_logical_and(interp, $2, $3, $1);
+ $1 = VTABLE_logical_and(interp, $2, $3, $1);
}
########################################
@@ -948,19 +943,19 @@
=cut
inline op not(inout INT) :base_core {
- $1 = ! $1;
+ $1 = ! $1;
}
inline op not(out INT, in INT) :base_core {
- $1 = ! $2;
+ $1 = ! $2;
}
inline op not(invar PMC) :base_core {
- VTABLE_i_logical_not(interp, $1);
+ VTABLE_i_logical_not(interp, $1);
}
inline op not(out PMC, invar PMC) :base_core {
- $1 = VTABLE_logical_not(interp, $2, $1);
+ $1 = VTABLE_logical_not(interp, $2, $1);
}
########################################
@@ -974,11 +969,11 @@
=cut
inline op or(out INT, in INT, in INT) :base_core {
- $1 = $2 ? $2 : $3;
+ $1 = $2 ? $2 : $3;
}
inline op or(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_logical_or(interp, $2, $3, $1);
+ $1 = VTABLE_logical_or(interp, $2, $3, $1);
}
########################################
@@ -993,11 +988,11 @@
=cut
inline op xor(out INT, in INT, in INT) :base_core {
- $1 = ($2 && ! $3) ? $2 : ($3 && ! $2) ? $3 : 0;
+ $1 = ($2 && ! $3) ? $2 : ($3 && ! $2) ? $3 : 0;
}
inline op xor(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_logical_xor(interp, $2, $3, $1);
+ $1 = VTABLE_logical_xor(interp, $2, $3, $1);
}
=back
Modified: trunk/src/ops/core.ops
==============================================================================
--- trunk/src/ops/core.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/core.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -885,13 +885,13 @@
while (VTABLE_elements(interp, interp->dynamic_env)) {
PMC * const item = VTABLE_pop_pmc(interp, interp->dynamic_env);
if (item->vtable->base_type == enum_class_Integer
- && VTABLE_get_integer(interp, item) == $1) {
- found = 1;
- break;
+ && VTABLE_get_integer(interp, item) == $1) {
+ found = 1;
+ break;
}
else if (item->vtable->base_type == enum_class_Sub
- || item->vtable->base_type == enum_class_NCI)
+ || item->vtable->base_type == enum_class_NCI)
Parrot_pcc_invoke_sub_from_c_args(interp, item, "I->", 0);
}
if (!found)
@@ -1237,7 +1237,7 @@
=cut
op needs_destroy(invar PMC) {
- Parrot_gc_pmc_needs_early_collection(interp, $1);
+ Parrot_gc_pmc_needs_early_collection(interp, $1);
}
=back
Modified: trunk/src/ops/debug.ops
==============================================================================
--- trunk/src/ops/debug.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/debug.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -117,9 +117,9 @@
=cut
inline op getline(out INT) {
- Parrot_Context_info info;
- Parrot_Context_get_info(interp, CURRENT_CONTEXT(interp), &info);
- $1 = info.line;
+ Parrot_Context_info info;
+ Parrot_Context_get_info(interp, CURRENT_CONTEXT(interp), &info);
+ $1 = info.line;
}
=item B<getfile>(out STR)
@@ -129,9 +129,9 @@
=cut
inline op getfile(out STR) {
- Parrot_Context_info info;
- Parrot_Context_get_info(interp, CURRENT_CONTEXT(interp), &info);
- $1 = info.file;
+ Parrot_Context_info info;
+ Parrot_Context_get_info(interp, CURRENT_CONTEXT(interp), &info);
+ $1 = info.file;
}
=back
Modified: trunk/src/ops/io.ops
==============================================================================
--- trunk/src/ops/io.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/io.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -40,7 +40,7 @@
=cut
inline op close(invar PMC) :base_io {
- Parrot_io_close(interp, $1);
+ Parrot_io_close(interp, $1);
}
########################################
@@ -75,15 +75,15 @@
=cut
inline op getstdin(out PMC) :base_io {
- $1 = _PIO_STDIN(interp);
+ $1 = _PIO_STDIN(interp);
}
inline op getstdout(out PMC) :base_io {
- $1 = _PIO_STDOUT(interp);
+ $1 = _PIO_STDOUT(interp);
}
inline op getstderr(out PMC) :base_io {
- $1 = _PIO_STDERR(interp);
+ $1 = _PIO_STDERR(interp);
}
#########################################
@@ -106,15 +106,15 @@
=cut
inline op setstdin(invar PMC) :base_io {
- _PIO_STDIN(interp) = $1;
+ _PIO_STDIN(interp) = $1;
}
inline op setstdout(invar PMC) :base_io {
- _PIO_STDOUT(interp) = $1;
+ _PIO_STDOUT(interp) = $1;
}
inline op setstderr(invar PMC) :base_io {
- _PIO_STDERR(interp) = $1;
+ _PIO_STDERR(interp) = $1;
}
#########################################
@@ -177,34 +177,34 @@
=cut
inline op print(in INT) :base_io {
- Parrot_io_printf(interp, INTVAL_FMT, (INTVAL)$1);
+ Parrot_io_printf(interp, INTVAL_FMT, (INTVAL)$1);
}
inline op print(in NUM) :base_io {
#ifdef PARROT_HAS_NEGATIVE_ZERO
- Parrot_io_printf(interp, FLOATVAL_FMT, $1);
-#else
- /* Workaround for older msvcrt and openbsd. TT #313 */
- if (Parrot_is_nzero($1)) {
- Parrot_io_printf(interp, "-0");
- }
- else {
Parrot_io_printf(interp, FLOATVAL_FMT, $1);
- }
+#else
+ /* Workaround for older msvcrt and openbsd. TT #313 */
+ if (Parrot_is_nzero($1)) {
+ Parrot_io_printf(interp, "-0");
+ }
+ else {
+ Parrot_io_printf(interp, FLOATVAL_FMT, $1);
+ }
#endif
}
op print(in STR) :base_io {
- STRING * const s = $1;
- if (s && Parrot_str_byte_length(interp, s))
- Parrot_io_putps(interp, _PIO_STDOUT(interp), s);
+ STRING * const s = $1;
+ if (s && Parrot_str_byte_length(interp, s))
+ Parrot_io_putps(interp, _PIO_STDOUT(interp), s);
}
op print(invar PMC) :base_io {
- PMC * const p = $1;
- STRING * const s = (VTABLE_get_string(interp, p));
- if (s)
- Parrot_io_putps(interp, _PIO_STDOUT(interp), s);
+ PMC * const p = $1;
+ STRING * const s = (VTABLE_get_string(interp, p));
+ if (s)
+ Parrot_io_putps(interp, _PIO_STDOUT(interp), s);
}
=item B<say>(in INT)
@@ -220,28 +220,28 @@
=cut
inline op say(in INT) :base_io {
- Parrot_io_printf(interp, INTVAL_FMT "\n", (INTVAL)$1);
+ Parrot_io_printf(interp, INTVAL_FMT "\n", (INTVAL)$1);
}
inline op say(in NUM) :base_io {
#ifdef PARROT_HAS_NEGATIVE_ZERO
- Parrot_io_printf(interp, FLOATVAL_FMT "\n", $1);
+ Parrot_io_printf(interp, FLOATVAL_FMT "\n", $1);
#else
- /* Workaround for older msvcrt and openbsd. TT #313 */
- if (Parrot_is_nzero($1)) {
- Parrot_io_printf(interp, "-0\n");
- }
- else {
- Parrot_io_printf(interp, FLOATVAL_FMT "\n", $1);
- }
+ /* Workaround for older msvcrt and openbsd. TT #313 */
+ if (Parrot_is_nzero($1)) {
+ Parrot_io_printf(interp, "-0\n");
+ }
+ else {
+ Parrot_io_printf(interp, FLOATVAL_FMT "\n", $1);
+ }
#endif
}
op say(in STR) :base_io {
- STRING * const s = $1;
- if (s && Parrot_str_byte_length(interp, s))
- Parrot_io_putps(interp, _PIO_STDOUT(interp), s);
- Parrot_io_putps(interp, _PIO_STDOUT(interp), Parrot_str_new_constant(interp, "\n"));
+ STRING * const s = $1;
+ if (s && Parrot_str_byte_length(interp, s))
+ Parrot_io_putps(interp, _PIO_STDOUT(interp), s);
+ Parrot_io_putps(interp, _PIO_STDOUT(interp), Parrot_str_new_constant(interp, "\n"));
}
op say(invar PMC) :base_io {
@@ -279,24 +279,24 @@
=cut
op printerr(in INT) :base_io {
- Parrot_io_eprintf(interp, INTVAL_FMT, $1);
+ Parrot_io_eprintf(interp, INTVAL_FMT, $1);
}
op printerr(in NUM) :base_io {
- Parrot_io_eprintf(interp, FLOATVAL_FMT, $1);
+ Parrot_io_eprintf(interp, FLOATVAL_FMT, $1);
}
op printerr(in STR) :base_io {
- STRING * const s = $1;
- if (s && Parrot_str_byte_length(interp, s))
- Parrot_io_putps(interp, _PIO_STDERR(interp), s);
+ STRING * const s = $1;
+ if (s && Parrot_str_byte_length(interp, s))
+ Parrot_io_putps(interp, _PIO_STDERR(interp), s);
}
op printerr(invar PMC) :base_io {
- PMC * const p = $1;
- STRING * const s = (VTABLE_get_string(interp, p));
- if (s)
- Parrot_io_putps(interp, _PIO_STDERR(interp), s);
+ PMC * const p = $1;
+ STRING * const s = (VTABLE_get_string(interp, p));
+ if (s)
+ Parrot_io_putps(interp, _PIO_STDERR(interp), s);
}
##########################################
@@ -314,30 +314,30 @@
=cut
op print(invar PMC, in INT) :base_io {
- if ($1) {
- STRING * const s = Parrot_str_from_int(interp, $2);
- Parrot_io_putps(interp, $1, s);
- }
+ if ($1) {
+ STRING * const s = Parrot_str_from_int(interp, $2);
+ Parrot_io_putps(interp, $1, s);
+ }
}
op print(invar PMC, in NUM) :base_io {
- if ($1) {
- STRING * const s = Parrot_sprintf_c(interp, FLOATVAL_FMT, $2);
- Parrot_io_putps(interp, $1, s);
- }
+ if ($1) {
+ STRING * const s = Parrot_sprintf_c(interp, FLOATVAL_FMT, $2);
+ Parrot_io_putps(interp, $1, s);
+ }
}
op print(invar PMC, in STR) :base_io {
- if ($2 && $1) {
- Parrot_io_putps(interp, $1, $2);
- }
+ if ($2 && $1) {
+ Parrot_io_putps(interp, $1, $2);
+ }
}
op print(invar PMC, invar PMC) :base_io {
- if ($2 && $1) {
- STRING * const s = VTABLE_get_string(interp, $2);
- Parrot_io_putps(interp, $1, s);
- }
+ if ($2 && $1) {
+ STRING * const s = VTABLE_get_string(interp, $2);
+ Parrot_io_putps(interp, $1, s);
+ }
}
##########################################
@@ -353,11 +353,11 @@
=cut
op read(out STR, in INT) :base_io {
- $1 = Parrot_io_reads(interp, _PIO_STDIN(interp), (size_t)$2);
+ $1 = Parrot_io_reads(interp, _PIO_STDIN(interp), (size_t)$2);
}
op read(out STR, invar PMC, in INT) :base_io {
- $1 = Parrot_io_reads(interp, $2, (size_t)$3);
+ $1 = Parrot_io_reads(interp, $2, (size_t)$3);
}
=item B<readline>(out STR, invar PMC)
@@ -386,21 +386,21 @@
=cut
op peek(out STR) :base_io {
- STRING ** const s = &$1;
+ STRING ** const s = &$1;
- *s = NULL;
- if (Parrot_io_peek(interp, _PIO_STDIN(interp), s) < 0) {
- $1 = Parrot_str_new_noinit(interp, enum_stringrep_one, 0);
- }
+ *s = NULL;
+ if (Parrot_io_peek(interp, _PIO_STDIN(interp), s) < 0) {
+ $1 = Parrot_str_new_noinit(interp, enum_stringrep_one, 0);
+ }
}
op peek(out STR, invar PMC) :base_io {
- STRING ** const s = &$1;
+ STRING ** const s = &$1;
- *s = NULL;
- if (Parrot_io_peek(interp, $2, s) < 0) {
- $1 = Parrot_str_new_noinit(interp, enum_stringrep_one, 0);
- }
+ *s = NULL;
+ if (Parrot_io_peek(interp, $2, s) < 0) {
+ $1 = Parrot_str_new_noinit(interp, enum_stringrep_one, 0);
+ }
}
##########################################
@@ -428,11 +428,11 @@
=cut
op stat(out INT, in STR, in INT) {
- $1 = Parrot_stat_info_intval(interp, $2, $3);
+ $1 = Parrot_stat_info_intval(interp, $2, $3);
}
op stat(out INT, in INT, in INT) {
- $1 = Parrot_fstat_info_intval(interp, $2, $3);
+ $1 = Parrot_fstat_info_intval(interp, $2, $3);
}
@@ -499,17 +499,17 @@
=cut
op tell(out INT, invar PMC) :base_io {
- if ($2)
- $1 = (INTVAL)Parrot_io_tell(interp, $2);
+ if ($2)
+ $1 = (INTVAL)Parrot_io_tell(interp, $2);
}
op tell(out INT, out INT, invar PMC) :base_io {
- if ($3) {
- PIOOFF_T pos;
- pos = Parrot_io_tell(interp, $3);
- $1 = (INTVAL)(pos >> 31);
- $2 = (INTVAL)(pos & 0xffffffff);
- }
+ if ($3) {
+ PIOOFF_T pos;
+ pos = Parrot_io_tell(interp, $3);
+ $1 = (INTVAL)(pos >> 31);
+ $2 = (INTVAL)(pos & 0xffffffff);
+ }
}
=back
Modified: trunk/src/ops/math.ops
==============================================================================
--- trunk/src/ops/math.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/math.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -44,33 +44,33 @@
=cut
inline op abs(inout INT) :base_core {
- $1 = abs($1);
+ $1 = abs($1);
}
inline op abs(inout NUM) :base_core {
- $1 = fabs($1);
+ $1 = fabs($1);
}
inline op abs(out INT, in INT) :base_core {
- if ($2 < 0)
- $1 = - (INTVAL)$2;
- else
- $1 = (INTVAL)$2;
+ if ($2 < 0)
+ $1 = - (INTVAL)$2;
+ else
+ $1 = (INTVAL)$2;
}
inline op abs(out NUM, in NUM) :base_core {
- if ($2 < 0)
- $1 = - (FLOATVAL)$2;
- else
- $1 = (FLOATVAL)$2;
+ if ($2 < 0)
+ $1 = - (FLOATVAL)$2;
+ else
+ $1 = (FLOATVAL)$2;
}
inline op abs(invar PMC) :base_core {
- VTABLE_i_absolute(interp, $1);
+ VTABLE_i_absolute(interp, $1);
}
inline op abs(out PMC, invar PMC) :base_core {
- $1 = VTABLE_absolute(interp, $2, $1);
+ $1 = VTABLE_absolute(interp, $2, $1);
}
########################################
@@ -102,43 +102,43 @@
=cut
inline op add(inout INT, in INT) :base_core {
- $1 += $2;
+ $1 += $2;
}
inline op add(inout NUM, in NUM) :base_core {
- $1 += $2;
+ $1 += $2;
}
inline op add(invar PMC, invar PMC) :base_core {
- VTABLE_i_add(interp, $1, $2);
+ VTABLE_i_add(interp, $1, $2);
}
inline op add(invar PMC, in INT) :base_core {
- VTABLE_i_add_int(interp, $1, $2);
+ VTABLE_i_add_int(interp, $1, $2);
}
inline op add(invar PMC, in NUM) :base_core {
- VTABLE_i_add_float(interp, $1, $2);
+ VTABLE_i_add_float(interp, $1, $2);
}
inline op add(out INT, in INT, in INT) :base_core {
- $1 = $2 + $3;
+ $1 = $2 + $3;
}
inline op add(out NUM, in NUM, in NUM) :base_core {
- $1 = $2 + $3;
+ $1 = $2 + $3;
}
inline op add(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_add(interp, $2, $3, $1);
+ $1 = VTABLE_add(interp, $2, $3, $1);
}
inline op add(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_add_int(interp, $2, $3, $1);
+ $1 = VTABLE_add_int(interp, $2, $3, $1);
}
inline op add(invar PMC, invar PMC, in NUM) :base_core {
- $1 = VTABLE_add_float(interp, $2, $3, $1);
+ $1 = VTABLE_add_float(interp, $2, $3, $1);
}
########################################
@@ -183,47 +183,47 @@
=cut
inline op cmod(out INT, in INT, in INT) :base_core {
- INTVAL den = $3;
- if ($3 == 0) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
- $1 = $2 % den;
+ INTVAL den = $3;
+ if ($3 == 0) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
+ $1 = $2 % den;
}
inline op cmod(invar PMC, invar PMC, in INT) :base_core {
- INTVAL result;
+ INTVAL result;
- if ($3 == 0) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
+ if ($3 == 0) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
- result = VTABLE_get_integer(interp, $2) % $3;
+ result = VTABLE_get_integer(interp, $2) % $3;
- $1 = pmc_new(interp, VTABLE_type(interp, $2));
- VTABLE_set_integer_native(interp, $1, result);
+ $1 = pmc_new(interp, VTABLE_type(interp, $2));
+ VTABLE_set_integer_native(interp, $1, result);
}
inline op cmod(invar PMC, invar PMC, invar PMC) :base_core {
- INTVAL result;
- INTVAL value = VTABLE_get_integer(interp, $3);
+ INTVAL result;
+ INTVAL value = VTABLE_get_integer(interp, $3);
- if (value == 0) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
+ if (value == 0) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
- result = VTABLE_get_integer(interp, $2) % value;
+ result = VTABLE_get_integer(interp, $2) % value;
- $1 = pmc_new(interp, VTABLE_type(interp, $2));
- VTABLE_set_integer_native(interp, $1, result);
+ $1 = pmc_new(interp, VTABLE_type(interp, $2));
+ VTABLE_set_integer_native(interp, $1, result);
}
########################################
@@ -260,31 +260,31 @@
=cut
inline op cmod(out NUM, in NUM, in NUM) :base_core {
- FLOATVAL den = $3;
- if (FLOAT_IS_ZERO($3)) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
- $1 = fmod($2, den);
+ FLOATVAL den = $3;
+ if (FLOAT_IS_ZERO($3)) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
+ $1 = fmod($2, den);
}
inline op cmod(invar PMC, invar PMC, in NUM) :base_core {
- FLOATVAL result;
- FLOATVAL value = $3;
+ FLOATVAL result;
+ FLOATVAL value = $3;
- if (FLOAT_IS_ZERO(value)) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
+ if (FLOAT_IS_ZERO(value)) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
- result = fmod(VTABLE_get_integer(interp, $2), value);
+ result = fmod(VTABLE_get_integer(interp, $2), value);
- $1 = pmc_new(interp, VTABLE_type(interp, $2));
- VTABLE_set_integer_native(interp, $1, (INTVAL) result);
+ $1 = pmc_new(interp, VTABLE_type(interp, $2));
+ VTABLE_set_integer_native(interp, $1, (INTVAL) result);
}
########################################
@@ -300,15 +300,15 @@
=cut
inline op dec(inout INT) :base_core {
- $1--;
+ $1--;
}
inline op dec(inout NUM) :base_core {
- $1--;
+ $1--;
}
inline op dec(invar PMC) :base_core {
- VTABLE_decrement(interp, $1);
+ VTABLE_decrement(interp, $1);
}
########################################
@@ -342,70 +342,70 @@
=cut
inline op div(inout INT, in INT) :base_core {
- INTVAL den = $2;
- if (den == 0) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
- $1 /= den;
+ INTVAL den = $2;
+ if (den == 0) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
+ $1 /= den;
}
inline op div(inout NUM, in NUM) :base_core {
- FLOATVAL den = $2;
- if (FLOAT_IS_ZERO(den)) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
- $1 /= den;
+ FLOATVAL den = $2;
+ if (FLOAT_IS_ZERO(den)) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
+ $1 /= den;
}
inline op div(invar PMC, invar PMC) :base_core {
- VTABLE_i_divide(interp, $1, $2);
+ VTABLE_i_divide(interp, $1, $2);
}
inline op div(invar PMC, in INT) :base_core {
- VTABLE_i_divide_int(interp, $1, $2);
+ VTABLE_i_divide_int(interp, $1, $2);
}
inline op div(invar PMC, in NUM) :base_core {
- VTABLE_i_divide_float(interp, $1, $2);
+ VTABLE_i_divide_float(interp, $1, $2);
}
inline op div(out INT, in INT, in INT) :base_core {
- INTVAL den = $3;
- if (den == 0) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
- $1 = $2 / den;
+ INTVAL den = $3;
+ if (den == 0) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
+ $1 = $2 / den;
}
inline op div(out NUM, in NUM, in NUM) :base_core {
- FLOATVAL den = $3;
- if (FLOAT_IS_ZERO(den)) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
- $1 = $2 / den;
+ FLOATVAL den = $3;
+ if (FLOAT_IS_ZERO(den)) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
+ $1 = $2 / den;
}
inline op div(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_divide(interp, $2, $3, $1);
+ $1 = VTABLE_divide(interp, $2, $3, $1);
}
inline op div(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_divide_int(interp, $2, $3, $1);
+ $1 = VTABLE_divide_int(interp, $2, $3, $1);
}
inline op div(invar PMC, invar PMC, in NUM) :base_core {
- $1 = VTABLE_divide_float(interp, $2, $3, $1);
+ $1 = VTABLE_divide_float(interp, $2, $3, $1);
}
@@ -438,79 +438,79 @@
=cut
inline op fdiv(inout INT, in INT) :base_core {
- INTVAL den = $2;
- FLOATVAL f;
+ INTVAL den = $2;
+ FLOATVAL f;
- if (den == 0) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
+ if (den == 0) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
- f = floor($1 / den);
- $1 = (INTVAL)f;
+ f = floor($1 / den);
+ $1 = (INTVAL)f;
}
inline op fdiv(inout NUM, in NUM) :base_core {
- FLOATVAL den = $2;
- if (FLOAT_IS_ZERO(den)) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
- $1 = floor($1 / den);
+ FLOATVAL den = $2;
+ if (FLOAT_IS_ZERO(den)) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
+ $1 = floor($1 / den);
}
inline op fdiv(invar PMC, invar PMC) :base_core {
- VTABLE_i_floor_divide(interp, $1, $2);
+ VTABLE_i_floor_divide(interp, $1, $2);
}
inline op fdiv(invar PMC, in INT) :base_core {
- VTABLE_i_floor_divide_int(interp, $1, $2);
+ VTABLE_i_floor_divide_int(interp, $1, $2);
}
inline op fdiv(invar PMC, in NUM) :base_core {
- VTABLE_i_floor_divide_float(interp, $1, $2);
+ VTABLE_i_floor_divide_float(interp, $1, $2);
}
inline op fdiv(out INT, in INT, in INT) :base_core {
- INTVAL den = $3;
- FLOATVAL f;
+ INTVAL den = $3;
+ FLOATVAL f;
- if (den == 0) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
+ if (den == 0) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
- f = floor($2 / den);
- $1 = (INTVAL)f;
+ f = floor($2 / den);
+ $1 = (INTVAL)f;
}
inline op fdiv(out NUM, in NUM, in NUM) :base_core {
- FLOATVAL den = $3;
- if (FLOAT_IS_ZERO(den)) {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
- EXCEPTION_DIV_BY_ZERO,
- "Divide by zero");
- goto ADDRESS(handler);
- }
- $1 = floor($2 / den);
+ FLOATVAL den = $3;
+ if (FLOAT_IS_ZERO(den)) {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, expr NEXT(),
+ EXCEPTION_DIV_BY_ZERO,
+ "Divide by zero");
+ goto ADDRESS(handler);
+ }
+ $1 = floor($2 / den);
}
inline op fdiv(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_floor_divide(interp, $2, $3, $1);
+ $1 = VTABLE_floor_divide(interp, $2, $3, $1);
}
inline op fdiv(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_floor_divide_int(interp, $2, $3, $1);
+ $1 = VTABLE_floor_divide_int(interp, $2, $3, $1);
}
inline op fdiv(invar PMC, invar PMC, in NUM) :base_core {
- $1 = VTABLE_floor_divide_float(interp, $2, $3, $1);
+ $1 = VTABLE_floor_divide_float(interp, $2, $3, $1);
}
########################################
@@ -528,16 +528,16 @@
=cut
inline op ceil(inout NUM) :base_core {
- $1 = ceil($1);
+ $1 = ceil($1);
}
inline op ceil(out INT, in NUM) :base_core {
- FLOATVAL f = ceil($2);
- $1 = (INTVAL)f;
+ FLOATVAL f = ceil($2);
+ $1 = (INTVAL)f;
}
inline op ceil(out NUM, in NUM) :base_core {
- $1 = ceil($2);
+ $1 = ceil($2);
}
########################################
@@ -555,16 +555,16 @@
=cut
inline op floor(inout NUM) :base_core {
- $1 = floor($1);
+ $1 = floor($1);
}
inline op floor(out INT, in NUM) :base_core {
- FLOATVAL f = floor($2);
- $1 = (INTVAL)f;
+ FLOATVAL f = floor($2);
+ $1 = (INTVAL)f;
}
inline op floor(out NUM, in NUM) :base_core {
- $1 = floor($2);
+ $1 = floor($2);
}
########################################
@@ -580,15 +580,15 @@
=cut
inline op inc(inout INT) :base_core {
- $1++;
+ $1++;
}
inline op inc(inout NUM) :base_core {
- $1++;
+ $1++;
}
inline op inc(invar PMC) :base_core {
- VTABLE_increment(interp, $1);
+ VTABLE_increment(interp, $1);
}
@@ -640,43 +640,43 @@
=cut
op mod(inout INT, in INT) :base_core {
- $1 = intval_mod($1, $2);
+ $1 = intval_mod($1, $2);
}
op mod(inout NUM, in NUM) :base_core {
- $1 = floatval_mod($1, $2);
+ $1 = floatval_mod($1, $2);
}
inline op mod(invar PMC, invar PMC) :base_core {
- VTABLE_i_modulus(interp, $1, $2);
+ VTABLE_i_modulus(interp, $1, $2);
}
inline op mod(invar PMC, in INT) :base_core {
- VTABLE_i_modulus_int(interp, $1, $2);
+ VTABLE_i_modulus_int(interp, $1, $2);
}
inline op mod(invar PMC, in NUM) :base_core {
- VTABLE_i_modulus_float(interp, $1, $2);
+ VTABLE_i_modulus_float(interp, $1, $2);
}
op mod(out INT, in INT, in INT) :base_core {
- $1 = intval_mod($2, $3);
+ $1 = intval_mod($2, $3);
}
op mod(out NUM, in NUM, in NUM) :base_core {
- $1 = floatval_mod($2, $3);
+ $1 = floatval_mod($2, $3);
}
inline op mod(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_modulus(interp, $2, $3, $1);
+ $1 = VTABLE_modulus(interp, $2, $3, $1);
}
inline op mod(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_modulus_int(interp, $2, $3, $1);
+ $1 = VTABLE_modulus_int(interp, $2, $3, $1);
}
inline op mod(invar PMC, invar PMC, in NUM) :base_core {
- $1 = VTABLE_modulus_float(interp, $2, $3, $1);
+ $1 = VTABLE_modulus_float(interp, $2, $3, $1);
}
########################################
@@ -708,43 +708,43 @@
=cut
inline op mul(inout INT, in INT) :base_core {
- $1 *= $2;
+ $1 *= $2;
}
inline op mul(inout NUM, in NUM) :base_core {
- $1 *= $2;
+ $1 *= $2;
}
inline op mul(invar PMC, invar PMC) :base_core {
- VTABLE_i_multiply(interp, $1, $2);
+ VTABLE_i_multiply(interp, $1, $2);
}
inline op mul(invar PMC, in INT) :base_core {
- VTABLE_i_multiply_int(interp, $1, $2);
+ VTABLE_i_multiply_int(interp, $1, $2);
}
inline op mul(invar PMC, in NUM) :base_core {
- VTABLE_i_multiply_float(interp, $1, $2);
+ VTABLE_i_multiply_float(interp, $1, $2);
}
inline op mul(out INT, in INT, in INT) :base_core {
- $1 = $2 * $3;
+ $1 = $2 * $3;
}
inline op mul(out NUM, in NUM, in NUM) :base_core {
- $1 = $2 * $3;
+ $1 = $2 * $3;
}
inline op mul(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_multiply(interp, $2, $3, $1);
+ $1 = VTABLE_multiply(interp, $2, $3, $1);
}
inline op mul(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_multiply_int(interp, $2, $3, $1);
+ $1 = VTABLE_multiply_int(interp, $2, $3, $1);
}
inline op mul(invar PMC, invar PMC, in NUM) :base_core {
- $1 = VTABLE_multiply_float(interp, $2, $3, $1);
+ $1 = VTABLE_multiply_float(interp, $2, $3, $1);
}
########################################
@@ -768,27 +768,27 @@
=cut
inline op neg(inout INT) :base_core {
- $1 = - $1;
+ $1 = - $1;
}
inline op neg(inout NUM) :base_core {
- $1 = - $1;
+ $1 = - $1;
}
inline op neg(invar PMC) :base_core {
- VTABLE_i_neg(interp, $1);
+ VTABLE_i_neg(interp, $1);
}
inline op neg(out INT, in INT) :base_core {
- $1 = - $2;
+ $1 = - $2;
}
inline op neg(out NUM, in NUM) :base_core {
- $1 = - $2;
+ $1 = - $2;
}
inline op neg(out PMC, invar PMC) :base_core {
- $1 = VTABLE_neg(interp, $2, $1);
+ $1 = VTABLE_neg(interp, $2, $1);
}
########################################
@@ -808,19 +808,19 @@
=cut
inline op pow(out NUM, in NUM, in NUM) :base_core {
- $1 = pow((FLOATVAL)$2, (FLOATVAL)$3);
+ $1 = pow((FLOATVAL)$2, (FLOATVAL)$3);
}
inline op pow(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_pow(interp, $2, $3, $1);
+ $1 = VTABLE_pow(interp, $2, $3, $1);
}
inline op pow(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_pow_int(interp, $2, $3, $1);
+ $1 = VTABLE_pow_int(interp, $2, $3, $1);
}
inline op pow(invar PMC, invar PMC, in NUM) :base_core {
- $1 = VTABLE_pow_float(interp, $2, $3, $1);
+ $1 = VTABLE_pow_float(interp, $2, $3, $1);
}
inline op pow(out NUM, in NUM, in INT) :base_core {
@@ -876,43 +876,43 @@
=cut
inline op sub(inout INT, in INT) :base_core {
- $1 -= $2;
+ $1 -= $2;
}
inline op sub(inout NUM, in NUM) :base_core {
- $1 -= $2;
+ $1 -= $2;
}
inline op sub(invar PMC, invar PMC) :base_core {
- VTABLE_i_subtract(interp, $1, $2);
+ VTABLE_i_subtract(interp, $1, $2);
}
inline op sub(invar PMC, in INT) :base_core {
- VTABLE_i_subtract_int(interp, $1, $2);
+ VTABLE_i_subtract_int(interp, $1, $2);
}
inline op sub(invar PMC, in NUM) :base_core {
- VTABLE_i_subtract_float(interp, $1, $2);
+ VTABLE_i_subtract_float(interp, $1, $2);
}
inline op sub(out INT, in INT, in INT) :base_core {
- $1 = $2 - $3;
+ $1 = $2 - $3;
}
inline op sub(out NUM, in NUM, in NUM) :base_core {
- $1 = $2 - $3;
+ $1 = $2 - $3;
}
inline op sub(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_subtract(interp, $2, $3, $1);
+ $1 = VTABLE_subtract(interp, $2, $3, $1);
}
inline op sub(invar PMC, invar PMC, in INT) :base_core {
- $1 = VTABLE_subtract_int(interp, $2, $3, $1);
+ $1 = VTABLE_subtract_int(interp, $2, $3, $1);
}
inline op sub(invar PMC, invar PMC, in NUM) :base_core {
- $1 = VTABLE_subtract_float(interp, $2, $3, $1);
+ $1 = VTABLE_subtract_float(interp, $2, $3, $1);
}
########################################
@@ -924,7 +924,7 @@
=cut
inline op sqrt(out NUM, in NUM) :base_core {
- $1 = sqrt((FLOATVAL)$2);
+ $1 = sqrt((FLOATVAL)$2);
}
=back
@@ -953,7 +953,7 @@
=cut
inline op acos(out NUM, in NUM) :base_math {
- $1 = acos((FLOATVAL)$2);
+ $1 = acos((FLOATVAL)$2);
}
########################################
@@ -965,7 +965,7 @@
=cut
inline op asec(out NUM, in NUM) :base_math {
- $1 = acos(((FLOATVAL)1) / ((FLOATVAL)$2));
+ $1 = acos(((FLOATVAL)1) / ((FLOATVAL)$2));
}
########################################
@@ -978,7 +978,7 @@
=cut
inline op asin(out NUM, in NUM) :base_math {
- $1 = asin((FLOATVAL)$2);
+ $1 = asin((FLOATVAL)$2);
}
########################################
@@ -996,11 +996,11 @@
=cut
inline op atan(out NUM, in NUM) :base_math {
- $1 = atan((FLOATVAL)$2);
+ $1 = atan((FLOATVAL)$2);
}
inline op atan(out NUM, in NUM, in NUM) :base_math {
- $1 = atan2((FLOATVAL)$2, (FLOATVAL)$3);
+ $1 = atan2((FLOATVAL)$2, (FLOATVAL)$3);
}
########################################
@@ -1012,7 +1012,7 @@
=cut
inline op cos(out NUM, in NUM) :base_math {
- $1 = cos((FLOATVAL)$2);
+ $1 = cos((FLOATVAL)$2);
}
########################################
@@ -1024,7 +1024,7 @@
=cut
inline op cosh(out NUM, in NUM) :base_math {
- $1 = cosh((FLOATVAL)$2);
+ $1 = cosh((FLOATVAL)$2);
}
########################################
@@ -1037,7 +1037,7 @@
=cut
inline op exp(out NUM, in NUM) :base_math {
- $1 = exp((FLOATVAL)$2);
+ $1 = exp((FLOATVAL)$2);
}
########################################
@@ -1049,7 +1049,7 @@
=cut
inline op ln(out NUM, in NUM) :base_math {
- $1 = log((FLOATVAL)$2);
+ $1 = log((FLOATVAL)$2);
}
########################################
@@ -1061,7 +1061,7 @@
=cut
inline op log10(out NUM, in NUM) :base_math {
- $1 = log10((FLOATVAL)$2);
+ $1 = log10((FLOATVAL)$2);
}
########################################
@@ -1073,8 +1073,8 @@
=cut
op log2(out NUM, in NUM) :base_math {
- FLOATVAL temp = log((FLOATVAL)2.0);
- $1 = log((FLOATVAL)$2) / temp;
+ FLOATVAL temp = log((FLOATVAL)2.0);
+ $1 = log((FLOATVAL)$2) / temp;
}
########################################
@@ -1086,7 +1086,7 @@
=cut
inline op sec(out NUM, in NUM) :base_math {
- $1 = ((FLOATVAL)1) / cos((FLOATVAL)$2);
+ $1 = ((FLOATVAL)1) / cos((FLOATVAL)$2);
}
########################################
@@ -1098,7 +1098,7 @@
=cut
inline op sech(out NUM, in NUM) :base_math {
- $1 = ((FLOATVAL)1) / cosh((FLOATVAL)$2);
+ $1 = ((FLOATVAL)1) / cosh((FLOATVAL)$2);
}
########################################
@@ -1110,7 +1110,7 @@
=cut
inline op sin(out NUM, in NUM) :base_math {
- $1 = sin((FLOATVAL)$2);
+ $1 = sin((FLOATVAL)$2);
}
########################################
@@ -1122,7 +1122,7 @@
=cut
inline op sinh(out NUM, in NUM) :base_math {
- $1 = sinh((FLOATVAL)$2);
+ $1 = sinh((FLOATVAL)$2);
}
########################################
@@ -1134,7 +1134,7 @@
=cut
inline op tan(out NUM, in NUM) :base_math {
- $1 = tan((FLOATVAL)$2);
+ $1 = tan((FLOATVAL)$2);
}
########################################
@@ -1146,7 +1146,7 @@
=cut
inline op tanh(out NUM, in NUM) :base_math {
- $1 = tanh((FLOATVAL)$2);
+ $1 = tanh((FLOATVAL)$2);
}
=back
@@ -1172,27 +1172,27 @@
=cut
inline op gcd(out INT, in INT, in INT) :advanced_math {
- INTVAL p = 0;
- INTVAL a = $2 < 0 ? -$2 : $2;
- INTVAL b = $3 < 0 ? -$3 : $3;
-
- if (a==0) { $1=b; goto NEXT(); }
- if (b==0) { $1=a; goto NEXT(); }
-
- while (!((a | b) & 1)) {
- a>>=1;
- b>>=1;
- p++;
- }
-
- while (a>0) {
- if (!(a & 1)) a>>=1;
- else if (!(b & 1)) b>>=1;
- else if (a<b) b = (b-a)>>1;
- else a = (a-b)>>1;
- }
+ INTVAL p = 0;
+ INTVAL a = $2 < 0 ? -$2 : $2;
+ INTVAL b = $3 < 0 ? -$3 : $3;
+
+ if (a==0) { $1=b; goto NEXT(); }
+ if (b==0) { $1=a; goto NEXT(); }
+
+ while (!((a | b) & 1)) {
+ a>>=1;
+ b>>=1;
+ p++;
+ }
- $1 = b<<p;
+ while (a>0) {
+ if (!(a & 1)) a>>=1;
+ else if (!(b & 1)) b>>=1;
+ else if (a<b) b = (b-a)>>1;
+ else a = (a-b)>>1;
+ }
+
+ $1 = b<<p;
}
@@ -1205,30 +1205,30 @@
=cut
inline op lcm(out INT, in INT, in INT) :advanced_math {
- INTVAL gcd = 0;
- INTVAL p = 0;
- INTVAL a = $2 < 0 ? -$2 : $2;
- INTVAL b = $3 < 0 ? -$3 : $3;
- INTVAL saved_var1 = a, saved_var2 = b;
-
- if (a==0 || b==0) { $1=0; goto NEXT(); }
-
- while (!((a | b) & 1)) {
- a>>=1;
- b>>=1;
- p++;
- }
-
- while (a>0) {
- if (!(a & 1)) a>>=1;
- else if (!(b & 1)) b>>=1;
- else if (a<b) b = (b-a)>>1;
- else a = (a-b)>>1;
- }
-
- gcd = b<<p;
- saved_var1 /= gcd;
- $1 = saved_var1*saved_var2;
+ INTVAL gcd = 0;
+ INTVAL p = 0;
+ INTVAL a = $2 < 0 ? -$2 : $2;
+ INTVAL b = $3 < 0 ? -$3 : $3;
+ INTVAL saved_var1 = a, saved_var2 = b;
+
+ if (a==0 || b==0) { $1=0; goto NEXT(); }
+
+ while (!((a | b) & 1)) {
+ a>>=1;
+ b>>=1;
+ p++;
+ }
+
+ while (a>0) {
+ if (!(a & 1)) a>>=1;
+ else if (!(b & 1)) b>>=1;
+ else if (a<b) b = (b-a)>>1;
+ else a = (a-b)>>1;
+ }
+
+ gcd = b<<p;
+ saved_var1 /= gcd;
+ $1 = saved_var1*saved_var2;
}
########################################
@@ -1242,27 +1242,27 @@
=cut
inline op fact(out INT, in INT) :advanced_math {
- /* Coercing a negative to a UINT can get pretty ugly
- * in this situation. */
- INTVAL i = $2;
- UINTVAL q = 1;
- while (i>0) {
- q = q*i;
- i--;
- }
- $1 = q;
+ /* Coercing a negative to a UINT can get pretty ugly
+ * in this situation. */
+ INTVAL i = $2;
+ UINTVAL q = 1;
+ while (i>0) {
+ q = q*i;
+ i--;
+ }
+ $1 = q;
}
inline op fact(out NUM, in INT) :advanced_math {
- /* Coercing a negative to a UINT can get pretty ugly
- * in this situation. */
- INTVAL i = $2;
- FLOATVAL q = 1;
- while (i>0) {
- q = q*i;
- i--;
- }
- $1 = q;
+ /* Coercing a negative to a UINT can get pretty ugly
+ * in this situation. */
+ INTVAL i = $2;
+ FLOATVAL q = 1;
+ while (i>0) {
+ q = q*i;
+ i--;
+ }
+ $1 = q;
}
=back
Modified: trunk/src/ops/object.ops
==============================================================================
--- trunk/src/ops/object.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/object.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -47,115 +47,115 @@
=cut
op callmethodcc(invar PMC, in STR) :object_base :flow {
- PMC * const object = $1;
- STRING * const meth = $2;
- opcode_t * const next = expr NEXT();
-
- PMC * const method_pmc = VTABLE_find_method(interp, object, meth);
- opcode_t *dest = NULL;
-
- if (PMC_IS_NULL(method_pmc)) {
- PMC * const _class = VTABLE_get_class(interp, object);
- if (PMC_IS_NULL(_class)) {
- dest = Parrot_ex_throw_from_op_args(interp, next,
- EXCEPTION_METHOD_NOT_FOUND,
- "Method '%Ss' not found for non-object", meth);
+ PMC * const object = $1;
+ STRING * const meth = $2;
+ opcode_t * const next = expr NEXT();
+
+ PMC * const method_pmc = VTABLE_find_method(interp, object, meth);
+ opcode_t *dest = NULL;
+
+ if (PMC_IS_NULL(method_pmc)) {
+ PMC * const _class = VTABLE_get_class(interp, object);
+ if (PMC_IS_NULL(_class)) {
+ dest = Parrot_ex_throw_from_op_args(interp, next,
+ EXCEPTION_METHOD_NOT_FOUND,
+ "Method '%Ss' not found for non-object", meth);
+ }
+ else {
+ dest = Parrot_ex_throw_from_op_args(interp, next,
+ EXCEPTION_METHOD_NOT_FOUND,
+ "Method '%Ss' not found for invocant of class '%Ss'", meth,
+ VTABLE_get_string(interp, _class));
+ }
}
else {
- dest = Parrot_ex_throw_from_op_args(interp, next,
- EXCEPTION_METHOD_NOT_FOUND,
- "Method '%Ss' not found for invocant of class '%Ss'", meth,
- VTABLE_get_string(interp, _class));
+ interp->current_object = object;
+ interp->current_cont = NEED_CONTINUATION;
+ dest = VTABLE_invoke(interp, method_pmc, next);
}
- }
- else {
- interp->current_object = object;
- interp->current_cont = NEED_CONTINUATION;
- dest = VTABLE_invoke(interp, method_pmc, next);
- }
- goto ADDRESS(dest);
+ goto ADDRESS(dest);
}
op callmethodcc(invar PMC, invar PMC) :object_base :flow {
- opcode_t *dest;
- opcode_t * const next = expr NEXT();
+ opcode_t *dest;
+ opcode_t * const next = expr NEXT();
- interp->current_object = $1;
- interp->current_cont = NEED_CONTINUATION;
- dest = VTABLE_invoke(interp, $2, next);
+ interp->current_object = $1;
+ interp->current_cont = NEED_CONTINUATION;
+ dest = VTABLE_invoke(interp, $2, next);
- goto ADDRESS(dest);
+ goto ADDRESS(dest);
}
op callmethod(invar PMC, in STR, invar PMC) :object_base :flow {
- PMC * const object = $1;
- STRING * const meth = $2;
- opcode_t * const next = expr NEXT();
-
- PMC * const method_pmc = VTABLE_find_method(interp, object, meth);
- opcode_t *dest = NULL;
+ PMC * const object = $1;
+ STRING * const meth = $2;
+ opcode_t * const next = expr NEXT();
+
+ PMC * const method_pmc = VTABLE_find_method(interp, object, meth);
+ opcode_t *dest = NULL;
+
+
+ if (PMC_IS_NULL(method_pmc)) {
+ dest = Parrot_ex_throw_from_op_args(interp, next, EXCEPTION_METHOD_NOT_FOUND,
+ "Method '%Ss' not found for invocant of class '%Ss'", meth,
+ VTABLE_get_string(interp, VTABLE_get_class(interp, object)));
+ }
+ else {
+ interp->current_object = object;
+ interp->current_cont = $3;
+ dest = (opcode_t *)VTABLE_invoke(interp, method_pmc, next);
+ }
+ goto ADDRESS(dest);
+}
+op callmethod(invar PMC, invar PMC, invar PMC) :object_base :flow {
+ PMC * const object = $1;
+ PMC * const method_pmc = $2;
+ opcode_t * const next = expr NEXT();
+
+ opcode_t *dest;
- if (PMC_IS_NULL(method_pmc)) {
- dest = Parrot_ex_throw_from_op_args(interp, next, EXCEPTION_METHOD_NOT_FOUND,
- "Method '%Ss' not found for invocant of class '%Ss'", meth,
- VTABLE_get_string(interp, VTABLE_get_class(interp, object)));
- }
- else {
interp->current_object = object;
interp->current_cont = $3;
dest = (opcode_t *)VTABLE_invoke(interp, method_pmc, next);
- }
- goto ADDRESS(dest);
+ goto ADDRESS(dest);
}
-op callmethod(invar PMC, invar PMC, invar PMC) :object_base :flow {
- PMC * const object = $1;
- PMC * const method_pmc = $2;
- opcode_t * const next = expr NEXT();
-
- opcode_t *dest;
-
- interp->current_object = object;
- interp->current_cont = $3;
- dest = (opcode_t *)VTABLE_invoke(interp, method_pmc, next);
- goto ADDRESS(dest);
+op tailcallmethod(invar PMC, in STR) :object_base :flow {
+ opcode_t * const next = expr NEXT();
+ PMC * const object = $1;
+ STRING * const meth = $2;
+ PMC * const method_pmc = VTABLE_find_method(interp, object, meth);
+
+ opcode_t *dest;
+
+ if (PMC_IS_NULL(method_pmc)) {
+ dest = Parrot_ex_throw_from_op_args(interp, next, EXCEPTION_METHOD_NOT_FOUND,
+ "Method '%Ss' not found for invocant of class '%Ss'", meth,
+ VTABLE_get_string(interp, VTABLE_get_class(interp, object)));
+ }
+ else {
+ interp->current_cont = Parrot_pcc_get_continuation(interp, CURRENT_CONTEXT(interp));
+ PObj_get_FLAGS(interp->current_cont) |= SUB_FLAG_TAILCALL;
+ interp->current_object = object;
+ dest = (opcode_t *)VTABLE_invoke(interp, method_pmc, next);
+ }
+ goto ADDRESS(dest);
}
-op tailcallmethod(invar PMC, in STR) :object_base :flow {
- opcode_t * const next = expr NEXT();
- PMC * const object = $1;
- STRING * const meth = $2;
- PMC * const method_pmc = VTABLE_find_method(interp, object, meth);
-
- opcode_t *dest;
-
- if (PMC_IS_NULL(method_pmc)) {
- dest = Parrot_ex_throw_from_op_args(interp, next, EXCEPTION_METHOD_NOT_FOUND,
- "Method '%Ss' not found for invocant of class '%Ss'", meth,
- VTABLE_get_string(interp, VTABLE_get_class(interp, object)));
- }
- else {
+op tailcallmethod(invar PMC, invar PMC) :object_base :flow {
+ opcode_t * const next = expr NEXT();
+ PMC * const object = $1;
+ PMC * const method_pmc = $2;
+
+ opcode_t *dest;
+
interp->current_cont = Parrot_pcc_get_continuation(interp, CURRENT_CONTEXT(interp));
PObj_get_FLAGS(interp->current_cont) |= SUB_FLAG_TAILCALL;
interp->current_object = object;
dest = (opcode_t *)VTABLE_invoke(interp, method_pmc, next);
- }
- goto ADDRESS(dest);
-}
-
-op tailcallmethod(invar PMC, invar PMC) :object_base :flow {
- opcode_t * const next = expr NEXT();
- PMC * const object = $1;
- PMC * const method_pmc = $2;
-
- opcode_t *dest;
-
- interp->current_cont = Parrot_pcc_get_continuation(interp, CURRENT_CONTEXT(interp));
- PObj_get_FLAGS(interp->current_cont) |= SUB_FLAG_TAILCALL;
- interp->current_object = object;
- dest = (opcode_t *)VTABLE_invoke(interp, method_pmc, next);
- goto ADDRESS(dest);
+ goto ADDRESS(dest);
}
=item B<addmethod>(invar PMC, in STR, invar PMC)
@@ -165,7 +165,7 @@
=cut
inline op addmethod(invar PMC, in STR, invar PMC) :object_classes {
- VTABLE_add_method(interp, $1, $2, $3);
+ VTABLE_add_method(interp, $1, $2, $3);
}
@@ -177,7 +177,7 @@
=cut
inline op can(out INT, invar PMC, in STR) :object_base {
- $1 = VTABLE_can(interp, $2, $3);
+ $1 = VTABLE_can(interp, $2, $3);
}
@@ -189,7 +189,7 @@
=cut
inline op does(out INT, invar PMC, in STR) :object_base {
- $1 = $3 ? VTABLE_does(interp, $2, $3) : 0;
+ $1 = $3 ? VTABLE_does(interp, $2, $3) : 0;
}
=item B<does>(out INT, invar PMC, in PMC)
@@ -200,7 +200,7 @@
=cut
inline op does(out INT, invar PMC, in PMC) :object_base {
- $1 = $3 ? VTABLE_does_pmc(interp, $2, $3) : 0;
+ $1 = $3 ? VTABLE_does_pmc(interp, $2, $3) : 0;
}
=item B<isa>(out INT, invar PMC, in STR)
@@ -213,7 +213,7 @@
=cut
inline op isa(out INT, invar PMC, in STR) :object_base {
- $1 = $3 ? VTABLE_isa(interp, $2, $3) : 0;
+ $1 = $3 ? VTABLE_isa(interp, $2, $3) : 0;
}
inline op isa(out INT, invar PMC, in PMC) :object_base {
@@ -235,9 +235,9 @@
=cut
inline op newclass(out PMC, in STR) :object_classes {
- PMC * const name = pmc_new(interp, enum_class_String);
- VTABLE_set_string_native(interp, name, $2);
- $1 = pmc_new_init(interp, enum_class_Class, name);
+ PMC * const name = pmc_new(interp, enum_class_String);
+ VTABLE_set_string_native(interp, name, $2);
+ $1 = pmc_new_init(interp, enum_class_Class, name);
}
inline op newclass(out PMC, in PMC) :object_classes {
@@ -373,11 +373,11 @@
=cut
inline op get_class(out PMC, in STR) :object_classes {
- $1 = Parrot_oo_get_class_str(interp, $2);
+ $1 = Parrot_oo_get_class_str(interp, $2);
}
inline op get_class(out PMC, in PMC) :object_classes {
- $1 = Parrot_oo_get_class(interp, $2);
+ $1 = Parrot_oo_get_class(interp, $2);
}
###############################################################################
@@ -511,11 +511,11 @@
=cut
inline op inspect(out PMC, in PMC) :object_classes {
- $1 = VTABLE_inspect(interp, $2);
+ $1 = VTABLE_inspect(interp, $2);
}
inline op inspect(out PMC, in PMC, in STR) :object_classes {
- $1 = VTABLE_inspect_str(interp, $2, $3);
+ $1 = VTABLE_inspect_str(interp, $2, $3);
}
=back
Modified: trunk/src/ops/pmc.ops
==============================================================================
--- trunk/src/ops/pmc.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/pmc.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -184,11 +184,11 @@
=cut
inline op typeof(out STR, invar PMC) {
- $1 = VTABLE_name(interp, $2);
+ $1 = VTABLE_name(interp, $2);
}
inline op typeof(out PMC, invar PMC) {
- $1 = VTABLE_get_class(interp, $2);
+ $1 = VTABLE_get_class(interp, $2);
}
########################################
@@ -259,23 +259,23 @@
=cut
inline op defined(out INT, invar PMC) {
- $1 = PMC_IS_NULL($2) ? 0 : VTABLE_defined(interp, $2);
+ $1 = PMC_IS_NULL($2) ? 0 : VTABLE_defined(interp, $2);
}
inline op defined(out INT, invar PMC, in INTKEY) {
- $1 = PMC_IS_NULL($2) ? 0 : VTABLE_defined_keyed_int(interp, $2, $3);
+ $1 = PMC_IS_NULL($2) ? 0 : VTABLE_defined_keyed_int(interp, $2, $3);
}
inline op defined(out INT, invar PMC, in KEY) {
- $1 = PMC_IS_NULL($2) ? 0 : VTABLE_defined_keyed(interp, $2, $3);
+ $1 = PMC_IS_NULL($2) ? 0 : VTABLE_defined_keyed(interp, $2, $3);
}
inline op exists(out INT, invar PMC, in INTKEY) {
- $1 = PMC_IS_NULL($2) ? 0 : VTABLE_exists_keyed_int(interp, $2, $3);
+ $1 = PMC_IS_NULL($2) ? 0 : VTABLE_exists_keyed_int(interp, $2, $3);
}
inline op exists(out INT, invar PMC, in KEY) {
- $1 = PMC_IS_NULL($2) ? 0: VTABLE_exists_keyed(interp, $2, $3);
+ $1 = PMC_IS_NULL($2) ? 0: VTABLE_exists_keyed(interp, $2, $3);
}
########################################
@@ -289,11 +289,11 @@
=cut
inline op delete(invar PMC, in KEY) {
- VTABLE_delete_keyed(interp, $1, $2);
+ VTABLE_delete_keyed(interp, $1, $2);
}
inline op delete(invar PMC, in INTKEY) {
- VTABLE_delete_keyed_int(interp, $1, $2);
+ VTABLE_delete_keyed_int(interp, $1, $2);
}
########################################
@@ -305,7 +305,7 @@
=cut
inline op elements(out INT, invar PMC) {
- $1 = VTABLE_elements(interp, $2);
+ $1 = VTABLE_elements(interp, $2);
}
=back
@@ -478,7 +478,7 @@
=cut
op setprop(invar PMC, in STR, invar PMC) {
- VTABLE_setprop(interp, $1, $2, $3);
+ VTABLE_setprop(interp, $1, $2, $3);
}
########################################
@@ -490,7 +490,7 @@
=cut
op getprop(out PMC, in STR, invar PMC) {
- $1 = VTABLE_getprop(interp, $3, $2);
+ $1 = VTABLE_getprop(interp, $3, $2);
}
########################################
@@ -502,7 +502,7 @@
=cut
op delprop(invar PMC, in STR) {
- VTABLE_delprop(interp, $1, $2);
+ VTABLE_delprop(interp, $1, $2);
}
########################################
@@ -515,7 +515,7 @@
=cut
op prophash(out PMC, invar PMC) {
- $1 = VTABLE_getprops(interp, $2);
+ $1 = VTABLE_getprops(interp, $2);
}
=back
@@ -545,11 +545,11 @@
=cut
op freeze(out STR, invar PMC) {
- $1 = Parrot_freeze(interp, $2);
+ $1 = Parrot_freeze(interp, $2);
}
op thaw(out PMC, in STR) {
- $1 = Parrot_thaw(interp, $2);
+ $1 = Parrot_thaw(interp, $2);
}
=back
@@ -580,7 +580,7 @@
=cut
inline op add_multi(in STR, in STR, invar PMC) {
- Parrot_mmd_add_multi_from_long_sig(interp, $1, $2, $3);
+ Parrot_mmd_add_multi_from_long_sig(interp, $1, $2, $3);
}
=item B<find_multi>(out PMC, in STR, in STR)
@@ -590,7 +590,7 @@
=cut
inline op find_multi(out PMC, in STR, in STR) {
- $1 = Parrot_mmd_find_multi_from_long_sig(interp, $2, $3);
+ $1 = Parrot_mmd_find_multi_from_long_sig(interp, $2, $3);
}
=back
@@ -623,11 +623,11 @@
=cut
op register(invar PMC) {
- gc_register_pmc(interp, $1);
+ gc_register_pmc(interp, $1);
}
op unregister(invar PMC) {
- gc_unregister_pmc(interp, $1);
+ gc_unregister_pmc(interp, $1);
}
@@ -679,7 +679,7 @@
=cut
inline op morph(invar PMC, in PMC) {
- VTABLE_morph(interp, $1, $2);
+ VTABLE_morph(interp, $1, $2);
}
=back
Modified: trunk/src/ops/set.ops
==============================================================================
--- trunk/src/ops/set.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/set.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -25,10 +25,10 @@
=cut
inline op clone(out STR, in STR) :base_mem {
- /* cloning a NULL STRING produces an empty STRING; TT #964 */
- $1 = $2
- ? Parrot_str_copy(interp, $2)
- : Parrot_str_new(interp, NULL, 0);
+ /* cloning a NULL STRING produces an empty STRING; TT #964 */
+ $1 = $2
+ ? Parrot_str_copy(interp, $2)
+ : Parrot_str_new(interp, NULL, 0);
}
@@ -48,27 +48,27 @@
=cut
op exchange(inout INT, inout INT) :base_core {
- const INTVAL temp = $1;
- $1 = $2;
- $2 = temp;
+ const INTVAL temp = $1;
+ $1 = $2;
+ $2 = temp;
}
op exchange(inout PMC, inout PMC) :base_core {
- PMC * const temp = $1;
- $1 = $2;
- $2 = temp;
+ PMC * const temp = $1;
+ $1 = $2;
+ $2 = temp;
}
op exchange(inout NUM, inout NUM) :base_core {
- FLOATVAL temp = $1;
- $1 = $2;
- $2 = temp;
+ FLOATVAL temp = $1;
+ $1 = $2;
+ $2 = temp;
}
op exchange(inout STR, inout STR) :base_core {
- STRING * const temp = $1;
- $1 = $2;
- $2 = temp;
+ STRING * const temp = $1;
+ $1 = $2;
+ $2 = temp;
}
########################################
@@ -118,79 +118,79 @@
=cut
inline op set(out INT, in INT) :base_core {
- $1 = $2;
+ $1 = $2;
}
inline op set(out INT, in NUM) :base_core {
- $1 = (INTVAL)($2);
+ $1 = (INTVAL)($2);
}
inline op set(out INT, in STR) :base_core {
- $1 = Parrot_str_to_int(interp, $2);
+ $1 = Parrot_str_to_int(interp, $2);
}
inline op set(out NUM, in NUM) :base_core {
- $1 = $2;
+ $1 = $2;
}
inline op set(out NUM, in INT) :base_core {
- $1 = (FLOATVAL)$2;
+ $1 = (FLOATVAL)$2;
}
inline op set(out NUM, in STR) :base_core {
- $1 = Parrot_str_to_num(interp, $2);
+ $1 = Parrot_str_to_num(interp, $2);
}
inline op set(out NUM, invar PMC) :base_core {
- $1 = VTABLE_get_number(interp, $2);
+ $1 = VTABLE_get_number(interp, $2);
}
inline op set(out STR, invar PMC) :base_core {
- $1 = VTABLE_get_string(interp, $2);
+ $1 = VTABLE_get_string(interp, $2);
}
inline op set(out STR, invar STR) :base_core {
- $1 = $2;
+ $1 = $2;
}
inline op set(out STR, inconst STR) :base_core {
- $1 = Parrot_str_copy(interp, $2);
+ $1 = Parrot_str_copy(interp, $2);
}
inline op set(out STR, in INT) :base_core {
- $1 = Parrot_str_from_int(interp, $2);
+ $1 = Parrot_str_from_int(interp, $2);
}
inline op set(out STR, in NUM) :base_core {
- $1 = Parrot_str_from_num(interp, $2);
+ $1 = Parrot_str_from_num(interp, $2);
}
inline op set(out PMC, inconst PMC) :base_core {
- $1 = $2;
+ $1 = $2;
}
inline op set(out PMC, invar PMC) :base_core {
- $1 = $2;
+ $1 = $2;
}
inline op set(invar PMC, in INT) :base_core {
- VTABLE_set_integer_native(interp, $1, $2);
+ VTABLE_set_integer_native(interp, $1, $2);
}
inline op set(invar PMC, in NUM) :base_core {
- VTABLE_set_number_native(interp, $1, $2);
+ VTABLE_set_number_native(interp, $1, $2);
}
inline op set(invar PMC, invar STR) :base_core {
- VTABLE_set_string_native(interp, $1, $2);
+ VTABLE_set_string_native(interp, $1, $2);
}
inline op set(invar PMC, inconst STR) :base_core {
- VTABLE_set_string_native(interp, $1,
- Parrot_str_copy(interp, $2));
+ VTABLE_set_string_native(interp, $1,
+ Parrot_str_copy(interp, $2));
}
inline op set(out INT, invar PMC) :base_core {
- $1 = VTABLE_get_integer(interp, $2);
+ $1 = VTABLE_get_integer(interp, $2);
}
=back
@@ -231,31 +231,31 @@
=cut
inline op assign(invar PMC, invar PMC) :base_core {
- VTABLE_assign_pmc(interp, $1, $2);
+ VTABLE_assign_pmc(interp, $1, $2);
}
inline op assign(invar PMC, in INT) :base_core {
- VTABLE_set_integer_native(interp, $1, $2);
+ VTABLE_set_integer_native(interp, $1, $2);
}
inline op assign(invar PMC, in NUM) :base_core {
- VTABLE_set_number_native(interp, $1, $2);
+ VTABLE_set_number_native(interp, $1, $2);
}
inline op assign(invar PMC, in STR) :base_core {
- VTABLE_assign_string_native(interp, $1, $2);
+ VTABLE_assign_string_native(interp, $1, $2);
}
inline op assign(out STR, in STR) :base_core {
- $1 = Parrot_str_set(interp, $1, $2);
+ $1 = Parrot_str_set(interp, $1, $2);
}
inline op setref(invar PMC, invar PMC) :base_core {
- VTABLE_set_pmc(interp, $1, $2);
+ VTABLE_set_pmc(interp, $1, $2);
}
inline op deref(out PMC, invar PMC) :base_ref {
- $1 = VTABLE_get_pmc(interp, $2);
+ $1 = VTABLE_get_pmc(interp, $2);
}
=back
@@ -471,7 +471,7 @@
=cut
inline op clone(out PMC, invar PMC) :base_mem {
- $1 = VTABLE_clone(interp, $2);
+ $1 = VTABLE_clone(interp, $2);
}
=item B<clone>(out PMC, invar PMC, in PMC)
@@ -481,7 +481,7 @@
=cut
inline op clone(out PMC, invar PMC, in PMC) :base_mem {
- $1 = VTABLE_clone_pmc(interp, $2, $3);
+ $1 = VTABLE_clone_pmc(interp, $2, $3);
}
=item B<copy>(inout PMC, invar PMC)
@@ -560,19 +560,19 @@
=cut
inline op null(out STR) :base_core {
- $1 = NULL;
+ $1 = NULL;
}
inline op null(out INT) :base_core {
- $1 = 0;
+ $1 = 0;
}
inline op null(out PMC) :base_core {
- $1 = PMCNULL;
+ $1 = PMCNULL;
}
inline op null(out NUM) :base_core {
- $1 = 0;
+ $1 = 0;
}
########################################
@@ -594,19 +594,19 @@
=cut
inline op cleari() :base_core {
- Parrot_clear_i(interp);
+ Parrot_clear_i(interp);
}
inline op clearn() :base_core {
- Parrot_clear_n(interp);
+ Parrot_clear_n(interp);
}
inline op clears() :base_core {
- Parrot_clear_s(interp);
+ Parrot_clear_s(interp);
}
inline op clearp() :base_core {
- Parrot_clear_p(interp);
+ Parrot_clear_p(interp);
}
=back
Modified: trunk/src/ops/string.ops
==============================================================================
--- trunk/src/ops/string.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/string.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -102,11 +102,11 @@
}
inline op concat(invar PMC, invar PMC) :base_core {
- VTABLE_i_concatenate(interp, $1, $2);
+ VTABLE_i_concatenate(interp, $1, $2);
}
inline op concat(invar PMC, in STR) :base_core {
- VTABLE_i_concatenate_str(interp, $1, $2);
+ VTABLE_i_concatenate_str(interp, $1, $2);
}
inline op concat(out STR, in STR, in STR) :base_mem {
@@ -114,11 +114,11 @@
}
inline op concat(invar PMC, invar PMC, in STR) :base_core {
- $1 = VTABLE_concatenate_str(interp, $2, $3, $1);
+ $1 = VTABLE_concatenate_str(interp, $2, $3, $1);
}
inline op concat(invar PMC, invar PMC, invar PMC) :base_core {
- $1 = VTABLE_concatenate(interp, $2, $3, $1);
+ $1 = VTABLE_concatenate(interp, $2, $3, $1);
}
=item B<repeat>(out STR, in STR, in INT)
@@ -149,7 +149,7 @@
"Cannot repeat with negative arg");
goto ADDRESS(handler);
}
- $1 = VTABLE_repeat_int(interp, $2, $3, $1);
+ $1 = VTABLE_repeat_int(interp, $2, $3, $1);
}
inline op repeat(invar PMC, invar PMC, invar PMC) :base_core {
@@ -159,7 +159,7 @@
"Cannot repeat with negative arg");
goto ADDRESS(handler);
}
- $1 = VTABLE_repeat(interp, $2, $3, $1);
+ $1 = VTABLE_repeat(interp, $2, $3, $1);
}
=item B<repeat>(invar PMC, in INT)
@@ -172,11 +172,11 @@
=cut
inline op repeat(invar PMC, in INT) :base_core {
- VTABLE_i_repeat_int(interp, $1, $2);
+ VTABLE_i_repeat_int(interp, $1, $2);
}
inline op repeat(invar PMC, invar PMC) :base_core {
- VTABLE_i_repeat(interp, $1, $2);
+ VTABLE_i_repeat(interp, $1, $2);
}
@@ -347,7 +347,7 @@
=cut
inline op new(out STR) :base_mem {
- $1 = Parrot_str_new_noinit(interp, enum_stringrep_one, 0);
+ $1 = Parrot_str_new_noinit(interp, enum_stringrep_one, 0);
}
inline op new(out STR, in INT) :base_mem {
@@ -385,31 +385,31 @@
$1 = 0;
else {
switch ($3) {
- case STRINGINFO_HEADER:
- $1 = PTR2UINTVAL($2);
- break;
- case STRINGINFO_STRSTART:
- $1 = PTR2UINTVAL($2->strstart);
- break;
- case STRINGINFO_BUFLEN:
- $1 = Buffer_buflen($2);
- break;
- case STRINGINFO_FLAGS:
- $1 = PObj_get_FLAGS($2);
- break;
- case STRINGINFO_BUFUSED:
- $1 = $2->bufused;
- break;
- case STRINGINFO_STRLEN:
- $1 = $2->strlen;
- break;
- default:
- {
- opcode_t *handler = Parrot_ex_throw_from_op_args(interp, NULL,
- EXCEPTION_INVALID_OPERATION,
- "stringinfo: unknown info type: %d", $3);
- goto ADDRESS(handler);
- }
+ case STRINGINFO_HEADER:
+ $1 = PTR2UINTVAL($2);
+ break;
+ case STRINGINFO_STRSTART:
+ $1 = PTR2UINTVAL($2->strstart);
+ break;
+ case STRINGINFO_BUFLEN:
+ $1 = Buffer_buflen($2);
+ break;
+ case STRINGINFO_FLAGS:
+ $1 = PObj_get_FLAGS($2);
+ break;
+ case STRINGINFO_BUFUSED:
+ $1 = $2->bufused;
+ break;
+ case STRINGINFO_STRLEN:
+ $1 = $2->strlen;
+ break;
+ default:
+ {
+ opcode_t *handler = Parrot_ex_throw_from_op_args(interp, NULL,
+ EXCEPTION_INVALID_OPERATION,
+ "stringinfo: unknown info type: %d", $3);
+ goto ADDRESS(handler);
+ }
}
}
}
@@ -581,7 +581,7 @@
=cut
op encoding(out INT, in STR) :base_core {
- $1 = Parrot_encoding_number_of_str(interp, $2);
+ $1 = Parrot_encoding_number_of_str(interp, $2);
}
op encodingname(out STR, in INT) :base_core {
Modified: trunk/src/ops/sys.ops
==============================================================================
--- trunk/src/ops/sys.ops Sun Dec 6 14:42:12 2009 (r42915)
+++ trunk/src/ops/sys.ops Sun Dec 6 14:47:19 2009 (r42916)
@@ -39,11 +39,11 @@
=cut
inline op spawnw(out INT, in STR) {
- $1 = Parrot_Run_OS_Command(interp, $2);
+ $1 = Parrot_Run_OS_Command(interp, $2);
}
inline op spawnw(out INT, invar PMC) {
- $1 = Parrot_Run_OS_Command_Argv(interp, $2);
+ $1 = Parrot_Run_OS_Command_Argv(interp, $2);
}
###############################################################################
@@ -64,17 +64,17 @@
=cut
inline op err(out INT) {
- $1 = errno;
+ $1 = errno;
}
op err(out STR) {
- const char * const tmp = strerror(errno);
- $1 = string_make(interp, tmp, strlen(tmp), "ascii", 0);
+ const char * const tmp = strerror(errno);
+ $1 = string_make(interp, tmp, strlen(tmp), "ascii", 0);
}
op err(out STR, in INT) {
- const char * const tmp = strerror($2);
- $1 = string_make(interp, tmp, strlen(tmp), "ascii", 0);
+ const char * const tmp = strerror($2);
+ $1 = string_make(interp, tmp, strlen(tmp), "ascii", 0);
}
@@ -88,7 +88,7 @@
=cut
inline op time(out INT) {
- $1 = Parrot_intval_time();
+ $1 = Parrot_intval_time();
}
@@ -102,7 +102,7 @@
=cut
inline op time(out NUM) {
- $1 = Parrot_floatval_time();
+ $1 = Parrot_floatval_time();
}
########################################
@@ -175,35 +175,35 @@
=cut
op gmtime(out STR, in INT) {
- struct tm tm;
- const time_t t = (time_t) $2;
- char resultbuffer[26];
- Parrot_gmtime_r(&t, &tm);
- Parrot_asctime_r(&tm, resultbuffer);
- $1 = Parrot_str_new(interp, resultbuffer, 25);
+ struct tm tm;
+ const time_t t = (time_t) $2;
+ char resultbuffer[26];
+ Parrot_gmtime_r(&t, &tm);
+ Parrot_asctime_r(&tm, resultbuffer);
+ $1 = Parrot_str_new(interp, resultbuffer, 25);
}
op localtime(out STR, in INT) {
- struct tm tm;
- const time_t t = (time_t) $2;
- char resultbuffer[26];
- Parrot_localtime_r(&t, &tm);
- Parrot_asctime_r(&tm, resultbuffer);
- $1 = Parrot_str_new(interp, resultbuffer, 25);
+ struct tm tm;
+ const time_t t = (time_t) $2;
+ char resultbuffer[26];
+ Parrot_localtime_r(&t, &tm);
+ Parrot_asctime_r(&tm, resultbuffer);
+ $1 = Parrot_str_new(interp, resultbuffer, 25);
}
op decodetime(out PMC, in INT) {
- struct tm tm;
- const time_t t = (time_t) $2;
- Parrot_gmtime_r(&t, &tm);
- $1 = tm_to_array(interp, &tm);
+ struct tm tm;
+ const time_t t = (time_t) $2;
+ Parrot_gmtime_r(&t, &tm);
+ $1 = tm_to_array(interp, &tm);
}
op decodelocaltime(out PMC, in INT) {
- struct tm tm;
- const time_t t = (time_t) $2;
- Parrot_localtime_r(&t, &tm);
- $1 = tm_to_array(interp, &tm);
+ struct tm tm;
+ const time_t t = (time_t) $2;
+ Parrot_localtime_r(&t, &tm);
+ $1 = tm_to_array(interp, &tm);
}
########################################
@@ -264,11 +264,11 @@
=cut
inline op sysinfo(out STR, in INT) {
- $1 = sysinfo_s(interp, $2);
+ $1 = sysinfo_s(interp, $2);
}
inline op sysinfo(out INT, in INT) {
- $1 = sysinfo_i(interp, $2);
+ $1 = sysinfo_i(interp, $2);
}
########################################
@@ -282,27 +282,27 @@
=cut
inline op sleep(in INT) :flow {
- opcode_t *next = expr NEXT();
- if ($1 < 0) {
- opcode_t * const handler = Parrot_ex_throw_from_op_args(interp, next,
- EXCEPTION_NEG_SLEEP,
- "Cannot go back in time");
- goto ADDRESS(handler);
- }
- next = (opcode_t *)Parrot_cx_schedule_sleep(interp, (FLOATVAL) $1, next);
- goto ADDRESS(next);
+ opcode_t *next = expr NEXT();
+ if ($1 < 0) {
+ opcode_t * const handler = Parrot_ex_throw_from_op_args(interp, next,
+ EXCEPTION_NEG_SLEEP,
+ "Cannot go back in time");
+ goto ADDRESS(handler);
+ }
+ next = (opcode_t *)Parrot_cx_schedule_sleep(interp, (FLOATVAL) $1, next);
+ goto ADDRESS(next);
}
inline op sleep(in NUM) :flow {
- opcode_t *next = expr NEXT();
- if ($1 < 0.0) {
- opcode_t * const handler = Parrot_ex_throw_from_op_args(interp, next,
- EXCEPTION_NEG_SLEEP,
- "Cannot go back in time");
- goto ADDRESS(handler);
- }
- next = (opcode_t *)Parrot_cx_schedule_sleep(interp, $1, next);
- goto ADDRESS(next);
+ opcode_t *next = expr NEXT();
+ if ($1 < 0.0) {
+ opcode_t * const handler = Parrot_ex_throw_from_op_args(interp, next,
+ EXCEPTION_NEG_SLEEP,
+ "Cannot go back in time");
+ goto ADDRESS(handler);
+ }
+ next = (opcode_t *)Parrot_cx_schedule_sleep(interp, $1, next);
+ goto ADDRESS(next);
}
########################################
More information about the parrot-commits
mailing list