From 7319f5e772b18fac59563abb2b7edf2d33c7e00c Mon Sep 17 00:00:00 2001 From: mfranz Date: Tue, 20 Mar 2007 16:23:23 +0000 Subject: [PATCH] better condition() comment & cosmetics --- Nasal/props.nas | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Nasal/props.nas b/Nasal/props.nas index a951c8418..59eb084b0 100644 --- a/Nasal/props.nas +++ b/Nasal/props.nas @@ -186,8 +186,9 @@ var setAll = func { ## # Evaluates a property branch according to the rules -# set out in $FG_ROOT/Docs/README.condition. Undefined conditions -# are true. +# set out in $FG_ROOT/Docs/README.conditions. Undefined conditions +# and a nil argument are "true". The function dumps the condition +# branch and returns nil on error. # var condition = func(p) { if(p == nil) { return 1; } @@ -211,9 +212,9 @@ var _cond_or = func(p) { var _cond = func(p) { var n = p.getName(); - if(n == "not") { return !_cond_and(p); } - if(n == "and") { return _cond_and(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"); }