Repository: lucy-clownfish Updated Branches: refs/heads/master 8d82f9adc -> b055f09c8
Rename Float64/Integer64 to Float/Integer Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/f6265434 Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/f6265434 Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/f6265434 Branch: refs/heads/master Commit: f62654347542cb38f4956a63fb98f630caac08a2 Parents: 82df9f0 Author: Nick Wellnhofer <[email protected]> Authored: Thu Jul 9 16:12:20 2015 +0200 Committer: Nick Wellnhofer <[email protected]> Committed: Thu Jul 9 16:34:00 2015 +0200 ---------------------------------------------------------------------- runtime/c/src/clownfish.c | 12 +- runtime/core/Clownfish/Num.c | 114 +++++++------- runtime/core/Clownfish/Num.cfh | 60 ++++---- runtime/core/Clownfish/Test/TestCharBuf.c | 6 +- runtime/core/Clownfish/Test/TestNum.c | 152 +++++++++---------- runtime/core/Clownfish/Test/TestVector.c | 2 +- runtime/go/ext/clownfish.c | 12 +- .../perl/buildlib/Clownfish/Build/Binding.pm | 18 +-- runtime/perl/xs/XSBind.c | 8 +- 9 files changed, 192 insertions(+), 192 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f6265434/runtime/c/src/clownfish.c ---------------------------------------------------------------------- diff --git a/runtime/c/src/clownfish.c b/runtime/c/src/clownfish.c index 362337a..f141e0a 100644 --- a/runtime/c/src/clownfish.c +++ b/runtime/c/src/clownfish.c @@ -307,16 +307,16 @@ Hash_To_Host_IMP(Hash *self) { } void* -Float64_To_Host_IMP(Float64 *self) { - Float64_To_Host_t super_to_host - = SUPER_METHOD_PTR(FLOAT64, CFISH_Float64_To_Host); +Float_To_Host_IMP(Float *self) { + Float_To_Host_t super_to_host + = SUPER_METHOD_PTR(FLOAT, CFISH_Float_To_Host); return super_to_host(self); } void* -Int64_To_Host_IMP(Integer64 *self) { - Int64_To_Host_t super_to_host - = SUPER_METHOD_PTR(INTEGER64, CFISH_Int64_To_Host); +Int_To_Host_IMP(Integer *self) { + Int_To_Host_t super_to_host + = SUPER_METHOD_PTR(INTEGER, CFISH_Int_To_Host); return super_to_host(self); } http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f6265434/runtime/core/Clownfish/Num.c ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/Num.c b/runtime/core/Clownfish/Num.c index d05b66e..157880d 100644 --- a/runtime/core/Clownfish/Num.c +++ b/runtime/core/Clownfish/Num.c @@ -14,8 +14,8 @@ * limitations under the License. */ -#define C_CFISH_INTEGER64 -#define C_CFISH_FLOAT64 +#define C_CFISH_INTEGER +#define C_CFISH_FLOAT #define CFISH_USE_SHORT_NAMES #include <float.h> @@ -55,26 +55,26 @@ S_compare_i64_f64(int64_t i64, double f64); static bool S_equals_i64_f64(int64_t i64, double f64); -Float64* -Float64_new(double value) { - Float64 *self = (Float64*)Class_Make_Obj(FLOAT64); - return Float64_init(self, value); +Float* +Float_new(double value) { + Float *self = (Float*)Class_Make_Obj(FLOAT); + return Float_init(self, value); } -Float64* -Float64_init(Float64 *self, double value) { +Float* +Float_init(Float *self, double value) { self->value = value; return self; } bool -Float64_Equals_IMP(Float64 *self, Obj *other) { - if (Obj_is_a(other, FLOAT64)) { - Float64 *twin = (Float64*)other; +Float_Equals_IMP(Float *self, Obj *other) { + if (Obj_is_a(other, FLOAT)) { + Float *twin = (Float*)other; return self->value == twin->value; } - else if (Obj_is_a(other, INTEGER64)) { - Integer64 *twin = (Integer64*)other; + else if (Obj_is_a(other, INTEGER)) { + Integer *twin = (Integer*)other; return S_equals_i64_f64(twin->value, self->value); } else { @@ -83,82 +83,82 @@ Float64_Equals_IMP(Float64 *self, Obj *other) { } int32_t -Float64_Compare_To_IMP(Float64 *self, Obj *other) { - if (Obj_is_a(other, FLOAT64)) { - Float64 *twin = (Float64*)other; +Float_Compare_To_IMP(Float *self, Obj *other) { + if (Obj_is_a(other, FLOAT)) { + Float *twin = (Float*)other; return S_compare_f64(self->value, twin->value); } - else if (Obj_is_a(other, INTEGER64)) { - Integer64 *twin = (Integer64*)other; + else if (Obj_is_a(other, INTEGER)) { + Integer *twin = (Integer*)other; return -S_compare_i64_f64(twin->value, self->value); } else { - THROW(ERR, "Can't compare Float64 to %o", Obj_get_class_name(other)); + THROW(ERR, "Can't compare Float to %o", Obj_get_class_name(other)); UNREACHABLE_RETURN(int32_t); } } double -Float64_Get_Value_IMP(Float64 *self) { +Float_Get_Value_IMP(Float *self) { return self->value; } void -Float64_Set_Value_IMP(Float64 *self, double value) { +Float_Set_Value_IMP(Float *self, double value) { self->value = value; } int64_t -Float64_To_I64_IMP(Float64 *self) { +Float_To_I64_IMP(Float *self) { if (self->value < -POW_2_63 || self->value >= POW_2_63) { - THROW(ERR, "Float64 out of range: %f64", self->value); + THROW(ERR, "Float out of range: %f64", self->value); } return (int64_t)self->value; } bool -Float64_To_Bool_IMP(Float64 *self) { +Float_To_Bool_IMP(Float *self) { return self->value != 0.0; } String* -Float64_To_String_IMP(Float64 *self) { +Float_To_String_IMP(Float *self) { return Str_newf("%f64", self->value); } -Float64* -Float64_Clone_IMP(Float64 *self) { - return Float64_new(self->value); +Float* +Float_Clone_IMP(Float *self) { + return Float_new(self->value); } void -Float64_Mimic_IMP(Float64 *self, Obj *other) { - Float64 *twin = (Float64*)CERTIFY(other, FLOAT64); +Float_Mimic_IMP(Float *self, Obj *other) { + Float *twin = (Float*)CERTIFY(other, FLOAT); self->value = twin->value; } /***************************************************************************/ -Integer64* -Int64_new(int64_t value) { - Integer64 *self = (Integer64*)Class_Make_Obj(INTEGER64); - return Int64_init(self, value); +Integer* +Int_new(int64_t value) { + Integer *self = (Integer*)Class_Make_Obj(INTEGER); + return Int_init(self, value); } -Integer64* -Int64_init(Integer64 *self, int64_t value) { +Integer* +Int_init(Integer *self, int64_t value) { self->value = value; return self; } bool -Int64_Equals_IMP(Integer64 *self, Obj *other) { - if (Obj_is_a(other, INTEGER64)) { - Integer64 *twin = (Integer64*)other; +Int_Equals_IMP(Integer *self, Obj *other) { + if (Obj_is_a(other, INTEGER)) { + Integer *twin = (Integer*)other; return self->value == twin->value; } - else if (Obj_is_a(other, FLOAT64)) { - Float64 *twin = (Float64*)other; + else if (Obj_is_a(other, FLOAT)) { + Float *twin = (Float*)other; return S_equals_i64_f64(self->value, twin->value); } else { @@ -167,54 +167,54 @@ Int64_Equals_IMP(Integer64 *self, Obj *other) { } int32_t -Int64_Compare_To_IMP(Integer64 *self, Obj *other) { - if (Obj_is_a(other, INTEGER64)) { - Integer64 *twin = (Integer64*)other; +Int_Compare_To_IMP(Integer *self, Obj *other) { + if (Obj_is_a(other, INTEGER)) { + Integer *twin = (Integer*)other; return S_compare_i64(self->value, twin->value); } - else if (Obj_is_a(other, FLOAT64)) { - Float64 *twin = (Float64*)other; + else if (Obj_is_a(other, FLOAT)) { + Float *twin = (Float*)other; return S_compare_i64_f64(self->value, twin->value); } else { - THROW(ERR, "Can't compare Int64 to %o", Obj_get_class_name(other)); + THROW(ERR, "Can't compare Integer to %o", Obj_get_class_name(other)); UNREACHABLE_RETURN(int32_t); } } int64_t -Int64_Get_Value_IMP(Integer64 *self) { +Int_Get_Value_IMP(Integer *self) { return self->value; } void -Int64_Set_Value_IMP(Integer64 *self, int64_t value) { +Int_Set_Value_IMP(Integer *self, int64_t value) { self->value = value; } double -Int64_To_F64_IMP(Integer64 *self) { +Int_To_F64_IMP(Integer *self) { return (double)self->value; } bool -Int64_To_Bool_IMP(Integer64 *self) { +Int_To_Bool_IMP(Integer *self) { return self->value != 0; } String* -Int64_To_String_IMP(Integer64 *self) { +Int_To_String_IMP(Integer *self) { return Str_newf("%i64", self->value); } -Integer64* -Int64_Clone_IMP(Integer64 *self) { - return Int64_new(self->value); +Integer* +Int_Clone_IMP(Integer *self) { + return Int_new(self->value); } void -Int64_Mimic_IMP(Integer64 *self, Obj *other) { - Integer64 *twin = (Integer64*)CERTIFY(other, INTEGER64); +Int_Mimic_IMP(Integer *self, Obj *other) { + Integer *twin = (Integer*)CERTIFY(other, INTEGER); self->value = twin->value; } http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f6265434/runtime/core/Clownfish/Num.cfh ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/Num.cfh b/runtime/core/Clownfish/Num.cfh index fc0e91b..1874963 100644 --- a/runtime/core/Clownfish/Num.cfh +++ b/runtime/core/Clownfish/Num.cfh @@ -18,101 +18,101 @@ parcel Clownfish; /** Double precision floating point number. */ -final class Clownfish::Float64 { +final class Clownfish::Float { double value; /** * @param value Initial value. */ - inert Float64* - init(Float64* self, double value); + inert Float* + init(Float* self, double value); - inert Float64* + inert Float* new(double value); void* - To_Host(Float64 *self); + To_Host(Float *self); void - Set_Value(Float64 *self, double value); + Set_Value(Float *self, double value); double - Get_Value(Float64 *self); + Get_Value(Float *self); public int64_t - To_I64(Float64 *self); + To_I64(Float *self); /** Evaluate the number in a boolean context. Returns true if it is * non-zero. */ public bool - To_Bool(Float64 *self); + To_Bool(Float *self); public incremented String* - To_String(Float64 *self); + To_String(Float *self); public bool - Equals(Float64 *self, Obj *other); + Equals(Float *self, Obj *other); public int32_t - Compare_To(Float64 *self, Obj *other); + Compare_To(Float *self, Obj *other); - public incremented Float64* - Clone(Float64 *self); + public incremented Float* + Clone(Float *self); public void - Mimic(Float64 *self, Obj *other); + Mimic(Float *self, Obj *other); } /** * 64-bit signed integer. */ -final class Clownfish::Integer64 nickname Int64 { +final class Clownfish::Integer nickname Int { int64_t value; /** * @param value Initial value. */ - inert Integer64* - init(Integer64* self, int64_t value); + inert Integer* + init(Integer* self, int64_t value); - inert Integer64* + inert Integer* new(int64_t value); void* - To_Host(Integer64 *self); + To_Host(Integer *self); void - Set_Value(Integer64 *self, int64_t value); + Set_Value(Integer *self, int64_t value); int64_t - Get_Value(Integer64 *self); + Get_Value(Integer *self); public double - To_F64(Integer64 *self); + To_F64(Integer *self); /** Evaluate the number in a boolean context. Returns true if it is * non-zero. */ public bool - To_Bool(Integer64 *self); + To_Bool(Integer *self); public incremented String* - To_String(Integer64 *self); + To_String(Integer *self); public bool - Equals(Integer64 *self, Obj *other); + Equals(Integer *self, Obj *other); public int32_t - Compare_To(Integer64 *self, Obj *other); + Compare_To(Integer *self, Obj *other); - public incremented Integer64* - Clone(Integer64 *self); + public incremented Integer* + Clone(Integer *self); public void - Mimic(Integer64 *self, Obj *other); + Mimic(Integer *self, Obj *other); } http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f6265434/runtime/core/Clownfish/Test/TestCharBuf.c ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/Test/TestCharBuf.c b/runtime/core/Clownfish/Test/TestCharBuf.c index fcce061..30d8c11 100644 --- a/runtime/core/Clownfish/Test/TestCharBuf.c +++ b/runtime/core/Clownfish/Test/TestCharBuf.c @@ -205,9 +205,9 @@ test_vcatf_str(TestBatchRunner *runner) { static void test_vcatf_obj(TestBatchRunner *runner) { - String *wanted = S_get_str("ooga 20 booga"); - Integer64 *i64 = Int64_new(20); - CharBuf *got = S_get_cb("ooga"); + String *wanted = S_get_str("ooga 20 booga"); + Integer *i64 = Int_new(20); + CharBuf *got = S_get_cb("ooga"); CB_catf(got, " %o booga", i64); TEST_TRUE(runner, S_cb_equals(got, wanted), "%%o Obj"); DECREF(i64); http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f6265434/runtime/core/Clownfish/Test/TestNum.c ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/Test/TestNum.c b/runtime/core/Clownfish/Test/TestNum.c index d2a3938..3dcd276 100644 --- a/runtime/core/Clownfish/Test/TestNum.c +++ b/runtime/core/Clownfish/Test/TestNum.c @@ -37,15 +37,15 @@ TestNum_new() { static void test_To_String(TestBatchRunner *runner) { - Float64 *f64 = Float64_new(1.33); - Integer64 *i64 = Int64_new(INT64_MAX); - String *f64_string = Float64_To_String(f64); - String *i64_string = Int64_To_String(i64); + Float *f64 = Float_new(1.33); + Integer *i64 = Int_new(INT64_MAX); + String *f64_string = Float_To_String(f64); + String *i64_string = Int_To_String(i64); TEST_TRUE(runner, Str_Starts_With_Utf8(f64_string, "1.3", 3), - "Float64_To_String"); + "Float_To_String"); TEST_TRUE(runner, Str_Equals_Utf8(i64_string, "9223372036854775807", 19), - "Int64_To_String"); + "Int_To_String"); DECREF(i64_string); DECREF(f64_string); @@ -55,24 +55,24 @@ test_To_String(TestBatchRunner *runner) { static void test_accessors(TestBatchRunner *runner) { - Float64 *f64 = Float64_new(1.0); - Integer64 *i64 = Int64_new(1); + Float *f64 = Float_new(1.0); + Integer *i64 = Int_new(1); double wanted64 = 1.33; double got64; - Float64_Set_Value(f64, 1.33); - got64 = Float64_Get_Value(f64); + Float_Set_Value(f64, 1.33); + got64 = Float_Get_Value(f64); TEST_TRUE(runner, *(int64_t*)&got64 == *(int64_t*)&wanted64, "F64 Set_Value Get_Value"); - TEST_TRUE(runner, Float64_To_I64(f64) == 1, "Float64_To_I64"); + TEST_TRUE(runner, Float_To_I64(f64) == 1, "Float_To_Int"); - Int64_Set_Value(i64, INT64_MIN); - TEST_TRUE(runner, Int64_Get_Value(i64) == INT64_MIN, + Int_Set_Value(i64, INT64_MIN); + TEST_TRUE(runner, Int_Get_Value(i64) == INT64_MIN, "I64 Set_Value Get_Value"); - Int64_Set_Value(i64, -1); - TEST_TRUE(runner, Int64_To_F64(i64) == -1, "Int64_To_F64"); + Int_Set_Value(i64, -1); + TEST_TRUE(runner, Int_To_F64(i64) == -1, "Int_To_Float"); DECREF(i64); DECREF(f64); @@ -81,71 +81,71 @@ test_accessors(TestBatchRunner *runner) { static void S_test_compare_float_int(TestBatchRunner *runner, double f64_val, int64_t i64_val, int32_t result) { - Float64 *f64; - Integer64 *i64; - - f64 = Float64_new(f64_val); - i64 = Int64_new(i64_val); - TEST_INT_EQ(runner, Float64_Compare_To(f64, (Obj*)i64), result, - "Float64_Compare_To %f %" PRId64, f64_val, i64_val); - TEST_INT_EQ(runner, Int64_Compare_To(i64, (Obj*)f64), -result, - "Int64_Compare_To %" PRId64" %f", i64_val, f64_val); - TEST_INT_EQ(runner, Float64_Equals(f64, (Obj*)i64), result == 0, - "Float64_Equals %f %" PRId64, f64_val, i64_val); - TEST_INT_EQ(runner, Int64_Equals(i64, (Obj*)f64), result == 0, - "Int64_Equals %" PRId64 " %f", i64_val, f64_val); + Float *f64; + Integer *i64; + + f64 = Float_new(f64_val); + i64 = Int_new(i64_val); + TEST_INT_EQ(runner, Float_Compare_To(f64, (Obj*)i64), result, + "Float_Compare_To %f %" PRId64, f64_val, i64_val); + TEST_INT_EQ(runner, Int_Compare_To(i64, (Obj*)f64), -result, + "Int_Compare_To %" PRId64" %f", i64_val, f64_val); + TEST_INT_EQ(runner, Float_Equals(f64, (Obj*)i64), result == 0, + "Float_Equals %f %" PRId64, f64_val, i64_val); + TEST_INT_EQ(runner, Int_Equals(i64, (Obj*)f64), result == 0, + "Int_Equals %" PRId64 " %f", i64_val, f64_val); DECREF(f64); DECREF(i64); if (i64_val == INT64_MIN) { return; } - f64 = Float64_new(-f64_val); - i64 = Int64_new(-i64_val); - TEST_INT_EQ(runner, Float64_Compare_To(f64, (Obj*)i64), -result, - "Float64_Compare_To %f %" PRId64, -f64_val, -i64_val); - TEST_INT_EQ(runner, Int64_Compare_To(i64, (Obj*)f64), result, - "Int64_Compare_To %" PRId64" %f", -i64_val, -f64_val); - TEST_INT_EQ(runner, Float64_Equals(f64, (Obj*)i64), result == 0, - "Float64_Equals %f %" PRId64, -f64_val, -i64_val); - TEST_INT_EQ(runner, Int64_Equals(i64, (Obj*)f64), result == 0, - "Int64_Equals %" PRId64 " %f", -i64_val, -f64_val); + f64 = Float_new(-f64_val); + i64 = Int_new(-i64_val); + TEST_INT_EQ(runner, Float_Compare_To(f64, (Obj*)i64), -result, + "Float_Compare_To %f %" PRId64, -f64_val, -i64_val); + TEST_INT_EQ(runner, Int_Compare_To(i64, (Obj*)f64), result, + "Int_Compare_To %" PRId64" %f", -i64_val, -f64_val); + TEST_INT_EQ(runner, Float_Equals(f64, (Obj*)i64), result == 0, + "Float_Equals %f %" PRId64, -f64_val, -i64_val); + TEST_INT_EQ(runner, Int_Equals(i64, (Obj*)f64), result == 0, + "Int_Equals %" PRId64 " %f", -i64_val, -f64_val); DECREF(f64); DECREF(i64); } static void test_Equals_and_Compare_To(TestBatchRunner *runner) { - Float64 *f1 = Float64_new(1.0); - Float64 *f2 = Float64_new(1.0); - Integer64 *i64 = Int64_new(INT64_MAX); + Float *f1 = Float_new(1.0); + Float *f2 = Float_new(1.0); + Integer *i64 = Int_new(INT64_MAX); - TEST_TRUE(runner, Float64_Compare_To(f1, (Obj*)f2) == 0, + TEST_TRUE(runner, Float_Compare_To(f1, (Obj*)f2) == 0, "F64_Compare_To equal"); - TEST_TRUE(runner, Float64_Equals(f1, (Obj*)f2), + TEST_TRUE(runner, Float_Equals(f1, (Obj*)f2), "F64_Equals equal"); - Float64_Set_Value(f2, 2.0); - TEST_TRUE(runner, Float64_Compare_To(f1, (Obj*)f2) < 0, + Float_Set_Value(f2, 2.0); + TEST_TRUE(runner, Float_Compare_To(f1, (Obj*)f2) < 0, "F64_Compare_To less than"); - TEST_FALSE(runner, Float64_Equals(f1, (Obj*)f2), + TEST_FALSE(runner, Float_Equals(f1, (Obj*)f2), "F64_Equals less than"); - Float64_Set_Value(f2, 0.0); - TEST_TRUE(runner, Float64_Compare_To(f1, (Obj*)f2) > 0, + Float_Set_Value(f2, 0.0); + TEST_TRUE(runner, Float_Compare_To(f1, (Obj*)f2) > 0, "F64_Compare_To greater than"); - TEST_FALSE(runner, Float64_Equals(f1, (Obj*)f2), + TEST_FALSE(runner, Float_Equals(f1, (Obj*)f2), "F64_Equals greater than"); - Float64_Set_Value(f1, INT64_MAX * 2.0); - TEST_TRUE(runner, Float64_Compare_To(f1, (Obj*)i64) > 0, - "Float64 comparison to Integer64"); - TEST_TRUE(runner, Int64_Compare_To(i64, (Obj*)f1) < 0, - "Integer64 comparison to Float64"); + Float_Set_Value(f1, INT64_MAX * 2.0); + TEST_TRUE(runner, Float_Compare_To(f1, (Obj*)i64) > 0, + "Float comparison to Integer"); + TEST_TRUE(runner, Int_Compare_To(i64, (Obj*)f1) < 0, + "Integer comparison to Float"); - Int64_Set_Value(i64, INT64_C(0x6666666666666666)); - Integer64 *i64_copy = Int64_new(INT64_C(0x6666666666666666)); - TEST_TRUE(runner, Int64_Compare_To(i64, (Obj*)i64_copy) == 0, - "Integer64 comparison to same number"); + Int_Set_Value(i64, INT64_C(0x6666666666666666)); + Integer *i64_copy = Int_new(INT64_C(0x6666666666666666)); + TEST_TRUE(runner, Int_Compare_To(i64, (Obj*)i64_copy) == 0, + "Integer comparison to same number"); DECREF(i64_copy); DECREF(i64); @@ -168,14 +168,14 @@ test_Equals_and_Compare_To(TestBatchRunner *runner) { static void test_Clone(TestBatchRunner *runner) { - Float64 *f64 = Float64_new(1.33); - Integer64 *i64 = Int64_new(INT64_MAX); - Float64 *f64_dupe = Float64_Clone(f64); - Integer64 *i64_dupe = Int64_Clone(i64); - TEST_TRUE(runner, Float64_Equals(f64, (Obj*)f64_dupe), - "Float64 Clone"); - TEST_TRUE(runner, Int64_Equals(i64, (Obj*)i64_dupe), - "Integer64 Clone"); + Float *f64 = Float_new(1.33); + Integer *i64 = Int_new(INT64_MAX); + Float *f64_dupe = Float_Clone(f64); + Integer *i64_dupe = Int_Clone(i64); + TEST_TRUE(runner, Float_Equals(f64, (Obj*)f64_dupe), + "Float Clone"); + TEST_TRUE(runner, Int_Equals(i64, (Obj*)i64_dupe), + "Integer Clone"); DECREF(i64_dupe); DECREF(f64_dupe); DECREF(i64); @@ -184,16 +184,16 @@ test_Clone(TestBatchRunner *runner) { static void test_Mimic(TestBatchRunner *runner) { - Float64 *f64 = Float64_new(1.33); - Integer64 *i64 = Int64_new(INT64_MAX); - Float64 *f64_dupe = Float64_new(0.0); - Integer64 *i64_dupe = Int64_new(0); - Float64_Mimic(f64_dupe, (Obj*)f64); - Int64_Mimic(i64_dupe, (Obj*)i64); - TEST_TRUE(runner, Float64_Equals(f64, (Obj*)f64_dupe), - "Float64 Mimic"); - TEST_TRUE(runner, Int64_Equals(i64, (Obj*)i64_dupe), - "Integer64 Mimic"); + Float *f64 = Float_new(1.33); + Integer *i64 = Int_new(INT64_MAX); + Float *f64_dupe = Float_new(0.0); + Integer *i64_dupe = Int_new(0); + Float_Mimic(f64_dupe, (Obj*)f64); + Int_Mimic(i64_dupe, (Obj*)i64); + TEST_TRUE(runner, Float_Equals(f64, (Obj*)f64_dupe), + "Float Mimic"); + TEST_TRUE(runner, Int_Equals(i64, (Obj*)i64_dupe), + "Integer Mimic"); DECREF(i64_dupe); DECREF(f64_dupe); DECREF(i64); http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f6265434/runtime/core/Clownfish/Test/TestVector.c ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/Test/TestVector.c b/runtime/core/Clownfish/Test/TestVector.c index 3e19014..aad8369 100644 --- a/runtime/core/Clownfish/Test/TestVector.c +++ b/runtime/core/Clownfish/Test/TestVector.c @@ -347,7 +347,7 @@ test_Clone(TestBatchRunner *runner) { uint32_t i; for (i = 0; i < 10; i++) { - Vec_Push(array, (Obj*)Int64_new(i)); + Vec_Push(array, (Obj*)Int_new(i)); } Vec_Push(array, NULL); twin = Vec_Clone(array); http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f6265434/runtime/go/ext/clownfish.c ---------------------------------------------------------------------- diff --git a/runtime/go/ext/clownfish.c b/runtime/go/ext/clownfish.c index 5059789..cacb642 100644 --- a/runtime/go/ext/clownfish.c +++ b/runtime/go/ext/clownfish.c @@ -277,16 +277,16 @@ Hash_To_Host_IMP(Hash *self) { } void* -Float64_To_Host_IMP(Float64 *self) { - Float64_To_Host_t super_to_host - = SUPER_METHOD_PTR(FLOAT64, CFISH_Float64_To_Host); +Float_To_Host_IMP(Float *self) { + Float_To_Host_t super_to_host + = SUPER_METHOD_PTR(FLOAT, CFISH_Float_To_Host); return super_to_host(self); } void* -Int64_To_Host_IMP(Integer64 *self) { - Int64_To_Host_t super_to_host - = SUPER_METHOD_PTR(INTEGER64, CFISH_Int64_To_Host); +Int_To_Host_IMP(Integer *self) { + Int_To_Host_t super_to_host + = SUPER_METHOD_PTR(INTEGER, CFISH_Int_To_Host); return super_to_host(self); } http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f6265434/runtime/perl/buildlib/Clownfish/Build/Binding.pm ---------------------------------------------------------------------- diff --git a/runtime/perl/buildlib/Clownfish/Build/Binding.pm b/runtime/perl/buildlib/Clownfish/Build/Binding.pm index 43d5b68..b6fe63a 100644 --- a/runtime/perl/buildlib/Clownfish/Build/Binding.pm +++ b/runtime/perl/buildlib/Clownfish/Build/Binding.pm @@ -29,7 +29,7 @@ sub bind_all { $class->bind_string; $class->bind_err; $class->bind_hash; - $class->bind_float64; + $class->bind_float; $class->bind_obj; $class->bind_varray; $class->bind_class; @@ -323,9 +323,9 @@ END_XS_CODE Clownfish::CFC::Binding::Perl::Class->register($binding); } -sub bind_float64 { - my $float64_xs_code = <<'END_XS_CODE'; -MODULE = Clownfish PACKAGE = Clownfish::Float64 +sub bind_float { + my $float_xs_code = <<'END_XS_CODE'; +MODULE = Clownfish PACKAGE = Clownfish::Float SV* new(either_sv, value) @@ -333,9 +333,9 @@ new(either_sv, value) double value; CODE: { - cfish_Float64 *self - = (cfish_Float64*)XSBind_new_blank_obj(aTHX_ either_sv); - cfish_Float64_init(self, value); + cfish_Float *self + = (cfish_Float*)XSBind_new_blank_obj(aTHX_ either_sv); + cfish_Float_init(self, value); RETVAL = CFISH_OBJ_TO_SV_NOINC(self); } OUTPUT: RETVAL @@ -343,9 +343,9 @@ END_XS_CODE my $binding = Clownfish::CFC::Binding::Perl::Class->new( parcel => "Clownfish", - class_name => "Clownfish::Float64", + class_name => "Clownfish::Float", ); - $binding->append_xs($float64_xs_code); + $binding->append_xs($float_xs_code); $binding->exclude_constructor; Clownfish::CFC::Binding::Perl::Class->register($binding); http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f6265434/runtime/perl/xs/XSBind.c ---------------------------------------------------------------------- diff --git a/runtime/perl/xs/XSBind.c b/runtime/perl/xs/XSBind.c index 9eb5f4f..6360b29 100644 --- a/runtime/perl/xs/XSBind.c +++ b/runtime/perl/xs/XSBind.c @@ -19,8 +19,8 @@ #define C_CFISH_OBJ #define C_CFISH_CLASS -#define C_CFISH_FLOAT64 -#define C_CFISH_INTEGER64 +#define C_CFISH_FLOAT +#define C_CFISH_INTEGER #define C_CFISH_BOOLEAN #define NEED_newRV_noinc #include "charmony.h" @@ -1006,13 +1006,13 @@ CFISH_Hash_To_Host_IMP(cfish_Hash *self) { /****************************** Clownfish::Num ******************************/ void* -CFISH_Float64_To_Host_IMP(cfish_Float64 *self) { +CFISH_Float_To_Host_IMP(cfish_Float *self) { dTHX; return newSVnv(self->value); } void* -CFISH_Int64_To_Host_IMP(cfish_Integer64 *self) { +CFISH_Int_To_Host_IMP(cfish_Integer *self) { dTHX; SV *sv = NULL;
