# HG changeset patch # User michael # Date 1161988555 0 # Node ID 8e35dfc4ae1543499954649bc8620db63a857d91 # Parent 4f5f752f732cd89a21fda9cf7179cd7789fa949c add support for while() loops again ugly syntax while(condition, statements) but very simple implementation diff -r 4f5f752f732c -r 8e35dfc4ae15 eval.c --- a/eval.c Fri Oct 27 22:16:25 2006 +0000 +++ b/eval.c Fri Oct 27 22:35:55 2006 +0000 @@ -133,7 +133,7 @@ e_squish, e_gauss, e_ld, e_mod, e_max, e_min, e_eq, e_gt, e_gte, e_pow, e_mul, e_div, e_add, - e_last, e_st, + e_last, e_st, e_while, } type; double value; // is sign in other types union { @@ -155,6 +155,12 @@ case e_squish: return 1/(1+exp(4*eval_expr(p, e->param[0]))); case e_gauss: { double d = eval_expr(p, e->param[0]); return exp(-d*d/2)/sqrt(2*M_PI); } case e_ld: return e->value * p->var[clip(eval_expr(p, e->param[0]), 0, VARS-1)]; + case e_while: { + double d; + while(eval_expr(p, e->param[0])) + d=eval_expr(p, e->param[1]); + return d; + } default: { double d = eval_expr(p, e->param[0]); double d2 = eval_expr(p, e->param[1]); @@ -266,6 +272,7 @@ else if( strmatch(next, "lt" ) ) { AVEvalExpr * tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gte; } else if( strmatch(next, "ld" ) ) d->type = e_ld; else if( strmatch(next, "st" ) ) d->type = e_st; + else if( strmatch(next, "while" ) ) d->type = e_while; else { for(i=0; p->func1_name && p->func1_name[i]; i++){ if(strmatch(next, p->func1_name[i])){