From 18c3412b841b6dbd5c690c2df7c19fd2bc47f783 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Tue, 26 Mar 2002 07:51:38 +0000 Subject: [PATCH] Merge of Perforce change 1587: "if" was testing only the first element of simple expression. [SVN r13278] --- historic/jam/src/compile.c | 5 +---- jam_src/compile.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/historic/jam/src/compile.c b/historic/jam/src/compile.c index 398a6c0c1..bb172efda 100644 --- a/historic/jam/src/compile.c +++ b/historic/jam/src/compile.c @@ -163,10 +163,6 @@ compile_eval( switch( parse->num ) { - case EXPR_EXISTS: - if( ll && ll->string[0] ) status = 1; - break; - case EXPR_NOT: if( !ll ) status = 1; break; @@ -209,6 +205,7 @@ compile_eval( break; + case EXPR_EXISTS: if( lcmp( ll, L0 ) != 0 ) status = 1; break; case EXPR_EQUALS: if( lcmp( ll, lr ) == 0 ) status = 1; break; case EXPR_NOTEQ: if( lcmp( ll, lr ) != 0 ) status = 1; break; case EXPR_LESS: if( lcmp( ll, lr ) < 0 ) status = 1; break; diff --git a/jam_src/compile.c b/jam_src/compile.c index 398a6c0c1..bb172efda 100644 --- a/jam_src/compile.c +++ b/jam_src/compile.c @@ -163,10 +163,6 @@ compile_eval( switch( parse->num ) { - case EXPR_EXISTS: - if( ll && ll->string[0] ) status = 1; - break; - case EXPR_NOT: if( !ll ) status = 1; break; @@ -209,6 +205,7 @@ compile_eval( break; + case EXPR_EXISTS: if( lcmp( ll, L0 ) != 0 ) status = 1; break; case EXPR_EQUALS: if( lcmp( ll, lr ) == 0 ) status = 1; break; case EXPR_NOTEQ: if( lcmp( ll, lr ) != 0 ) status = 1; break; case EXPR_LESS: if( lcmp( ll, lr ) < 0 ) status = 1; break;