ferret 0.10.14 → 0.11.0

data/ext/index.h

@@ -14,6 +14,7 @@
 
 typedef struct IndexReader IndexReader;
 typedef struct MultiReader MultiReader;
+typedef struct Deleter Deleter;
 
 /****************************************************************************
  *
@@ -130,6 +131,7 @@ extern void fi_deref(FieldInfo *fi);
  ****************************************************************************/
 
 #define FIELD_INFOS_INIT_CAPA 4
+/* carry changes over to dummy_fis in test/test_segments.c */
 typedef struct FieldInfos
 {
     int store;
@@ -147,8 +149,8 @@ extern FieldInfo *fis_add_field(FieldInfos *fis, FieldInfo *fi);
 extern FieldInfo *fis_get_field(FieldInfos *fis, const char *name);
 extern int fis_get_field_num(FieldInfos *fis, const char *name);
 extern FieldInfo *fis_get_or_add_field(FieldInfos *fis, const char *name);
-extern void fis_write(FieldInfos *fis, Store *store);
-extern FieldInfos *fis_read(Store *store);
+extern void fis_write(FieldInfos *fis, OutStream *os);
+extern FieldInfos *fis_read(InStream *is);
 extern char *fis_to_s(FieldInfos *fis);
 extern void fis_deref(FieldInfos *fis);
 
@@ -159,19 +161,26 @@ extern void fis_deref(FieldInfos *fis);
  ****************************************************************************/
 
 #define SEGMENT_NAME_MAX_LENGTH 100
+#define SEGMENTS_FILE_NAME "segments"
 
 typedef struct SegmentInfo
 {
+    int ref_cnt;
     char *name;
-    int doc_cnt;
     Store *store;
+    int doc_cnt;
+    int del_gen;
+    int *norm_gens;
+    int norm_gens_size;
+    bool use_compound_file;
 } SegmentInfo;
 
 extern SegmentInfo *si_new(char *name, int doc_cnt, Store *store);
-extern void si_destroy(SegmentInfo *si);
+extern void si_deref(SegmentInfo *si);
 extern bool si_has_deletions(SegmentInfo *si);
 extern bool si_uses_compound_file(SegmentInfo *si);
 extern bool si_has_separate_norms(SegmentInfo *si);
+extern void si_advance_norm_gen(SegmentInfo *si, int field_num);
 
 /****************************************************************************
  *
@@ -181,25 +190,32 @@ extern bool si_has_separate_norms(SegmentInfo *si);
 
 typedef struct SegmentInfos
 {
+    FieldInfos *fis;
     f_u64 counter;
     f_u64 version;
-    f_u32 format;
+    f_i64 generation;
+    f_i32 format;
     Store *store;
     SegmentInfo **segs;
     int size;
     int capa;
 } SegmentInfos;
 
-extern SegmentInfos *sis_new();
+extern char *fn_for_generation(char *buf, char *base, char *ext, f_i64 gen);
+
+extern SegmentInfos *sis_new(FieldInfos *fis);
 extern SegmentInfo *sis_new_segment(SegmentInfos *sis, int dcnt, Store *store);
 extern SegmentInfo *sis_add_si(SegmentInfos *sis, SegmentInfo *si);
 extern void sis_del_at(SegmentInfos *sis, int at);
 extern void sis_del_from_to(SegmentInfos *sis, int from, int to);
 extern void sis_clear(SegmentInfos *sis);
 extern SegmentInfos *sis_read(Store *store);
-extern void sis_write(SegmentInfos *sis, Store *store);
+extern void sis_write(SegmentInfos *sis, Store *store, Deleter *deleter);
 extern f_u64 sis_read_current_version(Store *store);
 extern void sis_destroy(SegmentInfos *sis);
+extern f_i64 sis_current_segment_generation(Store *store);
+extern char *sis_curr_seg_file_name(char *buf, Store *store);
+extern void sis_put(SegmentInfos *sis, FILE *stream);
 
 /****************************************************************************
  *
@@ -394,7 +410,7 @@ typedef struct SegmentTermDocEnum SegmentTermDocEnum;
 struct SegmentTermDocEnum
 {
     TermDocEnum tde;
-    void (*seek_prox)(SegmentTermDocEnum *stde, int prx_ptr);
+    void (*seek_prox)(SegmentTermDocEnum *stde, off_t prx_ptr);
     void (*skip_prox)(SegmentTermDocEnum *stde);
     TermInfosReader *tir;
     InStream        *frq_in;
@@ -409,11 +425,11 @@ struct SegmentTermDocEnum
     int skip_interval;
     int skip_count;
     int skip_doc;
-    int frq_ptr;
-    int prx_ptr;
-    int skip_ptr;
     int prx_cnt;
     int position;
+    off_t frq_ptr;
+    off_t prx_ptr;
+    off_t skip_ptr;
     bool have_skipped : 1;
 };
 
@@ -683,6 +699,31 @@ extern void fw_add_postings(FieldsWriter *fw,
                             int offset_count);
 extern void fw_write_tv_index(FieldsWriter *fw);
 
+/****************************************************************************
+ *
+ * Deleter
+ *
+ * A utility class (used by both IndexReader and IndexWriter) to keep track of
+ * files that need to be deleted because they are no longer referenced by the
+ * index.
+ * 
+ ****************************************************************************/
+
+struct Deleter
+{
+    Store         *store;
+    SegmentInfos  *sis;
+    HashSet       *pending;
+};
+
+extern Deleter *deleter_new(SegmentInfos *sis, Store *store);
+extern void deleter_destroy(Deleter *dlr);
+extern void deleter_clear_pending_files(Deleter *dlr);
+extern void deleter_delete_file(Deleter *dlr, char *file_name);
+extern void deleter_find_deletable_files(Deleter *dlr);
+extern void deleter_commit_pending_files(Deleter *dlr);
+extern void deleter_delete_files(Deleter *dlr, char **files, int file_cnt);
+
 /****************************************************************************
  *
  * IndexReader
@@ -718,9 +759,11 @@ struct IndexReader
                         uchar val);
     void          (*delete_doc_i)(IndexReader *ir, int doc_num);
     void          (*undelete_all_i)(IndexReader *ir);
+    void          (*set_deleter_i)(IndexReader *ir, Deleter *dlr);
     void          (*commit_i)(IndexReader *ir);
     void          (*close_i)(IndexReader *ir);
     int           ref_cnt;
+    Deleter      *deleter;
     Store        *store;
     Lock         *write_lock;
     SegmentInfos *sis;
@@ -824,7 +867,7 @@ typedef struct IndexWriter IndexWriter;
 typedef struct DocWriter
 {
     Store *store;
-    const char *segment;
+    SegmentInfo *si;
     FieldInfos *fis;
     TermVectorsWriter *tvw;
     FieldsWriter *fw;
@@ -843,10 +886,10 @@ typedef struct DocWriter
     int max_buffered_docs;
 } DocWriter;
 
-extern DocWriter *dw_open(IndexWriter *is, const char *segment);
+extern DocWriter *dw_open(IndexWriter *is, SegmentInfo *si);
 extern void dw_close(DocWriter *dw);
 extern void dw_add_doc(DocWriter *dw, Document *doc);
-extern void dw_new_segment(DocWriter *dw, char *segment);
+extern void dw_new_segment(DocWriter *dw, SegmentInfo *si);
 
 /****************************************************************************
  *
@@ -871,9 +914,11 @@ struct IndexWriter
     DocWriter *dw;
     Similarity *similarity;
     Lock *write_lock;
+    Deleter *deleter;
 };
 
 extern void index_create(Store *store, FieldInfos *fis);
+extern bool index_is_locked(Store *store);
 extern IndexWriter *iw_open(Store *store, volatile Analyzer *analyzer,
                             const Config *config);
 extern void iw_delete_term(IndexWriter *iw, const char *field,

data/ext/q_boolean.c

@@ -1326,10 +1326,11 @@ static MatchVector *bq_get_matchv_i(Query *self, MatchVector *mv,
 static Query *bq_rewrite(Query *self, IndexReader *ir)
 {
     int i;
-
+    const int clause_cnt = BQ(self)->clause_cnt;
     bool rewritten = false;
+    bool has_non_prohibited_clause = false;
 
-    if (BQ(self)->clause_cnt == 1) { 
+    if (clause_cnt == 1) { 
         /* optimize 1-clause queries */
         BooleanClause *clause = BQ(self)->clauses[0];
         if (! clause->is_prohibited) {
@@ -1357,18 +1358,21 @@ static Query *bq_rewrite(Query *self, IndexReader *ir)
 
     self->ref_cnt++;
     /* replace each clause's query with its rewritten query */
-    for (i = 0; i < BQ(self)->clause_cnt; i++) {
+    for (i = 0; i < clause_cnt; i++) {
         BooleanClause *clause = BQ(self)->clauses[i];
         Query *rq = clause->query->rewrite(clause->query, ir);
+        /* check for at least one non-prohibited clause */
+        if (clause->is_prohibited == false) has_non_prohibited_clause = true;
         if (rq != clause->query) {
             if (!rewritten) {
                 int j;
                 Query *new_self = q_new(BooleanQuery);
                 memcpy(new_self, self, sizeof(BooleanQuery));
-                BQ(new_self)->clauses = ALLOC_N(BooleanClause *, BQ(self)->clause_capa);
+                BQ(new_self)->clauses = ALLOC_N(BooleanClause *,
+                                                BQ(self)->clause_capa);
                 memcpy(BQ(new_self)->clauses, BQ(self)->clauses,
                        BQ(self)->clause_capa * sizeof(BooleanClause *));
-                for (j = 0; j < BQ(self)->clause_cnt; j++) {
+                for (j = 0; j < clause_cnt; j++) {
                     REF(BQ(self)->clauses[j]);
                 }
                 self->ref_cnt--;
@@ -1382,6 +1386,9 @@ static Query *bq_rewrite(Query *self, IndexReader *ir)
             DEREF(rq);
         }
     }
+    if (clause_cnt > 0 && !has_non_prohibited_clause) {
+        bq_add_query_nr(self, maq_new(), BC_MUST);
+    }
 
     return self;
 }

data/ext/q_parser.c

@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,13 +20,21 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
@@ -37,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.1"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -125,18 +135,20 @@ int qp_default_fuzzy_pre_len = 0;
 # define YYTOKEN_TABLE 0
 #endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
 #line 26 "src/q_parser.y"
-typedef union YYSTYPE {
+{
     Query *query;
     BooleanClause *bcls;
     BCArray *bclss;
     HashSet *hashset;
     Phrase *phrase;
     char *str;
-} YYSTYPE;
-/* Line 196 of yacc.c.  */
-#line 140 "y.tab.c"
+}
+/* Line 193 of yacc.c.  */
+#line 151 "y.tab.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -199,23 +211,56 @@ static Query *get_r_q(QParser *qp, char *field, char *from, char *to,
 } while (0)
 
 
-/* Line 219 of yacc.c.  */
-#line 204 "y.tab.c"
+/* Line 216 of yacc.c.  */
+#line 216 "y.tab.c"
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
+#ifdef short
+# undef short
 #endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
 #endif
-#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
 #endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
 #endif
 
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
 #ifndef YY_
 # if YYENABLE_NLS
 #  if ENABLE_NLS
@@ -228,7 +273,32 @@ static Query *get_r_q(QParser *qp, char *field, char *from, char *to,
 # endif
 #endif
 
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
@@ -236,64 +306,76 @@ static Query *get_r_q(QParser *qp, char *field, char *from, char *to,
 #  if YYSTACK_USE_ALLOCA
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if defined (__STDC__) || defined (__cplusplus)
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     define YYINCLUDED_STDLIB_H
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
 #    endif
 #   endif
 #  endif
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
        invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
        to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
 #  endif
 # else
 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE
 #  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  ifdef __cplusplus
-extern "C" {
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
-#  ifdef __cplusplus
-}
-#  endif
 # endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  yytype_int16 yyss;
   YYSTYPE yyvs;
   };
 
@@ -303,13 +385,13 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
@@ -320,7 +402,7 @@ union yyalloc
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -338,28 +420,22 @@ union yyalloc
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
+    while (YYID (0))
 
 #endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short int yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
+/* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  39
 /* YYLAST -- Last index in YYTABLE.  */
 #define YYLAST   126
 
-/* YYNTOKENS -- Number of terminals. */
+/* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  26
-/* YYNNTS -- Number of nonterminals. */
+/* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  16
-/* YYNRULES -- Number of rules. */
+/* YYNRULES -- Number of rules.  */
 #define YYNRULES  51
-/* YYNRULES -- Number of states. */
+/* YYNRULES -- Number of states.  */
 #define YYNSTATES  80
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
@@ -370,7 +446,7 @@ union yyalloc
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
+static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -404,7 +480,7 @@ static const unsigned char yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned char yyprhs[] =
+static const yytype_uint8 yyprhs[] =
 {
        0,     0,     3,     4,     6,     8,    12,    16,    19,    22,
       25,    27,    29,    33,    35,    38,    42,    44,    46,    48,
@@ -414,8 +490,8 @@ static const unsigned char yyprhs[] =
      158,   162
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yysigned_char yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
 {
       27,     0,    -1,    -1,    28,    -1,    29,    -1,    28,     7,
       29,    -1,    28,     6,    29,    -1,    28,    29,    -1,     9,
@@ -437,7 +513,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned char yyrline[] =
+static const yytype_uint8 yyrline[] =
 {
        0,   102,   102,   103,   105,   106,   107,   108,   110,   111,
      112,   114,   115,   117,   118,   119,   120,   121,   122,   123,
@@ -450,7 +526,7 @@ static const unsigned char yyrline[] =
 
 #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "QWRD", "WILD_STR", "LOW", "OR", "AND",
@@ -464,7 +540,7 @@ static const char *const yytname[] =
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
+static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
       58,   265,    94,    40,    41,   126,    42,   124,    34,    60,
@@ -473,7 +549,7 @@ static const unsigned short int yytoknum[] =
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
+static const yytype_uint8 yyr1[] =
 {
        0,    26,    27,    27,    28,    28,    28,    28,    29,    29,
       29,    30,    30,    31,    31,    31,    31,    31,    31,    31,
@@ -484,7 +560,7 @@ static const unsigned char yyr1[] =
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
+static const yytype_uint8 yyr2[] =
 {
        0,     2,     0,     1,     1,     3,     3,     2,     2,     2,
        1,     1,     3,     1,     2,     3,     1,     1,     1,     1,
@@ -497,7 +573,7 @@ static const unsigned char yyr2[] =
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
-static const unsigned char yydefact[] =
+static const yytype_uint8 yydefact[] =
 {
        2,    20,    23,     0,     0,     0,    26,     0,     0,     0,
        0,     0,     0,     3,     4,    10,    11,    13,    19,    16,
@@ -509,8 +585,8 @@ static const unsigned char yydefact[] =
       39,     0,    38,    40,    41,    42,    43,    25,    28,    32
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yysigned_char yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
 {
       -1,    12,    13,    14,    15,    16,    17,    18,    19,    77,
       28,    78,    20,    21,    32,    22
@@ -519,7 +595,7 @@ static const yysigned_char yydefgoto[] =
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 #define YYPACT_NINF -30
-static const yysigned_char yypact[] =
+static const yytype_int8 yypact[] =
 {
       83,    -4,   -30,   102,   102,    64,   -30,     7,    -2,    -1,
        6,    15,    31,    45,   -30,   -30,    29,   -30,   -30,   -30,
@@ -532,7 +608,7 @@ static const yysigned_char yypact[] =
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const yysigned_char yypgoto[] =
+static const yytype_int8 yypgoto[] =
 {
      -30,   -30,    89,   -13,    56,   -29,   -30,   -30,   -30,   -30,
      -30,   -30,   -30,   -30,   -30,   -30
@@ -543,7 +619,7 @@ static const yysigned_char yypgoto[] =
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -30
-static const yysigned_char yytable[] =
+static const yytype_int8 yytable[] =
 {
       42,    33,    35,    59,    61,    44,   -29,    55,    56,    37,
       29,    23,    45,   -29,    42,    66,    73,    74,    38,    68,
@@ -560,7 +636,7 @@ static const yysigned_char yytable[] =
        7,     8,     9,    10,     0,     0,    11
 };
 
-static const yysigned_char yycheck[] =
+static const yytype_int8 yycheck[] =
 {
       13,     3,     3,     3,     3,    10,    10,    22,    23,     3,
        3,    15,    17,    17,    27,    44,    22,    23,     3,    48,
@@ -579,7 +655,7 @@ static const yysigned_char yycheck[] =
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
+static const yytype_uint8 yystos[] =
 {
        0,     3,     4,     8,     9,    13,    16,    18,    19,    20,
       21,    24,    27,    28,    29,    30,    31,    32,    33,    34,
@@ -616,7 +692,7 @@ do								\
       yychar = (Token);						\
       yylval = (Value);						\
       yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
@@ -624,7 +700,7 @@ do								\
       yyerror (qp, YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
 
 
 #define YYTERROR	1
@@ -639,7 +715,7 @@ while (0)
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N)				\
     do									\
-      if (N)								\
+      if (YYID (N))                                                    \
 	{								\
 	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
 	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
@@ -653,7 +729,7 @@ while (0)
 	  (Current).first_column = (Current).last_column =		\
 	    YYRHSLOC (Rhs, 0).last_column;				\
 	}								\
-    while (0)
+    while (YYID (0))
 #endif
 
 
@@ -665,8 +741,8 @@ while (0)
 # if YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
-              (Loc).first_line, (Loc).first_column,	\
-              (Loc).last_line,  (Loc).last_column)
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif
@@ -693,36 +769,99 @@ while (0)
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (0)
+} while (YYID (0))
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr,					\
-                  Type, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value, qp); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, QParser *qp)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep, qp)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+    QParser *qp;
+#endif
+{
+  if (!yyvaluep)
+    return;
+  YYUSE (qp);
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, QParser *qp)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep, qp)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+    QParser *qp;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, qp);
+  YYFPRINTF (yyoutput, ")");
+}
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
+  for (; bottom <= top; ++bottom)
     YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
@@ -731,37 +870,46 @@ yy_stack_print (bottom, top)
 do {								\
   if (yydebug)							\
     yy_stack_print ((Bottom), (Top));				\
-} while (0)
+} while (YYID (0))
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule, QParser *qp)
 #else
 static void
-yy_reduce_print (yyrule)
+yy_reduce_print (yyvsp, yyrule, qp)
+    YYSTYPE *yyvsp;
     int yyrule;
+    QParser *qp;
 #endif
 {
+  int yynrhs = yyr2[yyrule];
   int yyi;
   unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
-             yyrule - 1, yylno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       , qp);
+      fprintf (stderr, "\n");
+    }
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
   if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
+    yy_reduce_print (yyvsp, Rule, qp); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -795,42 +943,44 @@ int yydebug;
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
+#  if defined __GLIBC__ && defined _STRING_H
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#   else
+#else
+static YYSIZE_T
 yystrlen (yystr)
-     const char *yystr;
-#   endif
+    const char *yystr;
+#endif
 {
-  const char *yys = yystr;
-
-  while (*yys++ != '\0')
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
     continue;
-
-  return yys - yystr - 1;
+  return yylen;
 }
 #  endif
 # endif
 
 # ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
 #   define yystpcpy stpcpy
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static char *
-#   if defined (__STDC__) || defined (__cplusplus)
 yystpcpy (char *yydest, const char *yysrc)
-#   else
+#else
+static char *
 yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
+    char *yydest;
+    const char *yysrc;
+#endif
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -856,7 +1006,7 @@ yytnamerr (char *yyres, const char *yystr)
 {
   if (*yystr == '"')
     {
-      size_t yyn = 0;
+      YYSIZE_T yyn = 0;
       char const *yyp = yystr;
 
       for (;;)
@@ -891,65 +1041,136 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-#endif /* YYERROR_VERBOSE */
-
-
-
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  int yyn = yypact[yystate];
 
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
   else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
 
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
 
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-  switch (yytype)
-    {
-      default:
-        break;
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
     }
-  YYFPRINTF (yyoutput, ")");
 }
+#endif /* YYERROR_VERBOSE */
+
 
-#endif /* ! YYDEBUG */
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, QParser *qp)
 #else
 static void
-yydestruct (yymsg, yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep, qp)
     const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
+    QParser *qp;
 #endif
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  YYUSE (yyvaluep);
+  YYUSE (qp);
 
   if (!yymsg)
     yymsg = "Deleting";
@@ -959,7 +1180,7 @@ yydestruct (yymsg, yytype, yyvaluep)
     {
 
       default:
-        break;
+	break;
     }
 }
 
@@ -967,13 +1188,13 @@ yydestruct (yymsg, yytype, yyvaluep)
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
-# else
+#else
 int yyparse ();
-# endif
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (QParser *qp);
 #else
 int yyparse ();
@@ -990,14 +1211,18 @@ int yyparse ();
 `----------*/
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (QParser *qp)
 #else
@@ -1023,6 +1248,12 @@ int yynerrs;
   int yyerrstatus;
   /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -1033,9 +1264,9 @@ int yynerrs;
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  short int *yyssp;
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
@@ -1044,7 +1275,7 @@ int yynerrs;
 
 
 
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
@@ -1053,9 +1284,9 @@ int yynerrs;
   YYSTYPE yyval;
 
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
-  int yylen;
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
@@ -1079,8 +1310,7 @@ int yynerrs;
 `------------------------------------------------------------*/
  yynewstate:
   /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
+     have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
  yysetstate:
@@ -1093,11 +1323,11 @@ int yynerrs;
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack. Use copies of
+	/* Give user a chance to reallocate the stack.  Use copies of
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
@@ -1125,7 +1355,7 @@ int yynerrs;
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
@@ -1160,12 +1390,10 @@ int yynerrs;
 `-----------*/
 yybackup:
 
-/* Do appropriate processing given the current state.  */
-/* Read a look-ahead token if we need one and don't already have one.  */
-/* yyresume: */
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
 
   /* First try to decide what to do without reference to look-ahead token.  */
-
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
@@ -1207,22 +1435,21 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
   /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the token being shifted unless it is eof.  */
+  /* Discard the shifted token unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
+  yystate = yyn;
   *++yyvsp = yylval;
 
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  yystate = yyn;
   goto yynewstate;
 
 
@@ -1264,47 +1491,47 @@ yyreduce:
 
   case 3:
 #line 103 "src/q_parser.y"
-    { qp->result = (yyval.query) = get_bool_q((yyvsp[0].bclss)); }
+    { qp->result = (yyval.query) = get_bool_q((yyvsp[(1) - (1)].bclss)); }
     break;
 
   case 4:
 #line 105 "src/q_parser.y"
-    { (yyval.bclss) = first_cls((yyvsp[0].bcls)); }
+    { (yyval.bclss) = first_cls((yyvsp[(1) - (1)].bcls)); }
     break;
 
   case 5:
 #line 106 "src/q_parser.y"
-    { (yyval.bclss) = add_and_cls((yyvsp[-2].bclss), (yyvsp[0].bcls)); }
+    { (yyval.bclss) = add_and_cls((yyvsp[(1) - (3)].bclss), (yyvsp[(3) - (3)].bcls)); }
     break;
 
   case 6:
 #line 107 "src/q_parser.y"
-    { (yyval.bclss) = add_or_cls((yyvsp[-2].bclss), (yyvsp[0].bcls)); }
+    { (yyval.bclss) = add_or_cls((yyvsp[(1) - (3)].bclss), (yyvsp[(3) - (3)].bcls)); }
     break;
 
   case 7:
 #line 108 "src/q_parser.y"
-    { (yyval.bclss) = add_default_cls(qp, (yyvsp[-1].bclss), (yyvsp[0].bcls)); }
+    { (yyval.bclss) = add_default_cls(qp, (yyvsp[(1) - (2)].bclss), (yyvsp[(2) - (2)].bcls)); }
     break;
 
   case 8:
 #line 110 "src/q_parser.y"
-    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_MUST); }
+    { (yyval.bcls) = get_bool_cls((yyvsp[(2) - (2)].query), BC_MUST); }
     break;
 
   case 9:
 #line 111 "src/q_parser.y"
-    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_MUST_NOT); }
+    { (yyval.bcls) = get_bool_cls((yyvsp[(2) - (2)].query), BC_MUST_NOT); }
     break;
 
   case 10:
 #line 112 "src/q_parser.y"
-    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_SHOULD); }
+    { (yyval.bcls) = get_bool_cls((yyvsp[(1) - (1)].query), BC_SHOULD); }
     break;
 
   case 12:
 #line 115 "src/q_parser.y"
-    { if ((yyvsp[-2].query)) sscanf((yyvsp[0].str),"%f",&((yyvsp[-2].query)->boost)); (yyval.query)=(yyvsp[-2].query); }
+    { if ((yyvsp[(1) - (3)].query)) sscanf((yyvsp[(3) - (3)].str),"%f",&((yyvsp[(1) - (3)].query)->boost)); (yyval.query)=(yyvsp[(1) - (3)].query); }
     break;
 
   case 14:
@@ -1314,27 +1541,27 @@ yyreduce:
 
   case 15:
 #line 119 "src/q_parser.y"
-    { (yyval.query) = get_bool_q((yyvsp[-1].bclss)); }
+    { (yyval.query) = get_bool_q((yyvsp[(2) - (3)].bclss)); }
     break;
 
   case 20:
 #line 125 "src/q_parser.y"
-    { FLDS((yyval.query), get_term_q(qp, field, (yyvsp[0].str))); }
+    { FLDS((yyval.query), get_term_q(qp, field, (yyvsp[(1) - (1)].str))); }
     break;
 
   case 21:
 #line 126 "src/q_parser.y"
-    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[-2].str), (yyvsp[0].str))); }
+    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str))); }
     break;
 
   case 22:
 #line 127 "src/q_parser.y"
-    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[-1].str), NULL)); }
+    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[(1) - (2)].str), NULL)); }
     break;
 
   case 23:
 #line 129 "src/q_parser.y"
-    { FLDS((yyval.query), get_wild_q(qp, field, (yyvsp[0].str))); }
+    { FLDS((yyval.query), get_wild_q(qp, field, (yyvsp[(1) - (1)].str))); }
     break;
 
   case 24:
@@ -1344,7 +1571,7 @@ yyreduce:
 
   case 25:
 #line 132 "src/q_parser.y"
-    { (yyval.query) = (yyvsp[-1].query); }
+    { (yyval.query) = (yyvsp[(3) - (4)].query); }
     break;
 
   case 26:
@@ -1359,27 +1586,27 @@ yyreduce:
 
   case 28:
 #line 134 "src/q_parser.y"
-    { (yyval.query) = (yyvsp[-1].query); }
+    { (yyval.query) = (yyvsp[(4) - (5)].query); }
     break;
 
   case 29:
 #line 136 "src/q_parser.y"
-    { (yyval.hashset) = first_field(qp, (yyvsp[0].str)); }
+    { (yyval.hashset) = first_field(qp, (yyvsp[(1) - (1)].str)); }
     break;
 
   case 30:
 #line 137 "src/q_parser.y"
-    { (yyval.hashset) = add_field(qp, (yyvsp[0].str));}
+    { (yyval.hashset) = add_field(qp, (yyvsp[(3) - (3)].str));}
     break;
 
   case 31:
 #line 139 "src/q_parser.y"
-    { (yyval.query) = get_phrase_q(qp, (yyvsp[-1].phrase), NULL); }
+    { (yyval.query) = get_phrase_q(qp, (yyvsp[(2) - (3)].phrase), NULL); }
     break;
 
   case 32:
 #line 140 "src/q_parser.y"
-    { (yyval.query) = get_phrase_q(qp, (yyvsp[-3].phrase), (yyvsp[0].str)); }
+    { (yyval.query) = get_phrase_q(qp, (yyvsp[(2) - (5)].phrase), (yyvsp[(5) - (5)].str)); }
     break;
 
   case 33:
@@ -1394,7 +1621,7 @@ yyreduce:
 
   case 35:
 #line 144 "src/q_parser.y"
-    { (yyval.phrase) = ph_first_word((yyvsp[0].str)); }
+    { (yyval.phrase) = ph_first_word((yyvsp[(1) - (1)].str)); }
     break;
 
   case 36:
@@ -1404,90 +1631,88 @@ yyreduce:
 
   case 37:
 #line 146 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_word((yyvsp[-1].phrase), (yyvsp[0].str)); }
+    { (yyval.phrase) = ph_add_word((yyvsp[(1) - (2)].phrase), (yyvsp[(2) - (2)].str)); }
     break;
 
   case 38:
 #line 147 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_word((yyvsp[-2].phrase), NULL); }
+    { (yyval.phrase) = ph_add_word((yyvsp[(1) - (3)].phrase), NULL); }
     break;
 
   case 39:
 #line 148 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_multi_word((yyvsp[-2].phrase), (yyvsp[0].str));  }
+    { (yyval.phrase) = ph_add_multi_word((yyvsp[(1) - (3)].phrase), (yyvsp[(3) - (3)].str));  }
     break;
 
   case 40:
 #line 150 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  true)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[(2) - (4)].str),  (yyvsp[(3) - (4)].str),  true,  true)); }
     break;
 
   case 41:
 #line 151 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[(2) - (4)].str),  (yyvsp[(3) - (4)].str),  true,  false)); }
     break;
 
   case 42:
 #line 152 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, true)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[(2) - (4)].str),  (yyvsp[(3) - (4)].str),  false, true)); }
     break;
 
   case 43:
 #line 153 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[(2) - (4)].str),  (yyvsp[(3) - (4)].str),  false, false)); }
     break;
 
   case 44:
 #line 154 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[-1].str),  false, false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[(2) - (3)].str),  false, false)); }
     break;
 
   case 45:
 #line 155 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[-1].str),  false, true)); }
+    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[(2) - (3)].str),  false, true)); }
     break;
 
   case 46:
 #line 156 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-1].str),  NULL,true,  false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[(2) - (3)].str),  NULL,true,  false)); }
     break;
 
   case 47:
 #line 157 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[-1].str),  NULL,false, false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[(2) - (3)].str),  NULL,false, false)); }
     break;
 
   case 48:
 #line 158 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[0].str),  false, false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[(2) - (2)].str),  false, false)); }
     break;
 
   case 49:
 #line 159 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[0].str),  false, true)); }
+    { FLDS((yyval.query), get_r_q(qp, field, NULL,(yyvsp[(3) - (3)].str),  false, true)); }
     break;
 
   case 50:
 #line 160 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[0].str),  NULL,true,  false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[(3) - (3)].str),  NULL,true,  false)); }
     break;
 
   case 51:
 #line 161 "src/q_parser.y"
-    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[0].str),  NULL,false, false)); }
+    { FLDS((yyval.query), get_r_q(qp, field, (yyvsp[(2) - (2)].str),  NULL,false, false)); }
     break;
 
 
+/* Line 1267 of yacc.c.  */
+#line 1710 "y.tab.c"
       default: break;
     }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
-/* Line 1126 of yacc.c.  */
-#line 1486 "y.tab.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
+  YYPOPSTACK (yylen);
+  yylen = 0;
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
@@ -1516,110 +1741,41 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  int yytype = YYTRANSLATE (yychar);
-	  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-	  YYSIZE_T yysize = yysize0;
-	  YYSIZE_T yysize1;
-	  int yysize_overflow = 0;
-	  char *yymsg = 0;
-#	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
-	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-	  int yyx;
-
-#if 0
-	  /* This is so xgettext sees the translatable formats that are
-	     constructed on the fly.  */
-	  YY_("syntax error, unexpected %s");
-	  YY_("syntax error, unexpected %s, expecting %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-#endif
-	  char *yyfmt;
-	  char const *yyf;
-	  static char const yyunexpected[] = "syntax error, unexpected %s";
-	  static char const yyexpecting[] = ", expecting %s";
-	  static char const yyor[] = " or %s";
-	  char yyformat[sizeof yyunexpected
-			+ sizeof yyexpecting - 1
-			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-			   * (sizeof yyor - 1))];
-	  char const *yyprefix = yyexpecting;
-
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 1;
-
-	  yyarg[0] = yytname[yytype];
-	  yyfmt = yystpcpy (yyformat, yyunexpected);
-
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+#if ! YYERROR_VERBOSE
+      yyerror (qp, YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
 	      {
-		if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-		  {
-		    yycount = 1;
-		    yysize = yysize0;
-		    yyformat[sizeof yyunexpected - 1] = '\0';
-		    break;
-		  }
-		yyarg[yycount++] = yytname[yyx];
-		yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-		yysize_overflow |= yysize1 < yysize;
-		yysize = yysize1;
-		yyfmt = yystpcpy (yyfmt, yyprefix);
-		yyprefix = yyor;
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
 	      }
+	  }
 
-	  yyf = YY_(yyformat);
-	  yysize1 = yysize + yystrlen (yyf);
-	  yysize_overflow |= yysize1 < yysize;
-	  yysize = yysize1;
-
-	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
-	    yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg)
-	    {
-	      /* Avoid sprintf, as that infringes on the user's name space.
-		 Don't have undefined behavior even if the translation
-		 produced a string with the wrong number of "%s"s.  */
-	      char *yyp = yymsg;
-	      int yyi = 0;
-	      while ((*yyp = *yyf))
-		{
-		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		    {
-		      yyp += yytnamerr (yyp, yyarg[yyi++]);
-		      yyf += 2;
-		    }
-		  else
-		    {
-		      yyp++;
-		      yyf++;
-		    }
-		}
-	      yyerror (qp, yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    {
-	      yyerror (qp, YY_("syntax error"));
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (qp, yymsg);
+	  }
+	else
+	  {
+	    yyerror (qp, YY_("syntax error"));
+	    if (yysize != 0)
 	      goto yyexhaustedlab;
-	    }
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror (qp, YY_("syntax error"));
+	  }
+      }
+#endif
     }
 
 
