summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorTom Lane2007-10-21 22:29:56 +0000
committerTom Lane2007-10-21 22:29:56 +0000
commit1ea47dd8cbcb485a06676f12a36244270e18e192 (patch)
treeafcd226d47815acf89a4a62442ecdd1467594edb /src/include
parentdfc6f130b4fe64cbaff379eb1a2a97f6e050eb3e (diff)
Fix shared tsvector/tsquery input code so that we don't say "syntax error in
tsvector" when we are really parsing a tsquery. Report the bogus input, too. Make styles of some related error messages more consistent.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/tsearch/ts_utils.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/include/tsearch/ts_utils.h b/src/include/tsearch/ts_utils.h
index 60f176054a..ed9137b074 100644
--- a/src/include/tsearch/ts_utils.h
+++ b/src/include/tsearch/ts_utils.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1998-2007, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.5 2007/10/19 22:01:45 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.6 2007/10/21 22:29:56 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,10 +22,12 @@
/* tsvector parser support. */
-struct TSVectorParseStateData;
+struct TSVectorParseStateData; /* opaque struct in tsvector_parser.c */
typedef struct TSVectorParseStateData *TSVectorParseState;
-extern TSVectorParseState init_tsvector_parser(char *input, bool oprisdelim);
+extern TSVectorParseState init_tsvector_parser(char *input,
+ bool oprisdelim,
+ bool is_tsquery);
extern void reset_tsvector_parser(TSVectorParseState state, char *input);
extern bool gettoken_tsvector(TSVectorParseState state,
char **token, int *len,