ferret 0.10.1 → 0.10.2

data/ext/global.h

@@ -50,8 +50,13 @@ typedef void (*free_ft)(void *key);
     }\
   } while (0)
 
-#define Jx fprintf(stderr,"%s, %d: %s\n", __FILE__, __LINE__, __func__);
-#define Xj fprintf(stdout,"%s, %d: %s\n", __FILE__, __LINE__, __func__);
+#ifdef POSH_OS_WIN32
+# define Jx fprintf(stderr,"%s, %d\n", __FILE__, __LINE__);
+# define Xj fprintf(stdout,"%s, %d\n", __FILE__, __LINE__);
+#else
+# define Jx fprintf(stderr,"%s, %d: %s\n", __FILE__, __LINE__, __func__);
+# define Xj fprintf(stdout,"%s, %d: %s\n", __FILE__, __LINE__, __func__);
+#endif
 
 extern char *progname();
 extern void setprogname(const char *str);

data/ext/hash.c

@@ -58,7 +58,7 @@ typedef HashEntry *(*lookup_ft)(struct HashTable *ht, register const void *key);
  * @param ht the HashTable to do the fast lookup in
  * @param the hashkey we are looking for
  */
-static inline HashEntry *h_resize_lookup(HashTable *ht, register const ulong hash)
+static __inline HashEntry *h_resize_lookup(HashTable *ht, register const ulong hash)
 {
     register ulong perturb;
     register int mask = ht->mask;

data/ext/helper.c

@@ -1,6 +1,6 @@
 #include "helper.h"
 
-inline int hlp_string_diff(register const char *const s1,
+__inline int hlp_string_diff(register const char *const s1,
                            register const char *const s2)
 {
     register int i = 0;

data/ext/helper.h

@@ -3,7 +3,7 @@
 
 #include "defines.h"
 
-extern inline int hlp_string_diff(register const char *const s1,
+extern __inline int hlp_string_diff(register const char *const s1,
                                   register const char *const s2);
 extern f_i32 float2int(float f);
 extern float int2float(f_i32 i32);

data/ext/inc/lang.h

@@ -1,13 +1,19 @@
 #ifndef FRT_LANG_H
 #define FRT_LANG_H
 
-#include <ruby.h>
+#define RUBY_BINDINGS 1
+
 #include <stdarg.h>
+#include <ruby.h>
+
+#undef close
+#undef rename
 
 #define frt_malloc xmalloc
 #define frt_calloc(n) xcalloc(n, 1)
 #define frt_realloc xrealloc
 
+
 #ifdef FRT_HAS_ISO_VARARGS
 /* C99-compliant compiler */
 

data/ext/ind.c

@@ -108,7 +108,7 @@ void index_flush(Index *self)
     self->has_writes = false;
 }
 
-inline void ensure_writer_open(Index *self)
+__inline void ensure_writer_open(Index *self)
 {
     if (!self->iw) {
         INDEX_CLOSE_READER(self);
@@ -124,7 +124,7 @@ inline void ensure_writer_open(Index *self)
     }
 }
 
-inline void ensure_reader_open(Index *self)
+__inline void ensure_reader_open(Index *self)
 {
     if (self->ir) {
         if (self->check_latest && !ir_is_latest(self->ir)) {
@@ -140,7 +140,7 @@ inline void ensure_reader_open(Index *self)
     }
 }
 
-inline void ensure_searcher_open(Index *self)
+__inline void ensure_searcher_open(Index *self)
 {
     ensure_reader_open(self);
     if (!self->sea) {
@@ -187,7 +187,7 @@ bool index_is_deleted(Index *self, int doc_num)
     return is_del;
 }
 
-static inline void index_add_doc_i(Index *self, Document *doc)
+static __inline void index_add_doc_i(Index *self, Document *doc)
 {
     /* If there is a key specified delete the document with the same key */
     if (self->key) {

data/ext/ind.h

@@ -61,8 +61,8 @@ extern Explanation *index_explain(Index *self, Query *q, int doc_num);
 extern void index_auto_flush_ir(Index *self);
 extern void index_auto_flush_iw(Index *self);
 
-extern inline void ensure_searcher_open(Index *self);
-extern inline void ensure_reader_open(Index *self);
-extern inline void ensure_writer_open(Index *self);
+extern __inline void ensure_searcher_open(Index *self);
+extern __inline void ensure_reader_open(Index *self);
+extern __inline void ensure_writer_open(Index *self);
 
 #endif

data/ext/index.c

@@ -91,7 +91,7 @@ HashTable *co_hash_create()
  *
  ****************************************************************************/
 
-inline void fi_set_store(FieldInfo *fi, int store)
+ __inline void fi_set_store(FieldInfo *fi, int store)
 {
     switch (store) {
         case STORE_NO:
@@ -105,7 +105,7 @@ inline void fi_set_store(FieldInfo *fi, int store)
     }
 }
 
-inline void fi_set_index(FieldInfo *fi, int index)
+__inline void fi_set_index(FieldInfo *fi, int index)
 {
     switch (index) {
         case INDEX_NO:
@@ -126,7 +126,7 @@ inline void fi_set_index(FieldInfo *fi, int index)
     }
 }
 
-inline void fi_set_term_vector(FieldInfo *fi, int term_vector)
+__inline void fi_set_term_vector(FieldInfo *fi, int term_vector)
 {
     switch (term_vector) {
         case TERM_VECTOR_NO:
@@ -1071,7 +1071,7 @@ void fw_close(FieldsWriter *fw)
     free(fw);
 }
 
-static inline void save_data(OutStream *fdt_out, char *data, int dlen)
+static __inline void save_data(OutStream *fdt_out, char *data, int dlen)
 {
     os_write_vint(fdt_out, dlen);
     os_write_bytes(fdt_out, (uchar *)data, dlen);
@@ -1184,7 +1184,7 @@ void fw_add_postings(FieldsWriter *fw,
 
     if (fi_store_offsets(fi)) {
         /* use delta encoding for offsets */
-        int last_end = 0;
+        int last_end = 0;
         os_write_vint(fdt_out, offset_count);  /* write shared prefix length */
         for (i = 0; i < offset_count; i++) {
             int start = offsets[i].start;
@@ -1274,7 +1274,7 @@ static void sti_ensure_index_is_read(SegmentTermIndex *sti,
         for (i = 0; NULL != ste_next(index_te); i++) {
 #ifdef DEBUG
             if (i >= index_size) {
-                RAISE(ERROR, "index term enum read too many terms");
+                RAISE(FERRET_ERROR, "index term enum read too many terms");
             }
 #endif
             sti->index_terms[i] = te_get_term(index_te);
@@ -1367,7 +1367,7 @@ void sfi_close(SegmentFieldIndex *sfi)
  * SegmentTermEnum
  ****************************************************************************/
 
-static inline int term_read(char *buf, InStream *is)
+static __inline int term_read(char *buf, InStream *is)
 {
     int start = (int)is_read_vint(is);
     int length = (int)is_read_vint(is);
@@ -1444,6 +1444,10 @@ static char *ste_scan_to(TermEnum *te, const char *term)
     SegmentTermIndex *sti = h_get_int(sfi->field_dict, te->field_num);
     if (sti && sti->size > 0) {
         SFI_ENSURE_INDEX_IS_READ(sfi, sti);
+        if (term[0] == '\0') {
+            ste_index_seek(te, sti, 0);
+            return ste_next(te);;
+        }
         /* if current term is less than seek term */
         if (STE(te)->pos < STE(te)->size && strcmp(te->curr_term, term) <= 0) {
             int enum_offset = (int)(STE(te)->pos / sfi->index_interval) + 1;
@@ -1748,7 +1752,7 @@ TermEnum *mte_new(MultiReader *mr, int field_num, const char *term)
 
             tew = tew_setup(&(mte->tews[i]), starts[i], sub_te, reader);
             if (((term == NULL) && tew_next(tew))
-                || (tew->term && tew->term[0] != '\0')) {
+                || (tew->term && (tew->term[0] != '\0'))) {
                 pq_push(mte->tew_queue, tew);          /* initialize queue */
             }
         } else {
@@ -1788,11 +1792,12 @@ TermInfosReader *tir_open(Store *store,
     return tir;
 }
 
-static inline TermEnum *tir_enum(TermInfosReader *tir)
+static __inline TermEnum *tir_enum(TermInfosReader *tir)
 {
     TermEnum *te;
     if ((te = thread_getspecific(tir->thread_te)) == NULL) {
         te = ste_clone(tir->orig_te);
+        ste_set_field(te, tir->field_num);
         ary_push(tir->te_bucket, te);
         thread_setspecific(tir->thread_te, te);
     }
@@ -1913,7 +1918,7 @@ TermInfosWriter *tiw_open(Store *store,
     return tiw;
 }
 
-static inline void tw_write_term(TermWriter *tw,
+static __inline void tw_write_term(TermWriter *tw,
                                  OutStream *os,
                                  const char *term,
                                  int term_len)
@@ -1987,7 +1992,7 @@ void tiw_add(TermInfosWriter *tiw,
     }
 }
 
-static inline void tw_reset(TermWriter *tw)
+static __inline void tw_reset(TermWriter *tw)
 {
     tw->counter = 0;
     tw->last_term = EMPTY_STRING;
@@ -3085,8 +3090,8 @@ bool ir_is_latest(IndexReader *ir)
     Lock *commit_lock = ir->store->open_lock(ir->store, COMMIT_LOCK_NAME);
     if (!commit_lock->obtain(commit_lock)) {
         ir->store->close_lock(commit_lock);
-        RAISE(LOCK_ERROR, "Error trying to commit the index. Commit "
-                          "lock already obtained");
+        RAISE(LOCK_ERROR, "Error detecting if the current index is latest "
+              "version. Commit lock currently obtained");
     }
     is_latest = (sis_read_current_version(ir->store) == ir->sis->version);
     commit_lock->release(commit_lock);
@@ -3180,7 +3185,7 @@ typedef struct SegmentReader {
 #define SR(ir) ((SegmentReader *)(ir))
 #define SR_SIZE(ir) (SR(ir)->fr->size)
 
-static inline FieldsReader *sr_fr(SegmentReader *sr)
+static __inline FieldsReader *sr_fr(SegmentReader *sr)
 {
     FieldsReader *fr;
 
@@ -3192,12 +3197,12 @@ static inline FieldsReader *sr_fr(SegmentReader *sr)
     return fr;
 }
 
-static inline bool sr_is_deleted_i(SegmentReader *sr, int doc_num)
+static __inline bool sr_is_deleted_i(SegmentReader *sr, int doc_num)
 {
     return (sr->deleted_docs != NULL && bv_get(sr->deleted_docs, doc_num));
 }
 
-static inline void sr_get_norms_into_i(SegmentReader *sr, int field_num,
+static __inline void sr_get_norms_into_i(SegmentReader *sr, int field_num,
                                        uchar *buf)
 {
     Norm *norm = h_get_int(sr->norms, field_num);
@@ -3216,7 +3221,7 @@ static inline void sr_get_norms_into_i(SegmentReader *sr, int field_num,
     }
 }
 
-static inline uchar *sr_get_norms_i(SegmentReader *sr, int field_num)
+static __inline uchar *sr_get_norms_i(SegmentReader *sr, int field_num)
 {
     Norm *norm = h_get_int(sr->norms, field_num);
     if (norm == NULL) {                           /* not an indexed field */
@@ -3491,16 +3496,16 @@ static bool sr_has_deletions(IndexReader *ir)
 static void sr_open_norms(IndexReader *ir, Store *cfs_store)
 {
     int i;
+    Store *store = ir->store;
     char file_name[SEGMENT_NAME_MAX_LENGTH];
     FieldInfos *fis = ir->fis;
     char *ext_ptr;
-    const int field_cnt = fis->size;
-
+    const int field_cnt = fis->size;
+
     sprintf(file_name, "%s.", SR(ir)->segment);
     ext_ptr = file_name + strlen(file_name);
 
     for (i = 0; i < field_cnt; i++) {
-        Store *store = ir->store;
         if (fi_has_norms(fis->fields[i])) {
             sprintf(ext_ptr, "s%d", i);
             if (!store->exists(store, file_name)) {
@@ -3939,8 +3944,8 @@ IndexReader *mr_open(IndexReader **sub_readers, const int r_cnt)
         for (i = 0; i < r_cnt; i++) {
             FieldInfos *sub_fis = sub_readers[i]->fis;
             const int fis_size = fis->size;
-
-            mr->field_num_map[i] = ALLOC_N(int, fis_size);
+
+            mr->field_num_map[i] = ALLOC_N(int, fis_size);
             for (j = 0; j < fis_size; j++) {
                 FieldInfo *fi = fis->fields[j];
                 FieldInfo *fi_sub = fis_get_field(sub_fis, fi->name);
@@ -4384,7 +4389,7 @@ static void dw_add_posting(MemoryPool *mp,
     }
 }
 
-static inline void dw_add_offsets(DocWriter *dw, int pos, int start, int end)
+static __inline void dw_add_offsets(DocWriter *dw, int pos, int start, int end)
 {
     if (pos >= dw->offsets_capa) {
         int old_capa = dw->offsets_capa;
@@ -5050,7 +5055,8 @@ static char **iw_create_compound_file(Store *store, FieldInfos *fis,
 
     cw = open_cw(store, cfs_file_name);
     for (i = 0; i < NELEMS(COMPOUND_EXTENSIONS); i++) {
-        sprintf(file_name, "%s.%s", segment, COMPOUND_EXTENSIONS[i]);
+        sprintf(file_name, "%s.%s",
+                segment, COMPOUND_EXTENSIONS[i]);
         ary_push(file_names, estrdup(file_name));
     }
 
@@ -5196,7 +5202,8 @@ static void iw_maybe_merge_segments(IndexWriter *iw)
     int min_segment, merge_docs;
     SegmentInfo *si;
 
-    while (target_merge_docs <= iw->config.max_merge_docs) {
+    while (target_merge_docs > 0
+           && target_merge_docs <= iw->config.max_merge_docs) {
         /* find segments smaller than current target size */
         min_segment = iw->sis->size - 1;
         merge_docs = 0;
@@ -5212,7 +5219,7 @@ static void iw_maybe_merge_segments(IndexWriter *iw)
         if (merge_docs >= target_merge_docs) { /* found a merge to do */
             iw_merge_segments_from(iw, min_segment + 1);
         }
-        else {
+        else if (min_segment <= 0) {
             break;
         }
 

data/ext/index.h

@@ -471,7 +471,7 @@ typedef struct Posting
     struct Posting *next;
 } Posting;
 
-extern inline Posting *p_new(MemoryPool *mp, int doc_num, int pos);
+extern __inline Posting *p_new(MemoryPool *mp, int doc_num, int pos);
 
 /****************************************************************************
  *

data/ext/lang.h

@@ -1,13 +1,19 @@
 #ifndef FRT_LANG_H
 #define FRT_LANG_H
 
-#include <ruby.h>
+#define RUBY_BINDINGS 1
+
 #include <stdarg.h>
+#include <ruby.h>
+
+#undef close
+#undef rename
 
 #define frt_malloc xmalloc
 #define frt_calloc(n) xcalloc(n, 1)
 #define frt_realloc xrealloc
 
+
 #ifdef FRT_HAS_ISO_VARARGS
 /* C99-compliant compiler */
 

data/ext/mem_pool.c

@@ -21,7 +21,7 @@ MemoryPool *mp_new()
     return mp_new_capa(MP_BUF_SIZE, MP_INIT_CAPA);
 }
 
-inline void *mp_alloc(MemoryPool *mp, int size)
+__inline void *mp_alloc(MemoryPool *mp, int size)
 {
     char *p;
     p = mp->curr_buffer + mp->pointer;

data/ext/mem_pool.h

@@ -16,7 +16,7 @@ typedef struct MemoryPool {
 
 extern MemoryPool *mp_new();
 extern MemoryPool *mp_new_capa(int chunk_size, int init_capa);
-extern inline void *mp_alloc(MemoryPool *mp, int size);
+extern __inline void *mp_alloc(MemoryPool *mp, int size);
 extern void mp_reset(MemoryPool *mp);
 extern void mp_destroy(MemoryPool *mp);
 extern char *mp_strdup(MemoryPool *mp, const char *str);

data/ext/q_fuzzy.c

@@ -11,7 +11,7 @@
  *
  ****************************************************************************/
 
-static inline int fuzq_calculate_max_distance(FuzzyQuery *fuzq, int m) 
+static __inline int fuzq_calculate_max_distance(FuzzyQuery *fuzq, int m) 
 {
     return (int)((1.0 - fuzq->min_sim) * (MIN(fuzq->text_len, m) + fuzq->pre_len));
 }
@@ -24,7 +24,7 @@ static void fuzq_initialize_max_distances(FuzzyQuery *fuzq)
     }
 }
 
-static inline int fuzq_get_max_distance(FuzzyQuery *fuzq, int m)
+static __inline int fuzq_get_max_distance(FuzzyQuery *fuzq, int m)
 {
     return (m < TYPICAL_LONGEST_WORD) ? fuzq->max_distances[m]
         : fuzq_calculate_max_distance(fuzq, m);

data/ext/q_match_all.c

@@ -114,9 +114,9 @@ char *maq_to_s(Query *self, const char *field)
 {
     (void)field;
     if (self->boost == 1.0) {
-        return estrdup("MatchAll");
+        return estrdup("*");
     } else {
-        return strfmt("MatchAll^%f", self->boost);
+        return strfmt("*^%f", self->boost);
     }
 }
 

data/ext/q_multi_term.c

@@ -236,7 +236,7 @@ static bool multi_tsc_advance_to(Scorer *self, int target_doc_num)
     return (pq_top(tdew_pq) == NULL) ? false : true;
 }
 
-static inline bool multi_tsc_skip_to(Scorer *self, int target_doc_num)
+static __inline bool multi_tsc_skip_to(Scorer *self, int target_doc_num)
 {
     return multi_tsc_advance_to(self, target_doc_num) && multi_tsc_next(self);
 }

data/ext/q_parser.c

@@ -56,7 +56,7 @@
    /* Put the tokens into the symbol table, so that GDB and other debuggers
       know about them.  */
    enum yytokentype {
-     WORD = 258,
+     QWRD = 258,
      WILD_STR = 259,
      LOW = 260,
      OR = 261,
@@ -67,7 +67,7 @@
    };
 #endif
 /* Tokens.  */
-#define WORD 258
+#define QWRD 258
 #define WILD_STR 259
 #define LOW 260
 #define OR 261
@@ -133,7 +133,7 @@ typedef union YYSTYPE {
     char *str;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 137 "src/q_parser.c"
+#line 137 "y.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -197,7 +197,7 @@ static Query *get_range_q(const char *field, const char *from, const char *to,
 
 
 /* Line 219 of yacc.c.  */
-#line 201 "src/q_parser.c"
+#line 201 "y.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -450,7 +450,7 @@ static const unsigned char yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "WORD", "WILD_STR", "LOW", "OR", "AND",
+  "$end", "error", "$undefined", "QWRD", "WILD_STR", "LOW", "OR", "AND",
   "NOT", "REQ", "':'", "HIGH", "'^'", "'('", "')'", "'~'", "'*'", "'|'",
   "'\"'", "'<'", "'>'", "'['", "']'", "'}'", "'{'", "'='", "$accept",
   "bool_q", "bool_clss", "bool_cls", "boosted_q", "q", "term_q", "wild_q",
@@ -1250,217 +1250,217 @@ yyreduce:
     {
         case 2:
 #line 99 "src/q_parser.y"
-    { qp->result = (yyval.query) = NULL; ;}
+    { qp->result = (yyval.query) = NULL; }
     break;
 
   case 3:
 #line 100 "src/q_parser.y"
-    { qp->result = (yyval.query) = get_bool_q((yyvsp[0].bclss)); ;}
+    { qp->result = (yyval.query) = get_bool_q((yyvsp[0].bclss)); }
     break;
 
   case 4:
 #line 102 "src/q_parser.y"
-    { (yyval.bclss) = first_cls((yyvsp[0].bcls)); ;}
+    { (yyval.bclss) = first_cls((yyvsp[0].bcls)); }
     break;
 
   case 5:
 #line 103 "src/q_parser.y"
-    { (yyval.bclss) = add_and_cls((yyvsp[-2].bclss), (yyvsp[0].bcls)); ;}
+    { (yyval.bclss) = add_and_cls((yyvsp[-2].bclss), (yyvsp[0].bcls)); }
     break;
 
   case 6:
 #line 104 "src/q_parser.y"
-    { (yyval.bclss) = add_or_cls((yyvsp[-2].bclss), (yyvsp[0].bcls)); ;}
+    { (yyval.bclss) = add_or_cls((yyvsp[-2].bclss), (yyvsp[0].bcls)); }
     break;
 
   case 7:
 #line 105 "src/q_parser.y"
-    { (yyval.bclss) = add_default_cls(qp, (yyvsp[-1].bclss), (yyvsp[0].bcls)); ;}
+    { (yyval.bclss) = add_default_cls(qp, (yyvsp[-1].bclss), (yyvsp[0].bcls)); }
     break;
 
   case 8:
 #line 107 "src/q_parser.y"
-    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_MUST); ;}
+    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_MUST); }
     break;
 
   case 9:
 #line 108 "src/q_parser.y"
-    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_MUST_NOT); ;}
+    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_MUST_NOT); }
     break;
 
   case 10:
 #line 109 "src/q_parser.y"
-    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_SHOULD); ;}
+    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_SHOULD); }
     break;
 
   case 12:
 #line 112 "src/q_parser.y"
-    { if ((yyvsp[-2].query)) sscanf((yyvsp[0].str),"%f",&((yyvsp[-2].query)->boost)); (yyval.query)=(yyvsp[-2].query); ;}
+    { if ((yyvsp[-2].query)) sscanf((yyvsp[0].str),"%f",&((yyvsp[-2].query)->boost)); (yyval.query)=(yyvsp[-2].query); }
     break;
 
   case 14:
 #line 115 "src/q_parser.y"
-    { (yyval.query) = get_bool_q((yyvsp[-1].bclss)); ;}
+    { (yyval.query) = get_bool_q((yyvsp[-1].bclss)); }
     break;
 
   case 19:
 #line 121 "src/q_parser.y"
-    { FLDS((yyval.query), get_term_q(qp, field, (yyvsp[0].str))); ;}
+    { FLDS((yyval.query), get_term_q(qp, field, (yyvsp[0].str))); }
     break;
 
   case 20:
 #line 122 "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[-2].str), (yyvsp[0].str))); }
     break;
 
   case 21:
 #line 123 "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].str), NULL)); }
     break;
 
   case 22:
 #line 125 "src/q_parser.y"
-    { FLDS((yyval.query), get_wild_q(qp, field, (yyvsp[0].str))); ;}
+    { FLDS((yyval.query), get_wild_q(qp, field, (yyvsp[0].str))); }
     break;
 
   case 23:
 #line 127 "src/q_parser.y"
-    { qp->fields = qp->def_fields; ;}
+    { qp->fields = qp->def_fields; }
     break;
 
   case 24:
 #line 128 "src/q_parser.y"
-    { (yyval.query) = (yyvsp[-1].query); ;}
+    { (yyval.query) = (yyvsp[-1].query); }
     break;
 
   case 25:
 #line 129 "src/q_parser.y"
-    { qp->fields = qp->all_fields; ;}
+    { qp->fields = qp->all_fields; }
     break;
 
   case 26:
 #line 129 "src/q_parser.y"
-    {qp->fields = qp->def_fields;;}
+    {qp->fields = qp->def_fields;}
     break;
 
   case 27:
 #line 130 "src/q_parser.y"
-    { (yyval.query) = (yyvsp[-1].query); ;}
+    { (yyval.query) = (yyvsp[-1].query); }
     break;
 
   case 28:
 #line 132 "src/q_parser.y"
-    { (yyval.hashset) = first_field(qp, (yyvsp[0].str)); ;}
+    { (yyval.hashset) = first_field(qp, (yyvsp[0].str)); }
     break;
 
   case 29:
 #line 133 "src/q_parser.y"
-    { (yyval.hashset) = add_field(qp, (yyvsp[0].str));;}
+    { (yyval.hashset) = add_field(qp, (yyvsp[0].str));}
     break;
 
   case 30:
 #line 135 "src/q_parser.y"
-    { (yyval.query) = get_phrase_q(qp, (yyvsp[-1].phrase), NULL); ;}
+    { (yyval.query) = get_phrase_q(qp, (yyvsp[-1].phrase), NULL); }
     break;
 
   case 31:
 #line 136 "src/q_parser.y"
-    { (yyval.query) = get_phrase_q(qp, (yyvsp[-3].phrase), (yyvsp[0].str)); ;}
+    { (yyval.query) = get_phrase_q(qp, (yyvsp[-3].phrase), (yyvsp[0].str)); }
     break;
 
   case 32:
 #line 137 "src/q_parser.y"
-    { (yyval.query) = NULL; ;}
+    { (yyval.query) = NULL; }
     break;
 
   case 33:
 #line 138 "src/q_parser.y"
-    { (yyval.query) = NULL; ;}
+    { (yyval.query) = NULL; }
     break;
 
   case 34:
 #line 140 "src/q_parser.y"
-    { (yyval.phrase) = ph_first_word((yyvsp[0].str)); ;}
+    { (yyval.phrase) = ph_first_word((yyvsp[0].str)); }
     break;
 
   case 35:
 #line 141 "src/q_parser.y"
-    { (yyval.phrase) = ph_first_word(NULL); ;}
+    { (yyval.phrase) = ph_first_word(NULL); }
     break;
 
   case 36:
 #line 142 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_word((yyvsp[-1].phrase), (yyvsp[0].str)); ;}
+    { (yyval.phrase) = ph_add_word((yyvsp[-1].phrase), (yyvsp[0].str)); }
     break;
 
   case 37:
 #line 143 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_word((yyvsp[-2].phrase), NULL); ;}
+    { (yyval.phrase) = ph_add_word((yyvsp[-2].phrase), NULL); }
     break;
 
   case 38:
 #line 144 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_multi_word((yyvsp[-2].phrase), (yyvsp[0].str));  ;}
+    { (yyval.phrase) = ph_add_multi_word((yyvsp[-2].phrase), (yyvsp[0].str));  }
     break;
 
   case 39:
 #line 146 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  true)); ;}
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  true)); }
     break;
 
   case 40:
 #line 147 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  false)); ;}
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  false)); }
     break;
 
   case 41:
 #line 148 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, true)); ;}
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, true)); }
     break;
 
   case 42:
 #line 149 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, false)); ;}
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, false)); }
     break;
 
   case 43:
 #line 150 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[-1].str),  false, false)); ;}
+    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[-1].str),  false, false)); }
     break;
 
   case 44:
 #line 151 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[-1].str),  false, true)); ;}
+    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[-1].str),  false, true)); }
     break;
 
   case 45:
 #line 152 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-1].str),  NULL,true,  false)); ;}
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-1].str),  NULL,true,  false)); }
     break;
 
   case 46:
 #line 153 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-1].str),  NULL,false, false)); ;}
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-1].str),  NULL,false, false)); }
     break;
 
   case 47:
 #line 154 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[0].str),  false, false)); ;}