@@ -1630,14 +1786,15 @@ yyerrlab:
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
-        {
+	{
 	  /* Return failure if at end of input.  */
 	  if (yychar == YYEOF)
 	    YYABORT;
-        }
+	}
       else
 	{
-	  yydestruct ("Error: discarding", yytoken, &yylval);
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval, qp);
 	  yychar = YYEMPTY;
 	}
     }
@@ -1655,11 +1812,14 @@ yyerrorlab:
   /* Pacify compilers like GCC when the user code never invokes
      YYERROR and the label yyerrorlab therefore never appears in user
      code.  */
-  if (0)
+  if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-yyvsp -= yylen;
-  yyssp -= yylen;
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
   yystate = *yyssp;
   goto yyerrlab1;
 
@@ -1689,8 +1849,9 @@ yyerrlab1:
 	YYABORT;
 
 
-      yydestruct ("Error: popping", yystos[yystate], yyvsp);
-      YYPOPSTACK;
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp, qp);
+      YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
@@ -1701,7 +1862,7 @@ yyerrlab1:
   *++yyvsp = yylval;
 
 
-  /* Shift the error token. */
+  /* Shift the error token.  */
   YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
@@ -1735,18 +1896,27 @@ yyexhaustedlab:
 yyreturn:
   if (yychar != YYEOF && yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
+		 yytoken, &yylval, qp);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
-      YYPOPSTACK;
+		  yystos[*yyssp], yyvsp, qp);
+      YYPOPSTACK (1);
     }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-  return yyresult;
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
 
 
@@ -1754,7 +1924,7 @@ yyreturn:
 
 
 const char *special_char = "&:()[]{}!\"~^|<>=*?+-";
