[PD-cvs] pd/extra/expr~ vexp.c, 1.5.4.3, 1.5.4.4 vexp_fun.c, 1.4.4.3, 1.4.4.4 vexp_if.c, 1.5.4.3, 1.5.4.4
Thomas Grill
xovo at users.sourceforge.net
Wed Nov 30 14:57:11 CET 2005
Update of /cvsroot/pure-data/pd/extra/expr~
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28200/extra/expr~
Modified Files:
Tag: devel_0_39
vexp.c vexp_fun.c vexp_if.c
Log Message:
reverting Matju's cosmetic changes (see saved patch 1370034 in the patch tracker)
Index: vexp.c
===================================================================
RCS file: /cvsroot/pure-data/pd/extra/expr~/vexp.c,v
retrieving revision 1.5.4.3
retrieving revision 1.5.4.4
diff -C2 -d -r1.5.4.3 -r1.5.4.4
*** vexp.c 27 Nov 2005 08:15:27 -0000 1.5.4.3
--- vexp.c 30 Nov 2005 13:57:09 -0000 1.5.4.4
***************
*** 1254,1257 ****
--- 1254,1263 ----
/* the result pointer */
{
+ struct ex_ex arg;
+ int isvalue;
+ char *tbl = (char *) 0;
+ char *var = (char *) 0;
+ int badleft = 0;
+
post("store called\n");
ex_print(eptr);
***************
*** 1355,1358 ****
--- 1361,1365 ----
/* the result pointer */
{
+ struct ex_ex arg;
char *var = (char *) 0;
int novar = 0;
***************
*** 1400,1406 ****
struct ex_ex arg;
struct ex_ex *reteptr;
! int i = 0;
float fi = 0, /* index in float */
rem_i = 0; /* remains of the float */
arg.ex_type = 0;
arg.ex_int = 0;
--- 1407,1415 ----
struct ex_ex arg;
struct ex_ex *reteptr;
! int i = 0, j = 0;
float fi = 0, /* index in float */
rem_i = 0; /* remains of the float */
+ char *tbl;
+
arg.ex_type = 0;
arg.ex_int = 0;
Index: vexp_fun.c
===================================================================
RCS file: /cvsroot/pure-data/pd/extra/expr~/vexp_fun.c,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -C2 -d -r1.4.4.3 -r1.4.4.4
*** vexp_fun.c 27 Nov 2005 08:15:27 -0000 1.4.4.3
--- vexp_fun.c 30 Nov 2005 13:57:09 -0000 1.4.4.4
***************
*** 470,474 ****
! #define FUNC_DEF_UNARY(ex_func, func, cast, fltret) \
static void \
ex_func(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)\
--- 470,474 ----
! #define FUNC_DEF_UNARY(ex_func, func, cast, fltret); \
static void \
ex_func(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr)\
***************
*** 476,482 ****
struct ex_ex *left; \
float *op; /* output pointer */ \
! float *lp; /* left and right vector pointers */ \
int j; \
left = argv++; \
FUNC_EVAL_UNARY(left, func, cast, optr, fltret); \
}
--- 476,485 ----
struct ex_ex *left; \
float *op; /* output pointer */ \
! float *lp, *rp; /* left and right vector pointers */ \
! float scalar; \
int j; \
+ \
left = argv++; \
+ \
FUNC_EVAL_UNARY(left, func, cast, optr, fltret); \
}
***************
*** 530,534 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 533,538 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 559,563 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 563,568 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 576,580 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 581,586 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 611,615 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 617,622 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 627,631 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 634,639 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 643,647 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 651,656 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 659,663 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 668,673 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 672,676 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 682,687 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 685,689 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 696,701 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 699,703 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 711,716 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 712,716 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 725,730 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 725,729 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 739,744 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 739,743 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 754,759 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 790,794 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 806,811 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 806,810 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 823,828 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 818,822 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 836,841 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 831,835 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 850,855 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 845,849 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 865,870 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 860,864 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 881,886 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 873,877 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 895,900 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 886,890 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp; /* left and right vector pointers */
int j;
--- 909,914 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 917,921 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 941,946 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
***************
*** 953,957 ****
struct ex_ex *left;
float *op; /* output pointer */
! float *lp;
int j;
--- 978,983 ----
struct ex_ex *left;
float *op; /* output pointer */
! float *lp, *rp; /* left and right vector pointers */
! float scalar;
int j;
Index: vexp_if.c
===================================================================
RCS file: /cvsroot/pure-data/pd/extra/expr~/vexp_if.c,v
retrieving revision 1.5.4.3
retrieving revision 1.5.4.4
diff -C2 -d -r1.5.4.3 -r1.5.4.4
*** vexp_if.c 27 Nov 2005 08:15:27 -0000 1.5.4.3
--- vexp_if.c 30 Nov 2005 13:57:09 -0000 1.5.4.4
***************
*** 95,98 ****
--- 95,110 ----
}
+ static void
+ expr_flt(t_expr *x, t_float f, int in)
+ {
+ if (in > MAX_VARS)
+ return;
+
+ if (x->exp_var[in].ex_type == ET_FI)
+ x->exp_var[in].ex_flt = f;
+ else if (x->exp_var[in].ex_type == ET_II)
+ x->exp_var[in].ex_int = f;
+ }
+
static t_class *exprproxy_class;
***************
*** 708,712 ****
t_symbol *sx;
int vecno;
! int i;
/*
--- 720,724 ----
t_symbol *sx;
int vecno;
! int i, nargs;
/*
More information about the Pd-cvs
mailing list