Commit f747bc5d0ace86fce723afd013560f80fe4f5152
2024-03-11T12:50:26
ratio_init_cast
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151
diff --git a/.ic3_history b/.ic3_history
index 769aad0..9f82eaf 100644
--- a/.ic3_history
+++ b/.ic3_history
@@ -1,16 +1,3 @@
-0.5 + 1
-1/2 + 1
-1 +i 1 + 1
-1 +i 1 + 0.5
-1 +i 1 + (F32) 0.5
-1 +i 1 + 0.5f
-1.5f +i 1 + 0.5f
-1.5f +i 2 + 0.5f
-2/3 +i 2 + 0.5f
-2/3 +i 2 + 1/2
-2/3 +i 2
-2/3 +i 2/2
-2/3 +i 2/1
2/3 +i 2/3
2/3 +i 2/3 + 0.5
3 +i 2 + 0.5
@@ -97,3 +84,16 @@ sqrt(-2) * sqrt(-2)
ic3> (1 +i 2) + (2 +i 3)
(1 +i 2) / (2 +i 3)
(1/1 +i 2/1) / (2 +i 3)
+(Ratio) 0
+(Ratio) 1
+(Ratio) 1.2
+(Ratio) 42
+(Ratio) 42 / 3
+((Ratio) 42) / 3
+((Ratio) 42) / 5
+(Ratio) 42 / 5
+(Ratio) 42
+((Ratio) 42) / 5
+(Ratio) 42
+(Ratio) 42 / 5
+(Ratio) 42 / 6
diff --git a/lib/c3/0.1/ratio.facts b/lib/c3/0.1/ratio.facts
new file mode 100644
index 0000000..63ea854
--- /dev/null
+++ b/lib/c3/0.1/ratio.facts
@@ -0,0 +1,5 @@
+%{module: C3.Facts.Dump,
+ version: 1}
+replace {Ratio, :is_a, :module}
+replace {Ratio, :symbol, Ratio.cast}
+replace {Ratio.cast, :cfn, cfn Ratio "ratio_init_cast" (Result, Tag)}
diff --git a/libc3/ratio.c b/libc3/ratio.c
index 7da0ad5..1a0b8da 100644
--- a/libc3/ratio.c
+++ b/libc3/ratio.c
@@ -141,6 +141,49 @@ s_ratio * ratio_init_1 (s_ratio *q, const char *p)
return q;
}
+s_ratio * ratio_init_cast (s_ratio *c, const s_tag *src)
+{
+ assert(c);
+ assert(src);
+ switch (src->type) {
+ case TAG_F32:
+ return ratio_init_f32(c, src->data.f32);
+ case TAG_F64:
+ return ratio_init_f64(c, src->data.f64);
+ case TAG_F128:
+ return ratio_init_f128(c, src->data.f128);
+ case TAG_INTEGER:
+ return ratio_init_integer(c, &src->data.integer);
+ case TAG_RATIO:
+ return ratio_init_copy(c, &src->data.ratio);
+ case TAG_SW:
+ return ratio_init_sw(c, src->data.sw);
+ case TAG_S64:
+ return ratio_init_s64(c, src->data.s64);
+ case TAG_S32:
+ return ratio_init_s32(c, src->data.s32);
+ case TAG_S16:
+ return ratio_init_s16(c, src->data.s16);
+ case TAG_S8:
+ return ratio_init_s8(c, src->data.s8);
+ case TAG_U8:
+ return ratio_init_u8(c, src->data.u8);
+ case TAG_U16:
+ return ratio_init_u16(c, src->data.u16);
+ case TAG_U32:
+ return ratio_init_u32(c, src->data.u32);
+ case TAG_U64:
+ return ratio_init_u64(c, src->data.u64);
+ case TAG_UW:
+ return ratio_init_uw(c, src->data.uw);
+ default:
+ break;
+ }
+ err_puts("ratio_init_cast: invalid tag type");
+ assert(! "ratio_init_cast: invalid tag type");
+ return NULL;
+}
+
s_ratio * ratio_init_copy (s_ratio *dest, const s_ratio *src)
{
s_ratio tmp = {0};
diff --git a/libc3/sym.c b/libc3/sym.c
index 8837f9e..d24bd85 100644
--- a/libc3/sym.c
+++ b/libc3/sym.c
@@ -499,6 +499,10 @@ bool sym_must_clean (const s_sym *sym, bool *must_clean)
*must_clean = true;
return true;
}
+ if (sym == &g_sym_Ratio) {
+ *must_clean = true;
+ return true;
+ }
if (sym == &g_sym_S8) {
*must_clean = false;
return true;
@@ -665,6 +669,10 @@ bool sym_to_ffi_type (const s_sym *sym, ffi_type *result_type,
*dest = &ffi_type_pointer;
return true;
}
+ if (sym == &g_sym_Ratio) {
+ *dest = &ffi_type_pointer;
+ return true;
+ }
if (sym == &g_sym_S8) {
*dest = &ffi_type_sint8;
return true;
@@ -807,6 +815,10 @@ bool sym_to_tag_type (const s_sym *sym, e_tag_type *dest)
*dest = TAG_QUOTE;
return true;
}
+ if (sym == &g_sym_Ratio) {
+ *dest = TAG_RATIO;
+ return true;
+ }
if (sym == &g_sym_S8) {
*dest = TAG_S8;
return true;
@@ -962,6 +974,10 @@ bool sym_type_size (const s_sym *type, uw *dest)
*dest = sizeof(s_quote);
return true;
}
+ if (type == &g_sym_Ratio) {
+ *dest = sizeof(s_ratio);
+ return true;
+ }
if (type == &g_sym_S8) {
*dest = sizeof(s8);
return true;