Commit a736cc170aa4f13fc5e79e6d1cf1e7fc4ec978a1
2024-03-05T20:23:53
x +i y
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 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365
diff --git a/.ic3_history b/.ic3_history
index 450cb65..1f0d452 100644
--- a/.ic3_history
+++ b/.ic3_history
@@ -1,26 +1,3 @@
-m("Quentin")
-if true 1 :else 2
-quote if true 1 :else 2
-if true 1
-quote if true 1
-2 3 4 5 6 7 8
-1
-if_then_else 1 2 3
-if_then_else true 2 3
-if_then_else false 2 3
-if
-1 2 3
-4
-if true 1 :else 2
-if
-true
-1 :else 2
-if
-true 1 :else 2
-if true 1 :else 2
-if true 1 :else
-2
-if true 1
C3.if
1 2 3 4
i = C3.if
@@ -97,3 +74,26 @@ sqrt(-1)
1 +i 1 + (2 +i 2)
1 +i 1 * (2 +i 2)
(1 +i 1) * (2 +i 2)
+0.5
+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
+3 +i 2 + 1
+3 +i 2 + 2
+3 +i 2 + 2 +i 3
+3 +i 2 + 2 +i 3 +i 1
+3 +i 2 + 2 +i 3 +i 1 + 2
+3 +i 2 + 2 +i 3 +i 1 + 1
diff --git a/libc3/complex.c b/libc3/complex.c
index fac6bdd..5ccb6aa 100644
--- a/libc3/complex.c
+++ b/libc3/complex.c
@@ -19,6 +19,29 @@
#include "tag.h"
#include "tag_init.h"
+#define DEF_COMPLEX_INIT(type) \
+ s_complex * complex_init_ ## type (s_complex *c, type src) \
+ { \
+ assert(c); \
+ tag_init_ ## type(&c->x, src); \
+ tag_init_u8(&c->y, 0); \
+ return c; \
+ }
+
+DEF_COMPLEX_INIT(f32)
+DEF_COMPLEX_INIT(f64)
+DEF_COMPLEX_INIT(f128)
+DEF_COMPLEX_INIT(s8)
+DEF_COMPLEX_INIT(s16)
+DEF_COMPLEX_INIT(s32)
+DEF_COMPLEX_INIT(s64)
+DEF_COMPLEX_INIT(sw)
+DEF_COMPLEX_INIT(u8)
+DEF_COMPLEX_INIT(u16)
+DEF_COMPLEX_INIT(u32)
+DEF_COMPLEX_INIT(u64)
+DEF_COMPLEX_INIT(uw)
+
s_complex * complex_add (const s_complex *a, const s_complex *b,
s_complex *dest)
{
@@ -90,6 +113,51 @@ s_complex * complex_init (s_complex *c)
return c;
}
+s_complex * complex_init_cast (s_complex *c, const s_tag *src)
+{
+ assert(c);
+ assert(src);
+ switch (src->type) {
+ case TAG_COMPLEX:
+ return complex_init_copy(c, src->data.complex);
+ case TAG_F32:
+ return complex_init_f32(c, src->data.f32);
+ case TAG_F64:
+ return complex_init_f64(c, src->data.f64);
+ case TAG_F128:
+ return complex_init_f128(c, src->data.f128);
+ case TAG_INTEGER:
+ return complex_init_integer(c, &src->data.integer);
+ case TAG_RATIO:
+ return complex_init_ratio(c, &src->data.ratio);
+ case TAG_SW:
+ return complex_init_sw(c, src->data.sw);
+ case TAG_S64:
+ return complex_init_s64(c, src->data.s64);
+ case TAG_S32:
+ return complex_init_s32(c, src->data.s32);
+ case TAG_S16:
+ return complex_init_s16(c, src->data.s16);
+ case TAG_S8:
+ return complex_init_s8(c, src->data.s8);
+ case TAG_U8:
+ return complex_init_u8(c, src->data.u8);
+ case TAG_U16:
+ return complex_init_u16(c, src->data.u16);
+ case TAG_U32:
+ return complex_init_u32(c, src->data.u32);
+ case TAG_U64:
+ return complex_init_u64(c, src->data.u64);
+ case TAG_UW:
+ return complex_init_uw(c, src->data.uw);
+ default:
+ break;
+ }
+ err_puts("complex_init_cast: invalid tag type");
+ assert(! "complex_init_cast: invalid tag type");
+ return NULL;
+}
+
s_complex * complex_init_copy (s_complex *c, const s_complex *src)
{
assert(c);
@@ -99,6 +167,22 @@ s_complex * complex_init_copy (s_complex *c, const s_complex *src)
return c;
}
+s_complex * complex_init_integer (s_complex *c, const s_integer *src)
+{
+ assert(c);
+ tag_init_integer_copy(&c->x, src);
+ tag_init_u8(&c->y, 0);
+ return c;
+}
+
+s_complex * complex_init_ratio (s_complex *c, const s_ratio *src)
+{
+ assert(c);
+ tag_init_ratio_copy(&c->x, src);
+ tag_init_u8(&c->y, 0);
+ return c;
+}
+
s_complex * complex_mul (const s_complex *a, const s_complex *b,
s_complex *dest)
{
diff --git a/libc3/complex.h b/libc3/complex.h
index 9fe4424..4d2aeff 100644
--- a/libc3/complex.h
+++ b/libc3/complex.h
@@ -17,13 +17,28 @@
#include <stdio.h>
#include "types.h"
-/* Stack allocation compatible functions */
+/* Stack-allocation compatible functions, call complex_clean
+ after use. */
+void complex_clean (s_complex *c);
s_complex * complex_init (s_complex *c);
s_complex * complex_init_1 (s_complex *c, const s8 *p);
-s_complex * complex_init_copy (s_complex *a, const s_complex *x);
-s_complex * complex_init_f32 (s_complex *a, f32 x, f32 y);
-s_complex * complex_init_f64 (s_complex *a, f64 x, f64 y);
-void complex_clean (s_complex *c);
+s_complex * complex_init_cast (s_complex *c, const s_tag *src);
+s_complex * complex_init_copy (s_complex *c, const s_complex *src);
+s_complex * complex_init_f32 (s_complex *c, f32 src);
+s_complex * complex_init_f64 (s_complex *c, f64 src);
+s_complex * complex_init_f128 (s_complex *c, f128 src);
+s_complex * complex_init_integer (s_complex *c, const s_integer *src);
+s_complex * complex_init_ratio (s_complex *c, const s_ratio *src);
+s_complex * complex_init_s8 (s_complex *c, s8 src);
+s_complex * complex_init_s16 (s_complex *c, s16 src);
+s_complex * complex_init_s32 (s_complex *c, s32 src);
+s_complex * complex_init_s64 (s_complex *c, s64 src);
+s_complex * complex_init_sw (s_complex *c, sw src);
+s_complex * complex_init_u8 (s_complex *c, u8 src);
+s_complex * complex_init_u16 (s_complex *c, u16 src);
+s_complex * complex_init_u32 (s_complex *c, u32 src);
+s_complex * complex_init_u64 (s_complex *c, u64 src);
+s_complex * complex_init_uw (s_complex *c, uw src);
/* Setters */
s_complex * complex_set_double (s_complex *a, double x, double y);
diff --git a/libc3/tag_add.c b/libc3/tag_add.c
index c2bfb9e..4fb43b1 100644
--- a/libc3/tag_add.c
+++ b/libc3/tag_add.c
@@ -18,6 +18,7 @@
s_tag * tag_add (const s_tag *a, const s_tag *b, s_tag *dest)
{
+ s_complex c;
s_integer tmp;
s_integer tmp2;
assert(a);
@@ -29,12 +30,79 @@ s_tag * tag_add (const s_tag *a, const s_tag *b, s_tag *dest)
case TAG_COMPLEX:
return tag_init_complex(dest, complex_new_add(a->data.complex,
b->data.complex));
+ case TAG_F32:
+ complex_init_f32(&c, b->data.f32);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_F64:
+ complex_init_f64(&c, b->data.f64);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_F128:
+ complex_init_f128(&c, b->data.f128);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_INTEGER:
+ if (! complex_init_integer(&c, &b->data.integer))
+ return NULL;
+ if (! tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c))) {
+
+ complex_clean(&c);
+ return NULL;
+ }
+ complex_clean(&c);
+ return dest;
+ case TAG_S8:
+ complex_init_s8(&c, b->data.s8);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_S16:
+ complex_init_s16(&c, b->data.s16);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_S32:
+ complex_init_s32(&c, b->data.s32);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_S64:
+ complex_init_s64(&c, b->data.s64);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_SW:
+ complex_init_sw(&c, b->data.sw);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_U8:
+ complex_init_u8(&c, b->data.u8);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_U16:
+ complex_init_u16(&c, b->data.u16);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_U32:
+ complex_init_u32(&c, b->data.u32);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_U64:
+ complex_init_u64(&c, b->data.u64);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
+ case TAG_UW:
+ complex_init_uw(&c, b->data.uw);
+ return tag_init_complex(dest, complex_new_add(a->data.complex,
+ &c));
default:
break;
}
break;
case TAG_F32:
switch (b->type) {
+ case TAG_COMPLEX:
+ complex_init_f32(&c, a->data.f32);
+ return tag_init_complex(dest, complex_new_add(&c,
+ b->data.complex));
case TAG_F32:
return tag_init_f32(dest, a->data.f32 + b->data.f32);
case TAG_F64:
@@ -99,6 +167,16 @@ s_tag * tag_add (const s_tag *a, const s_tag *b, s_tag *dest)
}
case TAG_INTEGER:
switch (b->type) {
+ case TAG_COMPLEX:
+ if (! complex_init_integer(&c, &a->data.integer))
+ return NULL;
+ if (! tag_init_complex(dest, complex_new_add(&c,
+ b->data.complex))) {
+ complex_clean(&c);
+ return NULL;
+ }
+ complex_clean(&c);
+ return dest;
case TAG_F32:
return tag_init_f32(dest, (f32) integer_to_f64(&a->data.integer) +
b->data.f32);
diff --git a/libc3/tag_addi.c b/libc3/tag_addi.c
index f34f23e..14eddd8 100644
--- a/libc3/tag_addi.c
+++ b/libc3/tag_addi.c
@@ -12,27 +12,41 @@
*/
#include "alloc.h"
#include "assert.h"
+#include "complex.h"
#include "tag.h"
s_tag * tag_addi (const s_tag *a, const s_tag *b, s_tag *dest)
{
s_complex *c;
+ s_complex ca = {0};
+ s_complex cb = {0};
assert(a);
assert(b);
assert(dest);
c = alloc(sizeof(s_complex));
if (! c)
return NULL;
- if (! tag_init_copy(&c->x, a)) {
+ if (! complex_init_cast(&ca, a)) {
free(c);
return NULL;
}
- if (! tag_init_copy(&c->y, b)) {
+ if (! complex_init_cast(&cb, b)) {
+ complex_clean(&ca);
+ free(c);
+ return NULL;
+ }
+ if (! tag_sub(&ca.x, &cb.y, &c->x)) {
+ complex_clean(&cb);
+ complex_clean(&ca);
+ free(c);
+ return NULL;
+ }
+ if (! tag_add(&ca.y, &cb.x, &c->y)) {
tag_clean(&c->x);
+ complex_clean(&cb);
+ complex_clean(&ca);
free(c);
return NULL;
}
- dest->type = TAG_COMPLEX;
- dest->data.complex = c;
- return dest;
+ return tag_init_complex(dest, c);
}