re-organize matcher part 2; more to come but this should

work. cc me if there are any regressions.

* src/matcher.h
	add prototype for get_matchparser_tab_id()
* src/matcher_parser_lex.l
	look up keywords using matchparser_tab_id();

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 19f79b906cb6f49164eabc624a0e6f7a78701196..f360333672f7c71280a198e23611f620cdb1fbe1 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2002-12-27 [alfons]    0.8.8claws14
+
+       re-organize matcher part 2; more to come but this should
+       work. cc me if there are any regressions.
+
+       * src/matcher.h
+               add prototype for get_matchparser_tab_id()
+       * src/matcher_parser_lex.l
+               look up keywords using matchparser_tab_id();
+
 2002-12-27 [alfons]    0.8.8claws12
 
        re-organize matcher part 1

diff --git a/configure.in b/configure.in
index 6ca120a1986b1cee637e86d4978958b5560d4d35..9ba2757e31154813c0030d484423f3a21e08cd26 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws12
+EXTRA_VERSION=claws14
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/matcher.h b/src/matcher.h
index 547878a72711d4265f7fe1c599075d343fc7d640..722f28ded183730f4deeff874865a94f3760ef6d 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -124,6 +124,7 @@ enum {
 };
 
 gchar * get_matchparser_tab_str(gint id);
+gint get_matchparser_tab_id(const gchar *str); 
 MatcherProp * matcherprop_new(gint criteria, gchar * header,
                              gint matchtype, gchar * expr,
                              int age);

diff --git a/src/matcher_parser_lex.l b/src/matcher_parser_lex.l
index ab4451b5520ade6440f58e7dd025dda4deab884b..2b3218f165be9804034c29fd829bb7c109046158 100644 (file)
--- a/src/matcher_parser_lex.l
+++ b/src/matcher_parser_lex.l
@@ -34,75 +34,20 @@ void matcher_parser_init(void)
 %x section
 
 %%
+                       
+                       /*
+                        * a keyword consists of alpha and underscore 
+                        * characters, possibly preceded by a tilde (~)
+                        */
 
-"all"          return MATCHER_ALL;
-"unread"       return MATCHER_UNREAD;
-"~unread"      return MATCHER_NOT_UNREAD;
-"new"          return MATCHER_NEW;
-"~new"         return MATCHER_NOT_NEW;
-"marked"       return MATCHER_MARKED;
-"~marked"      return MATCHER_NOT_MARKED;
-"deleted"      return MATCHER_DELETED;
-"~deleted"     return MATCHER_NOT_DELETED;
-"replied"      return MATCHER_REPLIED;
-"~replied"     return MATCHER_NOT_REPLIED;
-"forwarded"    return MATCHER_FORWARDED;
-"~forwarded"   return MATCHER_NOT_FORWARDED;
-"locked"       return MATCHER_LOCKED;
-"~locked"      return MATCHER_NOT_LOCKED;
-"colorlabel"   return MATCHER_COLORLABEL;
-"~colorlabel"  return MATCHER_NOT_COLORLABEL;
-"subject"      return MATCHER_SUBJECT;
-"~subject"     return MATCHER_NOT_SUBJECT;
-"from"         return MATCHER_FROM;
-"~from"                return MATCHER_NOT_FROM;
-"to"           return MATCHER_TO;
-"~to"          return MATCHER_NOT_TO;
-"cc"           return MATCHER_CC;
-"~cc"          return MATCHER_NOT_CC;
-"to_or_cc"     return MATCHER_TO_OR_CC;
-"~to_or_cc"    return MATCHER_NOT_TO_AND_NOT_CC;
-"age_greater"  return MATCHER_AGE_GREATER;
-"age_lower"    return MATCHER_AGE_LOWER;
-"newsgroups"   return MATCHER_NEWSGROUPS;
-"~newsgroups"  return MATCHER_NOT_NEWSGROUPS;
-"inreplyto"    return MATCHER_INREPLYTO;
-"~inreplyto"   return MATCHER_NOT_INREPLYTO;
-"references"   return MATCHER_REFERENCES;
-"~references"  return MATCHER_NOT_REFERENCES;
-"score_greater"        return MATCHER_SCORE_GREATER;
-"score_lower"  return MATCHER_SCORE_LOWER;
-"score_equal"  return MATCHER_SCORE_EQUAL;
-"size_greater"  return MATCHER_SIZE_GREATER;
-"size_smaller"  return MATCHER_SIZE_SMALLER;
-"size_equal"    return MATCHER_SIZE_EQUAL;
-"header"       return MATCHER_HEADER;
-"~header"      return MATCHER_NOT_HEADER;
-"headers_part" return MATCHER_HEADERS_PART;
-"~headers_part"        return MATCHER_NOT_HEADERS_PART;
-"message"      return MATCHER_MESSAGE;
-"~message"     return MATCHER_NOT_MESSAGE;
-"body_part"    return MATCHER_BODY_PART;
-"~body_part"   return MATCHER_NOT_BODY_PART;
-"execute"      return MATCHER_EXECUTE;
-"~execute"     return MATCHER_NOT_EXECUTE;
-"matchcase"    return MATCHER_MATCHCASE;
-"match"                return MATCHER_MATCH;
-"regexpcase"   return MATCHER_REGEXPCASE;
-"regexp"       return MATCHER_REGEXP;
-"score"                return MATCHER_SCORE;
-"move"         return MATCHER_MOVE;
-"copy"         return MATCHER_COPY;
-"delete"       return MATCHER_DELETE;
-"mark"         return MATCHER_MARK;
-"unmark"       return MATCHER_UNMARK;
-"mark_as_read" return MATCHER_MARK_AS_READ;
-"mark_as_unread"       return MATCHER_MARK_AS_UNREAD;
-"forward"             return MATCHER_FORWARD;
-"forward_as_attachment"              return MATCHER_FORWARD_AS_ATTACHMENT;
-"color"         return MATCHER_COLOR;
-"redirect"     return MATCHER_REDIRECT;
-"delete_on_server"     return MATCHER_DELETE_ON_SERVER;
+(~|[a-z])[a-z_]*       {
+                               gint id;
+
+                               if (-1 == (id = get_matchparser_tab_id(yytext))) { 
+                                       REJECT;
+                               } else                                  
+                                       return id;
+                       }
 [ \t]+
 "\n"           return MATCHER_EOL;
 "&"            return MATCHER_AND;