From 3991c3fb2beb7164fc3a1461928e06d52e680dfd Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 9 Nov 2007 01:32:22 +0000
Subject: [PATCH] In tsearch code, remove !(A && B) via restructuring, for
 clarity

---
 src/backend/tsearch/dict_thesaurus.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/backend/tsearch/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c
index 5532947be8..7a0ae4afd3 100644
--- a/src/backend/tsearch/dict_thesaurus.c
+++ b/src/backend/tsearch/dict_thesaurus.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.4 2007/09/18 15:03:23 teodor Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.5 2007/11/09 01:32:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -418,14 +418,13 @@ compileTheLexeme(DictThesaurus * d)
 									Int32GetDatum(strlen(d->wrds[i].lexeme)),
 													 PointerGetDatum(NULL)));
 
-		if (!(ptr && ptr->lexeme))
+		if (!ptr)
+			elog(ERROR, "thesaurus word-sample \"%s\" isn't recognized by subdictionary (rule %d)",
+				 d->wrds[i].lexeme, d->wrds[i].entries->idsubst + 1);
+		else if (!(ptr->lexeme))
 		{
-			if (!ptr)
-				elog(ERROR, "thesaurus word-sample \"%s\" isn't recognized by subdictionary (rule %d)",
-					 d->wrds[i].lexeme, d->wrds[i].entries->idsubst + 1);
-			else
-				elog(NOTICE, "thesaurus word-sample \"%s\" is recognized as stop-word, assign any stop-word (rule %d)",
-					 d->wrds[i].lexeme, d->wrds[i].entries->idsubst + 1);
+			elog(NOTICE, "thesaurus word-sample \"%s\" is recognized as stop-word, assign any stop-word (rule %d)",
+				 d->wrds[i].lexeme, d->wrds[i].entries->idsubst + 1);
 
 			newwrds = addCompiledLexeme(newwrds, &nnw, &tnm, NULL, d->wrds[i].entries, 0);
 		}
-- 
2.40.0