aboutsummaryrefslogtreecommitdiff
path: root/externals/extra/expr~
diff options
context:
space:
mode:
Diffstat (limited to 'externals/extra/expr~')
-rw-r--r--externals/extra/expr~/vexp.c28
-rw-r--r--externals/extra/expr~/vexp.h6
-rw-r--r--externals/extra/expr~/vexp_fun.c242
-rw-r--r--externals/extra/expr~/vexp_if.c12
4 files changed, 144 insertions, 144 deletions
diff --git a/externals/extra/expr~/vexp.c b/externals/extra/expr~/vexp.c
index 732944de..8f8ff46c 100644
--- a/externals/extra/expr~/vexp.c
+++ b/externals/extra/expr~/vexp.c
@@ -97,10 +97,10 @@ struct ex_ex *eval_store(struct expr *expr, struct ex_ex *eptr,
struct ex_ex *eval_sigidx(struct expr *expr, struct ex_ex *eptr,
struct ex_ex *optr, int i);
static int cal_sigidx(struct ex_ex *optr, /* The output value */
- int i, float rem_i, /* integer and fractinal part of index */
+ int i, t_float rem_i, /* integer and fractinal part of index */
int idx, /* index of current fexpr~ processing */
int vsize, /* vector size */
- float *curvec, float *prevec); /* current and previous table */
+ t_float *curvec, t_float *prevec); /* current and previous table */
t_ex_func *find_func(char *s);
void ex_dzdetect(struct expr *expr);
@@ -691,7 +691,7 @@ case ET_INT: \
case ET_INT: \
if (optr->ex_type == ET_VEC) { \
op = optr->ex_vec; \
- scalar = (float)DZC(left.ex_int, OPR, right.ex_int); \
+ scalar = (t_float)DZC(left.ex_int, OPR, right.ex_int); \
for (j = 0; j < expr->exp_vsize; j++) \
*op++ = scalar; \
} else { \
@@ -702,12 +702,12 @@ case ET_INT: \
case ET_FLT: \
if (optr->ex_type == ET_VEC) { \
op = optr->ex_vec; \
- scalar = DZC(((float)left.ex_int), OPR, right.ex_flt);\
+ scalar = DZC(((t_float)left.ex_int), OPR, right.ex_flt);\
for (j = 0; j < expr->exp_vsize; j++) \
*op++ = scalar; \
} else { \
optr->ex_type = ET_FLT; \
- optr->ex_flt = DZC(((float)left.ex_int), OPR, \
+ optr->ex_flt = DZC(((t_float)left.ex_int), OPR, \
right.ex_flt); \
} \
break; \
@@ -743,7 +743,7 @@ case ET_FLT: \
case ET_INT: \
if (optr->ex_type == ET_VEC) { \
op = optr->ex_vec; \
- scalar = DZC((float) left.ex_flt, OPR, right.ex_int); \
+ scalar = DZC((t_float) left.ex_flt, OPR, right.ex_int); \
for (j = 0; j < expr->exp_vsize; j++) \
*op++ = scalar; \
} else { \
@@ -854,7 +854,7 @@ break;
switch(left.ex_type) { \
case ET_INT: \
if (optr->ex_type == ET_VEC) { \
- ex_mkvector(optr->ex_vec,(float)(OPR left.ex_int),\
+ ex_mkvector(optr->ex_vec,(t_float)(OPR left.ex_int),\
expr->exp_vsize);\
break; \
} \
@@ -960,7 +960,7 @@ ex_eval(struct expr *expr, struct ex_ex *eptr, struct ex_ex *optr, int idx)
switch (eptr->ex_type) {
case ET_INT:
if (optr->ex_type == ET_VEC)
- ex_mkvector(optr->ex_vec, (float) eptr->ex_int,
+ ex_mkvector(optr->ex_vec, (t_float) eptr->ex_int,
expr->exp_vsize);
else
*optr = *eptr;
@@ -1407,7 +1407,7 @@ eval_sigidx(struct expr *expr, struct ex_ex *eptr, struct ex_ex *optr, int idx)
struct ex_ex arg;
struct ex_ex *reteptr;
int i = 0, j = 0;
- float fi = 0, /* index in float */
+ t_float fi = 0, /* index in float */
rem_i = 0; /* remains of the float */
char *tbl;
@@ -1504,10 +1504,10 @@ eval_sigidx(struct expr *expr, struct ex_ex *eptr, struct ex_ex *optr, int idx)
*/
static int
cal_sigidx(struct ex_ex *optr, /* The output value */
- int i, float rem_i, /* integer and fractinal part of index */
+ int i, t_float rem_i,/* integer and fractinal part of index */
int idx, /* index of current fexpr~ processing */
int vsize, /* vector size */
- float *curvec, float *prevec) /* current and previous table */
+ t_float *curvec, t_float *prevec) /* current and previous table */
{
int n;
@@ -1873,8 +1873,8 @@ atoif(char *s, long int *value, long int *type)
char *p;
long int_val = 0;
int flt = 0;
- float pos = 0;
- float flt_val = 0;
+ t_float pos = 0;
+ t_float flt_val = 0;
int base = 10;
p = s;
@@ -1940,7 +1940,7 @@ atoif(char *s, long int *value, long int *type)
default:
if (flt) {
*type = ET_FLT;
- *((float *) value) = flt_val;
+ *((t_float *) value) = flt_val;
} else {
*type = ET_INT;
*value = int_val;
diff --git a/externals/extra/expr~/vexp.h b/externals/extra/expr~/vexp.h
index d096842f..df5547ea 100644
--- a/externals/extra/expr~/vexp.h
+++ b/externals/extra/expr~/vexp.h
@@ -107,7 +107,7 @@ struct ex_ex;
struct ex_ex {
union {
long v_int;
- float v_flt;
+ t_float v_flt;
t_float *v_vec; /* this is an for allocated vector */
long op;
char *ptr;
@@ -206,10 +206,10 @@ typedef struct expr {
struct ex_ex exp_res[MAX_VARS]; /* the evluation result */
t_float *exp_p_var[MAX_VARS];
t_float *exp_p_res[MAX_VARS]; /* the previous evaluation result */
- t_float *exp_tmpres[MAX_VARS]; /* temporty result for fexpr~ */
+ t_float *exp_tmpres[MAX_VARS]; /* temporty result for fexpr~ */
int exp_vsize; /* the size of the signal vector */
int exp_nivec; /* # of vector inlets */
- float exp_f; /* control value to be transformed to signal */
+ t_float exp_f; /* control value to be transformed to signal */
} t_expr;
typedef struct ex_funcs {
diff --git a/externals/extra/expr~/vexp_fun.c b/externals/extra/expr~/vexp_fun.c
index 26b0b767..73c0b5c6 100644
--- a/externals/extra/expr~/vexp_fun.c
+++ b/externals/extra/expr~/vexp_fun.c
@@ -68,7 +68,7 @@
* the last argument is a pointer to a struct ex_ex for
* the result. Up do this point, the content of the
* struct ex_ex that these functions receive are either
- * ET_INT (long), ET_FLT (float), or ET_SYM (char **, it is
+ * ET_INT (long), ET_FLT (t_float), or ET_SYM (char **, it is
* char ** and not char * since NewHandle of Mac returns
* a char ** for relocatability.) The common practice in
* these functions is that they figure out the type of their
@@ -221,7 +221,7 @@ case ET_INT: \
case ET_INT: \
if (optr->ex_type == ET_VEC) { \
op = optr->ex_vec; \
- scalar = (float)func(leftfuncast left->ex_int, \
+ scalar = (t_float)func(leftfuncast left->ex_int, \
rightfuncast right->ex_int); \
j = e->exp_vsize; \
while (j--) \
@@ -229,7 +229,7 @@ case ET_INT: \
} else { \
if (fltret) { \
optr->ex_type = ET_FLT; \
- optr->ex_flt = (float)func(leftfuncast \
+ optr->ex_flt = (t_float)func(leftfuncast \
left->ex_int, rightfuncast right->ex_int); \
} else { \
optr->ex_type = ET_INT; \
@@ -241,14 +241,14 @@ case ET_INT: \
case ET_FLT: \
if (optr->ex_type == ET_VEC) { \
op = optr->ex_vec; \
- scalar = (float)func(leftfuncast left->ex_int, \
+ scalar = (t_float)func(leftfuncast left->ex_int, \
rightfuncast right->ex_flt); \
j = e->exp_vsize; \
while (j--) \
*op++ = scalar; \
} else { \
optr->ex_type = ET_FLT; \
- optr->ex_flt = (float)func(leftfuncast left->ex_int, \
+ optr->ex_flt = (t_float)func(leftfuncast left->ex_int, \
rightfuncast right->ex_flt); \
} \
break; \
@@ -268,7 +268,7 @@ case ET_INT: \
op = optr->ex_vec; \
j = e->exp_vsize; \
while (j--) { \
- *op++ = (float)func(leftfuncast scalar, \
+ *op++ = (t_float)func(leftfuncast scalar, \
rightfuncast *rp); \
rp++; \
} \
@@ -285,28 +285,28 @@ case ET_FLT: \
case ET_INT: \
if (optr->ex_type == ET_VEC) { \
op = optr->ex_vec; \
- scalar = (float)func(leftfuncast left->ex_flt, \
+ scalar = (t_float)func(leftfuncast left->ex_flt, \
rightfuncast right->ex_int); \
j = e->exp_vsize; \
while (j--) \
*op++ = scalar; \
} else { \
optr->ex_type = ET_FLT; \
- optr->ex_flt = (float)func(leftfuncast left->ex_flt, \
+ optr->ex_flt = (t_float)func(leftfuncast left->ex_flt, \
rightfuncast right->ex_int); \
} \
break; \
case ET_FLT: \
if (optr->ex_type == ET_VEC) { \
op = optr->ex_vec; \
- scalar = (float)func(leftfuncast left->ex_flt, \
+ scalar = (t_float)func(leftfuncast left->ex_flt, \
rightfuncast right->ex_flt); \
j = e->exp_vsize; \
while (j--) \
*op++ = scalar; \
} else { \
optr->ex_type = ET_FLT; \
- optr->ex_flt = (float)func(leftfuncast left->ex_flt, \
+ optr->ex_flt = (t_float)func(leftfuncast left->ex_flt, \
rightfuncast right->ex_flt); \
} \
break; \
@@ -326,7 +326,7 @@ case ET_FLT: \
op = optr->ex_vec; \
j = e->exp_vsize; \
while (j--) { \
- *op++ = (float)func(leftfuncast scalar, \
+ *op++ = (t_float)func(leftfuncast scalar, \
rightfuncast *rp); \
rp++; \
} \
@@ -356,7 +356,7 @@ case ET_VI: \
scalar = right->ex_int; \
j = e->exp_vsize; \
while (j--) { \
- *op++ = (float)func(leftfuncast *lp, \
+ *op++ = (t_float)func(leftfuncast *lp, \
rightfuncast scalar); \
lp++; \
} \
@@ -365,7 +365,7 @@ case ET_VI: \
scalar = right->ex_flt; \
j = e->exp_vsize; \
while (j--) { \
- *op++ = (float)func(leftfuncast *lp, \
+ *op++ = (t_float)func(leftfuncast *lp, \
rightfuncast scalar); \
lp++; \
} \
@@ -380,7 +380,7 @@ case ET_VI: \
* 8 times in each round to get a considerable \
* improvement \
*/ \
- *op++ = (float)func(leftfuncast *lp, \
+ *op++ = (t_float)func(leftfuncast *lp, \
rightfuncast *rp); \
rp++; lp++; \
} \
@@ -401,7 +401,7 @@ default: \
/*
* FUNC_EVAL_UNARY - evaluate a unary function,
- * if fltret is set return float
+ * if fltret is set return t_float
* otherwise return value based on regular typechecking,
*/
#define FUNC_EVAL_UNARY(left, func, leftcast, optr, fltret) \
@@ -409,12 +409,12 @@ switch(left->ex_type) { \
case ET_INT: \
if (optr->ex_type == ET_VEC) { \
ex_mkvector(optr->ex_vec, \
- (float)(func (leftcast left->ex_int)), e->exp_vsize);\
+ (t_float)(func (leftcast left->ex_int)), e->exp_vsize);\
break; \
} \
if (fltret) { \
optr->ex_type = ET_FLT; \
- optr->ex_flt = (float) func(leftcast left->ex_int); \
+ optr->ex_flt = (t_float) func(leftcast left->ex_int); \
break; \
} \
optr->ex_type = ET_INT; \
@@ -423,11 +423,11 @@ case ET_INT: \
case ET_FLT: \
if (optr->ex_type == ET_VEC) { \
ex_mkvector(optr->ex_vec, \
- (float)(func (leftcast left->ex_flt)), e->exp_vsize);\
+ (t_float)(func (leftcast left->ex_flt)), e->exp_vsize);\
break; \
} \
optr->ex_type = ET_FLT; \
- optr->ex_flt = (float) func(leftcast left->ex_flt); \
+ optr->ex_flt = (t_float) func(leftcast left->ex_flt); \
break; \
case ET_VI: \
case ET_VEC: \
@@ -440,7 +440,7 @@ case ET_VEC: \
lp = left->ex_vec; \
j = e->exp_vsize; \
while (j--) \
- *op++ = (float)(func (leftcast *lp++)); \
+ *op++ = (t_float)(func (leftcast *lp++)); \
break; \
default: \
post_error((fts_object_t *) e, \
@@ -458,9 +458,9 @@ static void \
ex_func(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)\
{ \
struct ex_ex *left, *right; \
- float *op; /* output pointer */ \
- float *lp, *rp; /* left and right vector pointers */ \
- float scalar; \
+ t_float *op; /* output pointer */ \
+ t_float *lp, *rp; /* left and right vector pointers */ \
+ t_float scalar; \
int j; \
\
left = argv++; \
@@ -474,9 +474,9 @@ static void \
ex_func(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)\
{ \
struct ex_ex *left; \
- float *op; /* output pointer */ \
- float *lp, *rp; /* left and right vector pointers */ \
- float scalar; \
+ t_float *op; /* output pointer */ \
+ t_float *lp, *rp; /* left and right vector pointers */ \
+ t_float scalar; \
int j; \
\
left = argv++; \
@@ -493,9 +493,9 @@ static void
ex_min(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left, *right;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -513,9 +513,9 @@ static void
ex_max(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left, *right;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -531,9 +531,9 @@ static void
ex_toint(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -561,9 +561,9 @@ static void
ex_rint(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -573,20 +573,20 @@ ex_rint(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
}
/*
- * ex_tofloat -- convert to float
+ * ex_tofloat -- convert to t_float
*/
static void
ex_tofloat(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
-#define tofloat(x) ((float)(x))
+#define tofloat(x) ((t_float)(x))
FUNC_EVAL_UNARY(left, tofloat, (int), optr, 1);
}
@@ -598,9 +598,9 @@ static void
ex_pow(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left, *right;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -615,9 +615,9 @@ static void
ex_sqrt(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -632,9 +632,9 @@ static void
ex_exp(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -649,9 +649,9 @@ static void
ex_log(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -666,9 +666,9 @@ static void
ex_ln(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -680,9 +680,9 @@ static void
ex_sin(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -694,9 +694,9 @@ static void
ex_cos(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -709,9 +709,9 @@ static void
ex_tan(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -723,9 +723,9 @@ static void
ex_asin(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -737,9 +737,9 @@ static void
ex_acos(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -752,9 +752,9 @@ static void
ex_atan(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -769,9 +769,9 @@ static void
ex_atan2(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left, *right;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -786,9 +786,9 @@ static void
ex_fmod(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left, *right;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -804,9 +804,9 @@ static void
ex_floor(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -821,9 +821,9 @@ static void
ex_ceil(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -834,9 +834,9 @@ static void
ex_sinh(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -848,9 +848,9 @@ static void
ex_cosh(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -863,9 +863,9 @@ static void
ex_tanh(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -879,9 +879,9 @@ static void
ex_asinh(t_expr *e, long argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -893,9 +893,9 @@ static void
ex_acosh(t_expr *e, long argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -907,9 +907,9 @@ static void
ex_atanh(t_expr *e, long argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -939,9 +939,9 @@ static void
ex_fact(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -961,9 +961,9 @@ static void
ex_random(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left, *right;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -976,9 +976,9 @@ static void
ex_abs(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float scalar;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float scalar;
int j;
left = argv++;
@@ -993,10 +993,10 @@ static void
ex_if(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
{
struct ex_ex *left, *right, *cond, *res;
- float *op; /* output pointer */
- float *lp, *rp; /* left and right vector pointers */
- float *cp; /* condition pointer */
- float leftvalue, rightvalue;
+ t_float *op; /* output pointer */
+ t_float *lp, *rp; /* left and right vector pointers */
+ t_float *cp; /* condition pointer */
+ t_float leftvalue, rightvalue;
int j;
cond = argv++;
@@ -1169,7 +1169,7 @@ ex_if(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
switch(res->ex_type) {
case ET_INT:
if (optr->ex_type == ET_VEC) {
- ex_mkvector(optr->ex_vec, (float)res->ex_int,
+ ex_mkvector(optr->ex_vec, (t_float)res->ex_int,
e->exp_vsize);
return;
}
@@ -1177,7 +1177,7 @@ ex_if(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
return;
case ET_FLT:
if (optr->ex_type == ET_VEC) {
- ex_mkvector(optr->ex_vec, (float)res->ex_flt,
+ ex_mkvector(optr->ex_vec, (t_float)res->ex_flt,
e->exp_vsize);
return;
}
diff --git a/externals/extra/expr~/vexp_if.c b/externals/extra/expr~/vexp_if.c
index aaaf4ef3..3028ff82 100644
--- a/externals/extra/expr~/vexp_if.c
+++ b/externals/extra/expr~/vexp_if.c
@@ -426,7 +426,7 @@ expr_perform(t_int *w)
if (x->exp_flags & EF_STOP) {
for (i = 0; i < x->exp_nexpr; i++)
memset(x->exp_res[i].ex_vec, 0,
- x->exp_vsize * sizeof (float));
+ x->exp_vsize * sizeof (t_float));
return (w + 2);
}
@@ -726,11 +726,11 @@ fexpr_tilde_clear(t_expr *x, t_symbol *s, int argc, t_atom *argv)
*/
if (!argc) {
for (i = 0; i < x->exp_nexpr; i++)
- memset(x->exp_p_res[i], 0, x->exp_vsize*sizeof(float));
+ memset(x->exp_p_res[i], 0, x->exp_vsize*sizeof(t_float));
for (i = 0; i < MAX_VARS; i++)
if (x->exp_var[i].ex_type == ET_XI)
memset(x->exp_p_var[i], 0,
- x->exp_vsize*sizeof(float));
+ x->exp_vsize*sizeof(t_float));
return;
}
if (argc > 1) {
@@ -760,7 +760,7 @@ fexpr_tilde_clear(t_expr *x, t_symbol *s, int argc, t_atom *argv)
post("fexpr~-clear: no signal at inlet %d", vecno + 1);
return;
}
- memset(x->exp_p_var[vecno], 0, x->exp_vsize*sizeof(float));
+ memset(x->exp_p_var[vecno], 0, x->exp_vsize*sizeof(t_float));
return;
case 'y':
if (!sx->s_name[1])
@@ -777,7 +777,7 @@ fexpr_tilde_clear(t_expr *x, t_symbol *s, int argc, t_atom *argv)
post("fexpr~.clear: only %d outlets", x->exp_nexpr);
return;
}
- memset(x->exp_p_res[vecno], 0, x->exp_vsize*sizeof(float));
+ memset(x->exp_p_res[vecno], 0, x->exp_vsize*sizeof(t_float));
return;
return;
default:
@@ -997,7 +997,7 @@ ex_sum(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)
t_garray *garray;
int size;
t_word *wvec;
- float sum;
+ t_float sum;
int indx;
if (argv->ex_type != ET_SYM)
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-03 08:47:15 +0000