changeset 111:92507d269615

modify filtering rules.
author Ryoma SHINYA <shinya@firefly.cr.ie.u-ryukyu.ac.jp>
date Sat, 12 Feb 2011 16:52:39 +0900
parents d591da6e2988
children fcac8224a2e9
files pyrect/translator/grep_translator.py
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pyrect/translator/grep_translator.py	Sat Feb 12 16:41:25 2011 +0900
+++ b/pyrect/translator/grep_translator.py	Sat Feb 12 16:52:39 2011 +0900
@@ -26,7 +26,7 @@
         self.__bufsize = 1024 * 1024
         self.thread_dfa = 1
         self.thread_line = 1
-        self.filter = "quick"
+        self.filter = True
         self.filter_only = False
         self.filter_prefix = False
         self.skip_boost = True
@@ -61,7 +61,7 @@
 
         key = None
 
-        if (self.filter == "bmh" or self.filter == "quick" or self.filter == "memchr")\
+        if (self.filter == True or self.filter == "bmh" or self.filter == "quick" or self.filter == "memchr")\
                and self.regexp.must_words:
             key = max(self.regexp.must_words, key=len)
             if len(self.regexp.must_words) == 1 and len(key) == self.regexp.min_len:
@@ -81,10 +81,12 @@
         elif self.filter == "quick":
             self.emit_quick_filter(key)
         elif self.filter:
-            if len(key) > 5:
+            if len(key) < 8:
+                self.filter = "memchr"
+                self.emit_memchr_filter(key)
+            else:
+                self.filter = "quick"
                 self.emit_quick_filter(key)
-            else:
-                self.emit_memchr_filter(key)
 
         if self.skip_boost and not self.filter_only and \
                not AnyChar() in self.regexp.chars and \