Misc

Author: asfernandes

src/dsql/BoolNodes.cpp

@@ -281,7 +281,7 @@ TriState BinaryBoolNode::executeAnd(thread_db* tdbb, Request* request) const
 
 	if (value1.isAssigned())
 	{
-		if (!value1.asBool())
+		if (value1 != TriState(true))
 			return TriState(false);
 
 		return arg2->execute(tdbb, request);
@@ -863,12 +863,12 @@ TriState ComparativeBoolNode::execute(thread_db* tdbb, Request* request) const
 		case blr_between:
 			desc[1] = EVL_expr(tdbb, request, arg3);
 			if (!desc[1])
-				return !null2 && comparison < 0 ? TriState(false) : TriState::empty();
+				return (!null2 && comparison < 0) ? TriState(false) : TriState::empty();
 
 			{
 				// arg1 <= arg3
 				const bool cmp1_3 = (MOV_compare(tdbb, desc[0], desc[1]) <= 0);
-				return null2 && cmp1_3 ? TriState::empty() : TriState(cmp1_3);
+				return (null2 && cmp1_3) ? TriState::empty() : TriState(cmp1_3);
 			}
 
 		case blr_containing:
@@ -1050,24 +1050,21 @@ TriState ComparativeBoolNode::stringBoolean(thread_db* tdbb, Request* request,
 		else
 		{
 			if (blrOp == blr_containing)
-				return TriState(obj->contains(*tdbb->getDefaultPool(),
-					str, strLen, patternStr, patternLen));
+				return TriState(obj->contains(*tdbb->getDefaultPool(), str, strLen, patternStr, patternLen));
 			else if (blrOp == blr_starting)
-				return TriState(obj->starts(*tdbb->getDefaultPool(),
-					str, strLen, patternStr, patternLen));
+				return TriState(obj->starts(*tdbb->getDefaultPool(), str, strLen, patternStr, patternLen));
 			else if (blrOp == blr_like)
+			{
 				return TriState(obj->like(*tdbb->getDefaultPool(), str, strLen,
 					patternStr, patternLen, escapeStr, escapeLen));
+			}
 			else if (blrOp == blr_similar)
 			{
 				return TriState(obj->similarTo(tdbb, *tdbb->getDefaultPool(),
 					str, strLen, patternStr, patternLen, escapeStr, escapeLen));
 			}
 			else	// blr_matching
-			{
-				return TriState(obj->matches(*tdbb->getDefaultPool(),
-					str, strLen, patternStr, patternLen));
-			}
+				return TriState(obj->matches(*tdbb->getDefaultPool(), str, strLen, patternStr, patternLen));
 		}
 	}
 

src/jrd/fun.epp

@@ -419,11 +419,7 @@ void FUN_evaluate(thread_db* tdbb, const Function* function, const NestValueArra
 			// doesn't carry the null flag in the descriptor. Why Borland didn't
 			// set on such flag is maybe because it only has local meaning.
 			// This closes SF Bug #728839.
-			if (!(input && (input->dsc_flags & DSC_null)))
-				*arg_ptr++ = nullptr;
-			else
-				*arg_ptr++ = input;
-
+			*arg_ptr++ = (input && !input->isNull()) ? input : nullptr;
 			continue;
 		}
 

src/jrd/recsrc/FilteredStream.cpp

@@ -98,7 +98,7 @@ bool FilteredStream::internalGetRecord(thread_db* tdbb) const
 	if (!(impure->irsb_flags & irsb_open))
 		return false;
 
-	if (!evaluateBoolean(tdbb).asBool())
+	if (evaluateBoolean(tdbb) != TriState(true))
 	{
 		invalidateRecords(request);
 		return false;
@@ -246,11 +246,9 @@ Firebird::TriState FilteredStream::evaluateBoolean(thread_db* tdbb) const
 				else
 				{
 					// select for ANY/ALL processing
-					const bool select_value = select_node->execute(tdbb, request).asBool();
-
 					// see if any record in select stream
 
-					if (select_value)
+					if (select_node->execute(tdbb, request).asBool())
 					{
 						// see if any record is null
 
@@ -301,8 +299,7 @@ Firebird::TriState FilteredStream::evaluateBoolean(thread_db* tdbb) const
 					if (select_node)
 					{
 						// select for ANY/ALL processing
-						const bool select_value = select_node->execute(tdbb, request).asBool();
-						if (select_value)
+						if (select_node->execute(tdbb, request).asBool())
 						{
 							any_false = true;
 							break;
@@ -338,8 +335,7 @@ Firebird::TriState FilteredStream::evaluateBoolean(thread_db* tdbb) const
 				if (select_node)
 				{
 					// select for ANY/ALL processing
-					const bool select_value = select_node->execute(tdbb, request).asBool();
-					if (select_value)
+					if (select_node->execute(tdbb, request).asBool())
 					{
 						any_false = true;
 						break;