fly/fgdata
1
0
Fork 0
Code Activity

make condition() slightly faster and prettier (or not)

Browse source
This commit is contained in:
mfranz 2007-03-21 18:37:06 +00:00
parent 54693a663f
commit 0606fa3703
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Nasal/props.nas
View file

@ -215,12 +215,12 @@ var _cond = func(p) {
if(n == "or") { return _cond_or(p); }
if(n == "and") { return _cond_and(p); }
if(n == "not") { return !_cond_and(p); }
if(n == "equals") { return _cond_cmp(p, "EQ"); }
if(n == "not-equals") { return !_cond_cmp(p, "EQ"); }
if(n == "less-than") { return _cond_cmp(p, "LT"); }
if(n == "greater-than") { return _cond_cmp(p, "GT"); }
if(n == "less-than-equals") { return !_cond_cmp(p, "GT"); }
if(n == "greater-than-equals") { return !_cond_cmp(p, "LT"); }
if(n == "equals") { return _cond_cmp(p, 0); }
if(n == "not-equals") { return !_cond_cmp(p, 0); }
if(n == "less-than") { return _cond_cmp(p, -1); }
if(n == "greater-than") { return _cond_cmp(p, 1); }
if(n == "less-than-equals") { return !_cond_cmp(p, 1); }
if(n == "greater-than-equals") { return !_cond_cmp(p, -1); }
if(n == "property") { return !!getprop(p.getValue()); }
printlog("alert", "condition: invalid operator ", n);
dump(p);
@ -251,7 +251,9 @@ var _cond_cmp = func(p, op) {
dump(p);
return nil;
}
return op == "LT" ? left < right : op == "GT" ? left > right : left == right;
if(op < 0) { return left < right; }
if(op > 0) { return left > right; }
return left == right;
}