-const char *not_word =   " \t:()[]{}!\"~^|<>=";
+const char *not_word =   " \t()[]{}!\"~^|<>=";
 
 static int get_word(YYSTYPE *lvalp, QParser *qp)
 {
@@ -1772,10 +1942,10 @@ static int get_word(YYSTYPE *lvalp, QParser *qp)
 
     qp->qstrp--; /* need to back up one character */
     
-    while (!strchr(not_word, (c=*qp->qstrp++))) {
+    while (!strchr(not_word, (c = *qp->qstrp++))) {
         switch (c) {
             case '\\':
-                if ((c=*qp->qstrp) == '\0') {
+                if ((c = *qp->qstrp) == '\0') {
                     *bufp++ = '\\';
                 }
                 else {
@@ -1783,6 +1953,16 @@ static int get_word(YYSTYPE *lvalp, QParser *qp)
                     qp->qstrp++;
                 }
                 break;
+            case ':':
+                if ((*qp->qstrp) == ':') {
+                    qp->qstrp++;
+                    *bufp++ = ':';
+                    *bufp++ = ':';
+                }
+                else {
+                   goto get_word_done;
+                }
+                break;
             case '*': case '?':
                 is_wild = true;
                 /* fall through */
@@ -1798,6 +1978,7 @@ static int get_word(YYSTYPE *lvalp, QParser *qp)
             bufp = buf + MAX_WORD_SIZE;
         }
     }
+get_word_done:
     qp->qstrp--;
     /* check for keywords. There are only four so we have a bit of a hack which
      * just checks for all of them. */
@@ -1915,7 +2096,14 @@ static Query *get_bool_q(BCArray *bca)
     }
     else if (clause_count == 1) {
         BooleanClause *bc = bca->clauses[0];
-        q = bc->query;
+        if (bc->is_prohibited) {
+            q = bq_new(false);
+            bq_add_query_nr(q, bc->query, BC_MUST_NOT);
+            bq_add_query_nr(q, maq_new(), BC_MUST);
+        }
+        else {
+            q = bc->query;
+        }
         free(bc);
         free(bca->clauses);
     }
@@ -2287,6 +2475,15 @@ static Query *get_r_q(QParser *qp, char *field, char *from, char *to,
                       bool inc_lower, bool inc_upper)
 {
     Query *rq;
+    if (qp->wild_lower) {
+        if (from) {
+            lower_str(from);
+        }
+        if (to) {
+            lower_str(to);
+        }
+    }
+/*
     if (from) {
         TokenStream *stream = get_cached_ts(qp, field, from);
         Token *token = ts_next(stream);
@@ -2297,10 +2494,9 @@ static Query *get_r_q(QParser *qp, char *field, char *from, char *to,
         Token *token = ts_next(stream);
         to = token ? estrdup(token->text) : NULL;
     }
+*/
 
     rq = rq_new(field, from, to, inc_lower, inc_upper);
-    if (from) free(from);
-    if (to) free(to);
     return rq;
 }
 
@@ -2475,7 +2671,7 @@ Query *qp_get_bad_query(QParser *qp, char *str)
 
 Query *qp_parse(QParser *self, char *qstr)
 {
-    Query *result;
+    Query *result = NULL;
     mutex_lock(&self->mutex);
     if (self->clean_str) {
         self->qstrp = self->qstr = qp_clean_str(qstr);
@@ -2486,9 +2682,12 @@ Query *qp_parse(QParser *self, char *qstr)
     self->fields = self->def_fields;
     self->result = NULL;
 
-    yyparse(self);
-
-    result = self->result;
+    TRY
+      yyparse(self);
+      result = self->result;
+    XCATCHALL
+      if (self->handle_parse_errors) HANDLED();
+    XENDTRY
     if (!result && self->handle_parse_errors) {
         result = qp_get_bad_query(self, self->qstr);
     }
@@ -2503,4 +2702,3 @@ Query *qp_parse(QParser *self, char *qstr)
     return result;
 }
 
-