@@ -256,7 +256,7 @@ to_tsvector(PG_FUNCTION_ARGS)
256256typedef struct MorphOpaque
257257{
258258Oid cfg_id ;
259- int operator ;
259+ int qoperator ; /* query operator */
260260}MorphOpaque ;
261261
262262/*
@@ -300,7 +300,7 @@ pushval_morph(Datum opaque, TSQueryParserState state, char *strval, int lenval,
300300/* put placeholders for each stop word */
301301pushStop (state );
302302if (cntpos )
303- pushOperator (state ,data -> operator ,1 );
303+ pushOperator (state ,data -> qoperator ,1 );
304304cntpos ++ ;
305305pos ++ ;
306306}
@@ -331,7 +331,7 @@ pushval_morph(Datum opaque, TSQueryParserState state, char *strval, int lenval,
331331}
332332
333333if (cntpos )
334- pushOperator (state ,data -> operator ,1 );
334+ pushOperator (state ,data -> qoperator ,1 );
335335cntpos ++ ;
336336}
337337
@@ -349,7 +349,7 @@ to_tsquery_byid(PG_FUNCTION_ARGS)
349349MorphOpaque data ;
350350
351351data .cfg_id = PG_GETARG_OID (0 );
352- data .operator = OP_AND ;
352+ data .qoperator = OP_AND ;
353353
354354query = parse_tsquery (text_to_cstring (in ),pushval_morph ,PointerGetDatum (& data ), false);
355355
@@ -376,7 +376,7 @@ plainto_tsquery_byid(PG_FUNCTION_ARGS)
376376MorphOpaque data ;
377377
378378data .cfg_id = PG_GETARG_OID (0 );
379- data .operator = OP_AND ;
379+ data .qoperator = OP_AND ;
380380
381381query = parse_tsquery (text_to_cstring (in ),pushval_morph ,PointerGetDatum (& data ), true);
382382
@@ -404,7 +404,7 @@ phraseto_tsquery_byid(PG_FUNCTION_ARGS)
404404MorphOpaque data ;
405405
406406data .cfg_id = PG_GETARG_OID (0 );
407- data .operator = OP_PHRASE ;
407+ data .qoperator = OP_PHRASE ;
408408
409409query = parse_tsquery (text_to_cstring (in ),pushval_morph ,PointerGetDatum (& data ), true);
410410