+    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[0].str),  false, false)); }
     break;
 
   case 48:
 #line 155 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[0].str),  false, true)); ;}
+    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[0].str),  false, true)); }
     break;
 
   case 49:
 #line 156 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[0].str),  NULL,true,  false)); ;}
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[0].str),  NULL,true,  false)); }
     break;
 
   case 50:
 #line 157 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[0].str),  NULL,false, false)); ;}
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[0].str),  NULL,false, false)); }
     break;
 
 
@@ -1468,7 +1468,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 1472 "src/q_parser.c"
+#line 1472 "y.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1785,8 +1785,10 @@ static int get_word(YYSTYPE *lvalp, QParser *qp)
 
     /* found a word so return it. */
     lvalp->str = buf;
-    if (is_wild) return WILD_STR;
-    return WORD;
+    if (is_wild) {
+        return WILD_STR;
+    }
+    return QWRD;
 }
 
 static int yylex(YYSTYPE *lvalp, QParser *qp)
@@ -1806,6 +1808,8 @@ static int yylex(YYSTYPE *lvalp, QParser *qp)
             case '*':
                 if (nc == ':') return c;
                 break;
+            case '?':
+                break;
             case '&':
                 if (nc == '&') {
                     qp->qstrp++;
@@ -2046,7 +2050,11 @@ static Query *get_wild_q(QParser *qp, char *field, char *pattern)
     
     /* simplify the wildcard query to a prefix query if possible. Basically a
      * prefix query is any wildcard query that has a '*' as the last character
-     * and no other wildcard characters before it. */
+     * and no other wildcard characters before it. "*" by itself will expand
+     * to a MatchAllQuery */
+    if (strcmp(pattern, "*") == 0) {
+        return maq_new();
+    }
     if (pattern[len - 1] == '*') {
         is_prefix = true;
         for (p = &pattern[len - 2]; p >= pattern; p--) {