*/
/**
- * @file eval.c
+ * @file libavcodec/eval.c
* simple arithmetic expression evaluator.
*
* see http://joe.hotchkiss.com/programming/eval/eval.html
*/
-#include "avcodec.h"
-#include "eval.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#ifndef NAN
- #define NAN 0.0/0.0
-#endif
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
+#include "libavutil/mathematics.h"
+#include "avcodec.h"
+#include "eval.h"
typedef struct Parser{
int stack_index;
char *s;
- double *const_value;
- const char **const_name; // NULL terminated
+ const double *const_value;
+ const char * const *const_name; // NULL terminated
double (**func1)(void *, double a); // NULL terminated
const char **func1_name; // NULL terminated
double (**func2)(void *, double a, double b); // NULL terminated
- char **func2_name; // NULL terminated
+ const char **func2_name; // NULL terminated
void *opaque;
const char **error;
#define VARS 10
['Y'-'E']= 24,
};
-/** strtod() function extended with 'k', 'M', 'G', 'ki', 'Mi', 'Gi' and 'B'
- * postfixes. This allows using f.e. kB, MiB, G and B as a postfix. This
- * function assumes that the unit of numbers is bits not bytes.
- */
-static double av_strtod(const char *name, char **tail) {
+double av_strtod(const char *numstr, char **tail) {
double d;
char *next;
- d = strtod(name, &next);
+ d = strtod(numstr, &next);
/* if parsing succeeded, check for and interpret postfixes */
- if (next!=name) {
+ if (next!=numstr) {
if(*next >= 'E' && *next <= 'z'){
int e= si_prefixes[*next - 'E'];
char *next= p->s;
int i;
+ if (!d)
+ return NULL;
+
/* number */
d->value = av_strtod(p->s, &next);
if(next != p->s){
static AVEvalExpr * new_eval_expr(int type, int value, AVEvalExpr *p0, AVEvalExpr *p1){
AVEvalExpr * e = av_mallocz(sizeof(AVEvalExpr));
+ if (!e)
+ return NULL;
e->type =type ;
e->value =value ;
e->param[0] =p0 ;
while(p->s[0]=='^'){
p->s++;
e= new_eval_expr(e_pow, 1, e, parse_pow(p, &sign2));
+ if (!e)
+ return NULL;
if (e->param[1]) e->param[1]->value *= (sign2|1);
}
if (e) e->value *= (sign|1);
while(p->s[0]=='*' || p->s[0]=='/'){
int c= *p->s++;
e= new_eval_expr(c == '*' ? e_mul : e_div, 1, e, parse_factor(p));
+ if (!e)
+ return NULL;
}
return e;
}
AVEvalExpr * e = parse_term(p);
while(*p->s == '+' || *p->s == '-') {
e= new_eval_expr(e_add, 1, e, parse_term(p));
+ if (!e)
+ return NULL;
};
return e;
while(*p->s == ';') {
p->s++;
e= new_eval_expr(e_last, 1, e, parse_subexpr(p));
+ if (!e)
+ return NULL;
};
p->stack_index++;
}
}
-AVEvalExpr * ff_parse(const char *s, const char **const_name,
+AVEvalExpr * ff_parse(const char *s, const char * const *const_name,
double (**func1)(void *, double), const char **func1_name,
- double (**func2)(void *, double, double), char **func2_name,
+ double (**func2)(void *, double, double), const char **func2_name,
const char **error){
Parser p;
- AVEvalExpr * e;
- char w[strlen(s) + 1], * wp = w;
+ AVEvalExpr *e = NULL;
+ char *w = av_malloc(strlen(s) + 1);
+ char *wp = w;
+
+ if (!w)
+ goto end;
while (*s)
if (!isspace(*s++)) *wp++ = s[-1];
e = parse_expr(&p);
if (!verify_expr(e)) {
ff_eval_free(e);
- return NULL;
+ e = NULL;
}
+end:
+ av_free(w);
return e;
}
-double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque) {
+double ff_parse_eval(AVEvalExpr * e, const double *const_value, void *opaque) {
Parser p;
p.const_value= const_value;
return eval_expr(&p, e);
}
-double ff_eval2(const char *s, double *const_value, const char **const_name,
+double ff_eval2(const char *s, const double *const_value, const char * const *const_name,
double (**func1)(void *, double), const char **func1_name,
- double (**func2)(void *, double, double), char **func2_name,
+ double (**func2)(void *, double, double), const char **func2_name,
void *opaque, const char **error){
AVEvalExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error);
double d;