[Groonga-commit] groonga/groonga at bb29cb6 [master] TokenRegexp: reduce needless last token

Back to archive index

Kouhei Sutou null+****@clear*****
Thu Mar 12 22:07:52 JST 2015


Kouhei Sutou	2015-03-12 22:07:52 +0900 (Thu, 12 Mar 2015)

  New Revision: bb29cb6f7eed1efe7a6e049b3334564a55ec4e6e
  https://github.com/groonga/groonga/commit/bb29cb6f7eed1efe7a6e049b3334564a55ec4e6e

  Message:
    TokenRegexp: reduce needless last token

  Modified files:
    lib/tokenizers.c

  Modified: lib/tokenizers.c (+3 -3)
===================================================================
--- lib/tokenizers.c    2015-03-12 21:11:50 +0900 (d5b3db9)
+++ lib/tokenizers.c    2015-03-12 22:07:52 +0900 (ef1a0c5)
@@ -644,14 +644,14 @@ regexp_next(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
   if (tokenizer->next == end) {
     tokenizer->is_end = GRN_TRUE;
     if (mode == GRN_TOKEN_GET) {
-      if (status & GRN_TOKEN_UNMATURED) {
-        status |= GRN_TOKEN_FORCE_PREFIX;
-      }
       if (!tokenizer->get.have_end) {
         status |= GRN_TOKEN_LAST | GRN_TOKEN_REACH_END;
+      } else if (status & GRN_TOKEN_UNMATURED) {
+        status |= GRN_TOKEN_FORCE_PREFIX;
       }
     }
   }
+
   grn_tokenizer_token_push(ctx,
                            &(tokenizer->token),
                            (const char *)start,
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index