eval: fix swapping of lt() and lte()

Max Lazarov committed 14 years ago

Commit caac3ab1 parent f30260d2 files · +5 −5Browse files

Unified · Split

2 files

@@ -279,8 +279,8 @@ static int parse_primary(AVExpr *e, Parser p) · 278 unmodified lines
279	279	else if (strmatch(next, "eq" )) d->type = e_eq;
280	280	else if (strmatch(next, "gte" )) d->type = e_gte;
281	281	else if (strmatch(next, "gt" )) d->type = e_gt;
282		− else if (strmatch(next, "lte" )) { AVExpr *tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gt; }
283		− else if (strmatch(next, "lt" )) { AVExpr *tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gte; }
	282	+ else if (strmatch(next, "lte" )) { AVExpr *tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gte; }
	283	+ else if (strmatch(next, "lt" )) { AVExpr *tmp = d->param[1]; d->param[1] = d->param[0]; d->param[0] = tmp; d->type = e_gt; }
284	284	else if (strmatch(next, "ld" )) d->type = e_ld;
285	285	else if (strmatch(next, "isnan" )) d->type = e_isnan;
286	286	else if (strmatch(next, "isinf" )) d->type = e_isinf;

@@ -95,16 +95,16 @@ Evaluating 'st(1, 123); ld(1)' · 94 unmodified lines
95	95	'st(1, 123); ld(1)' -> 123.000000
96	96
97	97	Evaluating 'st(0, 1); while(lte(ld(0), 100), st(1, ld(1)+ld(0));st(0, ld(0)+1)); ld(1)'
98		−'st(0, 1); while(lte(ld(0), 100), st(1, ld(1)+ld(0));st(0, ld(0)+1)); ld(1)' -> 4950.000000
	98	+'st(0, 1); while(lte(ld(0), 100), st(1, ld(1)+ld(0));st(0, ld(0)+1)); ld(1)' -> 5050.000000
99	99
100	100	Evaluating 'st(1, 1); st(2, 2); st(0, 1); while(lte(ld(0),10), st(3, ld(1)+ld(2)); st(1, ld(2)); st(2, ld(3)); st(0, ld(0)+1)); ld(3)'
101		−'st(1, 1); st(2, 2); st(0, 1); while(lte(ld(0),10), st(3, ld(1)+ld(2)); st(1, ld(2)); st(2, ld(3)); st(0, ld(0)+1)); ld(3)' -> 144.000000
	101	+'st(1, 1); st(2, 2); st(0, 1); while(lte(ld(0),10), st(3, ld(1)+ld(2)); st(1, ld(2)); st(2, ld(3)); st(0, ld(0)+1)); ld(3)' -> 233.000000
102	102
103	103	Evaluating 'while(0, 10)'
104	104	'while(0, 10)' -> nan
105	105
106	106	Evaluating 'st(0, 1); while(lte(ld(0),100), st(1, ld(1)+ld(0)); st(0, ld(0)+1))'
107		−'st(0, 1); while(lte(ld(0),100), st(1, ld(1)+ld(0)); st(0, ld(0)+1))' -> 100.000000
	107	+'st(0, 1); while(lte(ld(0),100), st(1, ld(1)+ld(0)); st(0, ld(0)+1))' -> 101.000000
108	108
109	109	Evaluating 'isnan(1)'
110	110	'isnan(1)' -> 0.000000

Keyboard shortcuts