|
Line
Link Here
|
| 0 |
-- xapian-core-1.3.1/queryparser/queryparser_internal.cc |
0 |
++ xapian-core-1.3.1/queryparser/queryparser_internal.cc |
|
Lines 1719-1728
Link Here
|
| 1719 |
} |
1719 |
} |
| 1720 |
|
1720 |
|
| 1721 |
// Helper macro for converting a boolean operation into a Xapian::Query. |
1721 |
// Helper macro for converting a boolean operation into a Xapian::Query. |
| 1722 |
#define BOOL_OP_TO_QUERY(E, A, OP, B, OP_TXT) \ |
1722 |
#define BOOL_OP_TO_QUERY(E, A, OP, B, OPTXT) \ |
| 1723 |
do {\ |
1723 |
do {\ |
| 1724 |
if (!A || !B) {\ |
1724 |
if (!A || !B) {\ |
| 1725 |
state->error = "Syntax: <expression> "OP_TXT" <expression>";\ |
1725 |
state->error = "Syntax: <expression> " OPTXT " <expression>";\ |
| 1726 |
yy_parse_failed(yypParser);\ |
1726 |
yy_parse_failed(yypParser);\ |
| 1727 |
return;\ |
1727 |
return;\ |
| 1728 |
}\ |
1728 |
}\ |
| 1729 |
-- xapian-core-1.3.1/queryparser/queryparser.lemony |
1729 |
++ xapian-core-1.3.1/queryparser/queryparser.lemony |
|
Lines 1710-1719
Link Here
|
| 1710 |
} |
1710 |
} |
| 1711 |
|
1711 |
|
| 1712 |
// Helper macro for converting a boolean operation into a Xapian::Query. |
1712 |
// Helper macro for converting a boolean operation into a Xapian::Query. |
| 1713 |
#define BOOL_OP_TO_QUERY(E, A, OP, B, OP_TXT) \ |
1713 |
#define BOOL_OP_TO_QUERY(E, A, OP, B, OPTXT) \ |
| 1714 |
do {\ |
1714 |
do {\ |
| 1715 |
if (!A || !B) {\ |
1715 |
if (!A || !B) {\ |
| 1716 |
state->error = "Syntax: <expression> "OP_TXT" <expression>";\ |
1716 |
state->error = "Syntax: <expression> " OPTXT " <expression>";\ |
| 1717 |
yy_parse_failed(yypParser);\ |
1717 |
yy_parse_failed(yypParser);\ |
| 1718 |
return;\ |
1718 |
return;\ |
| 1719 |
}\ |
1719 |
}\ |
