Commit 7658ee77cdccc2646d12a845b16031f056ecc451
2024-03-01T18:13:56
replaced integers_clean by ratio_clean
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
diff --git a/libc3/ratio.c b/libc3/ratio.c
index 2460cd5..6143f42 100644
--- a/libc3/ratio.c
+++ b/libc3/ratio.c
@@ -37,29 +37,25 @@ s_ratio * ratio_add (const s_ratio *a, const s_ratio *b, s_ratio *dest)
return NULL;
}
if (! integer_mul(&a->numerator, &b->denominator, &i)) {
- integer_clean(&tmp.numerator);
- integer_clean(&tmp.denominator);
+ ratio_clean(&tmp);
return NULL;
}
if (! integer_mul(&b->numerator, &a->denominator, &j)) {
integer_clean(&i);
- integer_clean(&tmp.numerator);
- integer_clean(&tmp.denominator);
+ ratio_clean(&tmp);
return NULL;
}
if (! integer_add(&i, &j, &tmp.numerator)) {
integer_clean(&i);
integer_clean(&j);
- integer_clean(&tmp.numerator);
- integer_clean(&tmp.denominator);
+ ratio_clean(&tmp);
return NULL;
}
if (! integer_mul(&a->denominator, &b->denominator,
&tmp.denominator)) {
integer_clean(&i);
integer_clean(&j);
- integer_clean(&tmp.numerator);
- integer_clean(&tmp.denominator);
+ ratio_clean(&tmp);
return NULL;
}
integer_clean(&i);
@@ -107,31 +103,32 @@ s_ratio * ratio_init (s_ratio *dest)
return dest;
}
-s_ratio * ratio_init_1 (s_ratio *r, const char *p)
+s_ratio * ratio_init_1 (s_ratio *q, const char *p)
{
s_buf buf;
uw len;
- sw r_val;
+ sw r;
s_ratio tmp;
- assert(r);
- if (!p)
- return r;
+ assert(q);
+ assert(p);
+ if (! p)
+ return NULL;
len = strlen(p);
buf_init(&buf, false, len, (char *) p); // buf is read-only
buf.wpos = len;
- r_val = buf_parse_ratio(&buf, &tmp);
- if (r_val < 0 || (uw) r_val != len) {
+ r = buf_parse_ratio(&buf, &tmp);
+ if (r < 0 || (uw) r != len) {
err_write_1("invalid ratio: \"");
err_write_1(p);
err_write_1("\", ");
err_inspect_uw(&len);
err_write_1(" != ");
- err_inspect_sw(&r_val);
+ err_inspect_sw(&r);
assert(! "invalid ratio");
return NULL;
}
- ratio_init_integer(r, &tmp.numerator, &tmp.denominator);
- return r;
+ ratio_init_integer(q, &tmp.numerator, &tmp.denominator);
+ return q;
}
s_ratio * ratio_init_copy (s_ratio *dest, const s_ratio *src)
@@ -265,18 +262,15 @@ s_ratio * ratio_simplify (s_ratio *r, s_ratio *dest)
return NULL;
}
if (! integer_gcd(&r->numerator, &r->denominator, &gcd)) {
- integer_clean(&tmp.numerator);
- integer_clean(&tmp.denominator);
+ ratio_clean(&tmp);
return NULL;
}
if (! integer_div(&r->numerator, &gcd, &tmp.numerator)) {
- integer_clean(&tmp.numerator);
- integer_clean(&tmp.denominator);
+ ratio_clean(&tmp);
return NULL;
}
if (! integer_div(&r->denominator, &gcd, &tmp.denominator)) {
- integer_clean(&tmp.numerator);
- integer_clean(&tmp.denominator);
+ ratio_clean(&tmp);
return NULL;
}
integer_clean(&gcd);
diff --git a/libc3/ratio.h b/libc3/ratio.h
index 241d161..570e055 100644
--- a/libc3/ratio.h
+++ b/libc3/ratio.h
@@ -23,7 +23,7 @@ s_ratio * ratio_init (s_ratio *dest);
s_ratio * ratio_init_integer (s_ratio *r, s_integer *numerator,
s_integer *denominator);
s_ratio * ratio_init_zero (s_ratio *r);
-s_ratio * ratio_init_1 (s_ratio *r, const char *p);
+s_ratio * ratio_init_1 (s_ratio *q, const char *p);
s_ratio * ratio_init_copy (s_ratio *a, const s_ratio *x);
s_ratio * ratio_init_f32 (s_ratio *a, f32 x);
s_ratio * ratio_init_f64 (s_ratio *a, f64 x);