Merge branch 'master' into public_master

feodor · feodor · commit 3d331aa8faaf · 2020-10-14T18:36:59.000+03:00
diff --git a/src/rum_ts_utils.c b/src/rum_ts_utils.c
@@ -1432,7 +1432,16 @@ compareDocR(const void *va, const void *vb)
 	return (a->pos > b->pos) ? 1 : -1;
 }
 
-static bool
+/*
+ * Be carefull: clang 11+ is very sensitive to casting function
+ * with different return value.
+ */
+static
+#if PG_VERSION_NUM >= 130000
+TSTernaryValue
+#else
+bool
+#endif
 checkcondition_QueryOperand(void *checkval, QueryOperand *val,
 							ExecPhraseData *data)
 {
@@ -1453,7 +1462,11 @@ checkcondition_QueryOperand(void *checkval, QueryOperand *val,
 		data->allocated = false;
 	}
 
-	return qro->operandexist;
+	return qro->operandexist
+#if PG_VERSION_NUM >= 130000
+		? TS_YES : TS_NO
+#endif
+	;
 }
 
 static bool
@@ -1498,13 +1511,13 @@ Cover(DocRepresentation *doc, uint32 len, QueryRepresentation *qr,
 			}
 		}
 
+		if (TS_execute(GETQUERY(qr->query), (void *) qr,
 #if PG_VERSION_NUM >= 130000
-		if (TS_execute(GETQUERY(qr->query), (void *) qr, TS_EXEC_SKIP_NOT,
-					   (TSExecuteCallback) checkcondition_QueryOperand))
+					   TS_EXEC_SKIP_NOT,
 #else
-		if (TS_execute(GETQUERY(qr->query), (void *) qr, TS_EXEC_EMPTY,
-					   checkcondition_QueryOperand))
+					   TS_EXEC_EMPTY,
 #endif
+					   checkcondition_QueryOperand))
 		{
 			if (ptr->pos > ext->q)
 			{
@@ -1544,13 +1557,13 @@ Cover(DocRepresentation *doc, uint32 len, QueryRepresentation *qr,
 				WEP_SETWEIGHT(qro->pos, ptr->wclass);
 			}
 		}
+		if (TS_execute(GETQUERY(qr->query), (void *) qr,
 #if PG_VERSION_NUM >= 130000
-		if (TS_execute(GETQUERY(qr->query), (void *) qr, TS_EXEC_EMPTY,
-					   (TSExecuteCallback) checkcondition_QueryOperand))
+					   TS_EXEC_EMPTY,
 #else
-		if (TS_execute(GETQUERY(qr->query), (void *) qr, TS_EXEC_CALC_NOT,
-					   checkcondition_QueryOperand))
+					   TS_EXEC_CALC_NOT,
 #endif
+					   checkcondition_QueryOperand))
 		{
 			if (ptr->pos < ext->p)
 			{

Original file line number	Diff line number	Diff line change
`@@ -1432,7 +1432,16 @@ compareDocR(const void va, const void vb)`
`1432`	`1432`	`return (a->pos > b->pos) ? 1 : -1;`
`1433`	`1433`	`}`
`1434`	`1434`
`1435`		`-static bool`
	`1435`	`+/*`
	`1436`	`+ * Be carefull: clang 11+ is very sensitive to casting function`
	`1437`	`+ * with different return value.`
	`1438`	`+ */`
	`1439`	`+static`
	`1440`	`+#if PG_VERSION_NUM >= 130000`
	`1441`	`+TSTernaryValue`
	`1442`	`+#else`
	`1443`	`+bool`
	`1444`	`+#endif`
`1436`	`1445`	`checkcondition_QueryOperand(void checkval, QueryOperand val,`
`1437`	`1446`	`ExecPhraseData *data)`
`1438`	`1447`	`{`
`@@ -1453,7 +1462,11 @@ checkcondition_QueryOperand(void checkval, QueryOperand val,`
`1453`	`1462`	`data->allocated = false;`
`1454`	`1463`	`}`
`1455`	`1464`
`1456`		`- return qro->operandexist;`
	`1465`	`+ return qro->operandexist`
	`1466`	`+#if PG_VERSION_NUM >= 130000`
	`1467`	`+ ? TS_YES : TS_NO`
	`1468`	`+#endif`
	`1469`	`+ ;`
`1457`	`1470`	`}`
`1458`	`1471`
`1459`	`1472`	`static bool`
`@@ -1498,13 +1511,13 @@ Cover(DocRepresentation doc, uint32 len, QueryRepresentation qr,`
`1498`	`1511`	`}`
`1499`	`1512`	`}`
`1500`	`1513`
	`1514`	`+ if (TS_execute(GETQUERY(qr->query), (void *) qr,`
`1501`	`1515`	`#if PG_VERSION_NUM >= 130000`
`1502`		`- if (TS_execute(GETQUERY(qr->query), (void *) qr, TS_EXEC_SKIP_NOT,`
`1503`		`- (TSExecuteCallback) checkcondition_QueryOperand))`
	`1516`	`+ TS_EXEC_SKIP_NOT,`
`1504`	`1517`	`#else`
`1505`		`- if (TS_execute(GETQUERY(qr->query), (void *) qr, TS_EXEC_EMPTY,`
`1506`		`- checkcondition_QueryOperand))`
	`1518`	`+ TS_EXEC_EMPTY,`
`1507`	`1519`	`#endif`
	`1520`	`+ checkcondition_QueryOperand))`
`1508`	`1521`	`{`
`1509`	`1522`	`if (ptr->pos > ext->q)`
`1510`	`1523`	`{`
`@@ -1544,13 +1557,13 @@ Cover(DocRepresentation doc, uint32 len, QueryRepresentation qr,`
`1544`	`1557`	`WEP_SETWEIGHT(qro->pos, ptr->wclass);`
`1545`	`1558`	`}`
`1546`	`1559`	`}`
	`1560`	`+ if (TS_execute(GETQUERY(qr->query), (void *) qr,`
`1547`	`1561`	`#if PG_VERSION_NUM >= 130000`
`1548`		`- if (TS_execute(GETQUERY(qr->query), (void *) qr, TS_EXEC_EMPTY,`
`1549`		`- (TSExecuteCallback) checkcondition_QueryOperand))`
	`1562`	`+ TS_EXEC_EMPTY,`
`1550`	`1563`	`#else`
`1551`		`- if (TS_execute(GETQUERY(qr->query), (void *) qr, TS_EXEC_CALC_NOT,`
`1552`		`- checkcondition_QueryOperand))`
	`1564`	`+ TS_EXEC_CALC_NOT,`
`1553`	`1565`	`#endif`
	`1566`	`+ checkcondition_QueryOperand))`
`1554`	`1567`	`{`
`1555`	`1568`	`if (ptr->pos < ext->p)`
`1556`	`1569`	`{`