#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
-#include "intl.h"
#include "utils.h"
#include "filtering.h"
-#include "scoring.h"
#include "matcher.h"
#include "matcher_parser.h"
#include "matcher_parser_lex.h"
static GSList *matchers_list = NULL;
static MatcherList *cond;
-static gint score = 0;
+static GSList *action_list = NULL;
static FilteringAction *action = NULL;
static FilteringProp *filtering;
-static ScoringProp *scoring = NULL;
-static GSList **prefs_scoring = NULL;
static GSList **prefs_filtering = NULL;
+static int enable_compatibility = 0;
+
+enum {
+ MATCHER_PARSE_FILE,
+ MATCHER_PARSE_NO_EOL,
+ MATCHER_PARSE_CONDITION,
+ MATCHER_PARSE_FILTERING_ACTION,
+};
+
+static int matcher_parse_op = MATCHER_PARSE_FILE;
-static int matcher_parser_dialog = 0;
/* ******************************************************************** */
matcher_parserrestart(f);
matcher_parserparse();
}
+
+
+void * matcher_parser_scan_string(const char * str);
FilteringProp *matcher_parser_get_filtering(gchar *str)
{
/* bad coding to enable the sub-grammar matching
in yacc */
matcher_parserlineno = 1;
- matcher_parser_dialog = 1;
+ matcher_parse_op = MATCHER_PARSE_NO_EOL;
matcher_parserrestart(NULL);
matcher_parser_init();
- bufstate = matcher_parser_scan_string(str);
+ bufstate = matcher_parser_scan_string((const char *) str);
matcher_parser_switch_to_buffer(bufstate);
if (matcher_parserparse() != 0)
filtering = NULL;
- matcher_parser_dialog = 0;
+ matcher_parse_op = MATCHER_PARSE_FILE;
matcher_parser_delete_buffer(bufstate);
return filtering;
}
-ScoringProp *matcher_parser_get_scoring(gchar *str)
-{
- void *bufstate;
-
- /* bad coding to enable the sub-grammar matching
- in yacc */
- matcher_parserlineno = 1;
- matcher_parser_dialog = 1;
- matcher_parserrestart(NULL);
- matcher_parser_init();
- bufstate = matcher_parser_scan_string(str);
- matcher_parser_switch_to_buffer(bufstate);
- if (matcher_parserparse() != 0)
- scoring = NULL;
- matcher_parser_dialog = 0;
- matcher_parser_delete_buffer(bufstate);
- return scoring;
-}
-
static gboolean check_quote_symetry(gchar *str)
{
- gchar *walk;
+ const gchar *walk;
int ret = 0;
if (str == NULL)
/* bad coding to enable the sub-grammar matching
in yacc */
matcher_parserlineno = 1;
- matcher_parser_dialog = 1;
+ matcher_parse_op = MATCHER_PARSE_CONDITION;
matcher_parserrestart(NULL);
matcher_parser_init();
bufstate = matcher_parser_scan_string(str);
matcher_parserparse();
- matcher_parser_dialog = 0;
+ matcher_parse_op = MATCHER_PARSE_FILE;
matcher_parser_delete_buffer(bufstate);
return cond;
}
+GSList *matcher_parser_get_action_list(gchar *str)
+{
+ void *bufstate;
+
+ if (!check_quote_symetry(str)) {
+ action_list = NULL;
+ return action_list;
+ }
+
+ /* bad coding to enable the sub-grammar matching
+ in yacc */
+ matcher_parserlineno = 1;
+ matcher_parse_op = MATCHER_PARSE_FILTERING_ACTION;
+ matcher_parserrestart(NULL);
+ matcher_parser_init();
+ bufstate = matcher_parser_scan_string(str);
+ matcher_parserparse();
+ matcher_parse_op = MATCHER_PARSE_FILE;
+ matcher_parser_delete_buffer(bufstate);
+ return action_list;
+}
+
MatcherProp *matcher_parser_get_prop(gchar *str)
{
MatcherList *list;
matchers_list = NULL;
}
cond = NULL;
- g_warning("scoring / filtering parsing: %i: %s\n",
+ g_warning("filtering parsing: %i: %s\n",
matcher_parserlineno, str);
error = 1;
}
%token MATCHER_SCORE_LOWER MATCHER_HEADER MATCHER_NOT_HEADER
%token MATCHER_HEADERS_PART MATCHER_NOT_HEADERS_PART MATCHER_MESSAGE
%token MATCHER_NOT_MESSAGE MATCHER_BODY_PART MATCHER_NOT_BODY_PART
-%token MATCHER_EXECUTE MATCHER_NOT_EXECUTE MATCHER_MATCHCASE MATCHER_MATCH
+%token MATCHER_TEST MATCHER_NOT_TEST MATCHER_MATCHCASE MATCHER_MATCH
%token MATCHER_REGEXPCASE MATCHER_REGEXP MATCHER_SCORE MATCHER_MOVE
-%token MATCHER_COPY MATCHER_DELETE MATCHER_MARK MATCHER_UNMARK MATCHER_LOCK MATCHER_UNLOCK
+%token MATCHER_ANY_IN_ADDRESSBOOK MATCHER_ALL_IN_ADDRESSBOOK
+%token MATCHER_COPY MATCHER_DELETE MATCHER_MARK MATCHER_UNMARK
+%token MATCHER_LOCK MATCHER_UNLOCK
+%token MATCHER_EXECUTE
%token MATCHER_MARK_AS_READ MATCHER_MARK_AS_UNREAD MATCHER_FORWARD
%token MATCHER_FORWARD_AS_ATTACHMENT MATCHER_EOL MATCHER_STRING
%token MATCHER_OR MATCHER_AND
%token MATCHER_COLOR MATCHER_SCORE_EQUAL MATCHER_REDIRECT
%token MATCHER_SIZE_GREATER MATCHER_SIZE_SMALLER MATCHER_SIZE_EQUAL
%token MATCHER_LOCKED MATCHER_NOT_LOCKED
+%token MATCHER_PARTIAL MATCHER_NOT_PARTIAL
%token MATCHER_COLORLABEL MATCHER_NOT_COLORLABEL
%token MATCHER_IGNORE_THREAD MATCHER_NOT_IGNORE_THREAD
-%token MATCHER_CHANGE_SCORE
+%token MATCHER_CHANGE_SCORE MATCHER_SET_SCORE
+%token MATCHER_STOP MATCHER_HIDE
%start file
file:
{
- if (!matcher_parser_dialog) {
- prefs_scoring = &global_scoring;
- prefs_filtering = &global_processing;
+ if (matcher_parse_op == MATCHER_PARSE_FILE) {
+ prefs_filtering = &pre_global_processing;
}
}
file_line_list;
file_line:
section_notification
-| instruction
+|
+{ action_list = NULL; }
+instruction
| error MATCHER_EOL
{
yyerrok;
gchar *folder = $1;
FolderItem *item = NULL;
- if (!matcher_parser_dialog) {
+ if (matcher_parse_op == MATCHER_PARSE_FILE) {
+ enable_compatibility = 0;
if (!strcmp(folder, "global")) {
- prefs_scoring = &global_scoring;
- prefs_filtering = &global_processing;
- } else {
+ /* backward compatibility */
+ enable_compatibility = 1;
+ }
+ else if (!strcmp(folder, "preglobal")) {
+ prefs_filtering = &pre_global_processing;
+ }
+ else if (!strcmp(folder, "postglobal")) {
+ prefs_filtering = &post_global_processing;
+ }
+ else if (!strcmp(folder, "filtering")) {
+ prefs_filtering = &filtering_rules;
+ }
+ else {
item = folder_find_item_from_identifier(folder);
if (item != NULL) {
- prefs_scoring = &item->prefs->scoring;
prefs_filtering = &item->prefs->processing;
} else {
- prefs_scoring = NULL;
prefs_filtering = NULL;
}
}
;
instruction:
-condition end_instr_opt
-| MATCHER_EOL
-;
-
-end_instr_opt:
-filtering_or_scoring end_action
-|
+condition filtering MATCHER_EOL
+| condition filtering
{
- if (matcher_parser_dialog)
+ if (matcher_parse_op == MATCHER_PARSE_NO_EOL)
YYACCEPT;
else {
matcher_parsererror("parse error");
YYERROR;
}
}
-;
-
-end_action:
-MATCHER_EOL
-|
+| condition
{
- if (matcher_parser_dialog)
+ if (matcher_parse_op == MATCHER_PARSE_CONDITION)
YYACCEPT;
else {
matcher_parsererror("parse error");
YYERROR;
}
}
+| filtering_action_list
+{
+ if (matcher_parse_op == MATCHER_PARSE_FILTERING_ACTION)
+ YYACCEPT;
+ else {
+ matcher_parsererror("parse error");
+ YYERROR;
+ }
+}
+| MATCHER_EOL
;
-filtering_or_scoring:
-filtering_action
-{
- filtering = filteringprop_new(cond, action);
+filtering:
+filtering_action_list
+{
+ filtering = filteringprop_new(cond, action_list);
+
+ if (enable_compatibility) {
+ prefs_filtering = &filtering_rules;
+ if (action_list != NULL) {
+ FilteringAction * first_action;
+
+ first_action = action_list->data;
+
+ if (first_action->type == MATCHACTION_CHANGE_SCORE)
+ prefs_filtering = &pre_global_processing;
+ }
+ }
+
cond = NULL;
- action = NULL;
- if (!matcher_parser_dialog && (prefs_filtering != NULL)) {
+ action_list = NULL;
+
+ if ((matcher_parse_op == MATCHER_PARSE_FILE) &&
+ (prefs_filtering != NULL)) {
*prefs_filtering = g_slist_append(*prefs_filtering,
filtering);
filtering = NULL;
}
}
-| scoring_rule
+;
+
+filtering_action_list:
+filtering_action_b filtering_action_list
+| filtering_action_b
+;
+
+filtering_action_b:
+filtering_action
{
- scoring = scoringprop_new(cond, score);
- cond = NULL;
- score = 0;
- if (!matcher_parser_dialog && (prefs_scoring != NULL)) {
- *prefs_scoring = g_slist_append(*prefs_scoring, scoring);
- scoring = NULL;
- }
+ action_list = g_slist_append(action_list, action);
+ action = NULL;
}
;
{
match_type = MATCHTYPE_REGEXP;
}
+| MATCHER_ANY_IN_ADDRESSBOOK
+{
+ match_type = MATCHTYPE_ANY_IN_ADDRESSBOOK;
+}
+| MATCHER_ALL_IN_ADDRESSBOOK
+{
+ match_type = MATCHTYPE_ALL_IN_ADDRESSBOOK;
+}
;
condition:
gint criteria = 0;
criteria = MATCHCRITERIA_ALL;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_UNREAD
{
gint criteria = 0;
criteria = MATCHCRITERIA_UNREAD;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_NOT_UNREAD
{
gint criteria = 0;
criteria = MATCHCRITERIA_NOT_UNREAD;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_NEW
{
gint criteria = 0;
criteria = MATCHCRITERIA_NEW;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_NOT_NEW
{
gint criteria = 0;
criteria = MATCHCRITERIA_NOT_NEW;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_MARKED
{
gint criteria = 0;
criteria = MATCHCRITERIA_MARKED;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_NOT_MARKED
{
gint criteria = 0;
criteria = MATCHCRITERIA_NOT_MARKED;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_DELETED
{
gint criteria = 0;
criteria = MATCHCRITERIA_DELETED;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_NOT_DELETED
{
gint criteria = 0;
criteria = MATCHCRITERIA_NOT_DELETED;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_REPLIED
{
gint criteria = 0;
criteria = MATCHCRITERIA_REPLIED;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_NOT_REPLIED
{
gint criteria = 0;
criteria = MATCHCRITERIA_NOT_REPLIED;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_FORWARDED
{
gint criteria = 0;
criteria = MATCHCRITERIA_FORWARDED;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_NOT_FORWARDED
{
gint criteria = 0;
criteria = MATCHCRITERIA_NOT_FORWARDED;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_LOCKED
{
gint criteria = 0;
criteria = MATCHCRITERIA_LOCKED;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_NOT_LOCKED
{
gint criteria = 0;
criteria = MATCHCRITERIA_NOT_LOCKED;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
+}
+| MATCHER_PARTIAL
+{
+ gint criteria = 0;
+
+ criteria = MATCHCRITERIA_PARTIAL;
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
+}
+| MATCHER_NOT_PARTIAL
+{
+ gint criteria = 0;
+
+ criteria = MATCHCRITERIA_NOT_PARTIAL;
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_COLORLABEL MATCHER_INTEGER
{
gint value = 0;
criteria = MATCHCRITERIA_COLORLABEL;
- value = atoi($2);
- if (value < 1) value = 1;
+ value = strtol($2, NULL, 10);
+ if (value < 0) value = 0;
else if (value > MAX_COLORLABELS) value = MAX_COLORLABELS;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, value);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_NOT_COLORLABEL MATCHER_INTEGER
{
gint value = 0;
criteria = MATCHCRITERIA_NOT_COLORLABEL;
- value = atoi($2);
- if (value < 1) value = 1;
+ value = strtol($2, NULL, 0);
+ if (value < 0) value = 0;
else if (value > MAX_COLORLABELS) value = MAX_COLORLABELS;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, value);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_IGNORE_THREAD
{
gint criteria = 0;
criteria = MATCHCRITERIA_IGNORE_THREAD;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_NOT_IGNORE_THREAD
{
gint criteria = 0;
criteria = MATCHCRITERIA_NOT_IGNORE_THREAD;
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
| MATCHER_SUBJECT match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_SUBJECT;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_SUBJECT match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_SUBJECT;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_FROM match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_FROM;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_FROM match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_FROM;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_TO match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_TO;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_TO match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_TO;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_CC match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_CC;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_CC match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_CC;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_TO_OR_CC match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_TO_OR_CC;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_TO_AND_NOT_CC match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_TO_AND_NOT_CC;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_AGE_GREATER MATCHER_INTEGER
{
gint value = 0;
criteria = MATCHCRITERIA_AGE_GREATER;
- value = atoi($2);
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, value);
+ value = strtol($2, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_AGE_LOWER MATCHER_INTEGER
{
gint value = 0;
criteria = MATCHCRITERIA_AGE_LOWER;
- value = atoi($2);
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, value);
+ value = strtol($2, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_NEWSGROUPS match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NEWSGROUPS;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_NEWSGROUPS match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_NEWSGROUPS;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_INREPLYTO match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_INREPLYTO;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_INREPLYTO match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_INREPLYTO;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_REFERENCES match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_REFERENCES;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_REFERENCES match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_REFERENCES;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_SCORE_GREATER MATCHER_INTEGER
{
gint value = 0;
criteria = MATCHCRITERIA_SCORE_GREATER;
- value = atoi($2);
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, value);
+ value = strtol($2, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_SCORE_LOWER MATCHER_INTEGER
{
gint value = 0;
criteria = MATCHCRITERIA_SCORE_LOWER;
- value = atoi($2);
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, value);
+ value = strtol($2, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_SCORE_EQUAL MATCHER_INTEGER
{
gint value = 0;
criteria = MATCHCRITERIA_SCORE_EQUAL;
- value = atoi($2);
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, value);
+ value = strtol($2, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_SIZE_GREATER MATCHER_INTEGER
{
gint criteria = 0;
gint value = 0;
criteria = MATCHCRITERIA_SIZE_GREATER;
- value = atoi($2);
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, value);
+ value = strtol($2, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_SIZE_SMALLER MATCHER_INTEGER
{
gint criteria = 0;
gint value = 0;
criteria = MATCHCRITERIA_SIZE_SMALLER;
- value = atoi($2);
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, value);
+ value = strtol($2, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_SIZE_EQUAL MATCHER_INTEGER
{
gint criteria = 0;
gint value = 0;
criteria = MATCHCRITERIA_SIZE_EQUAL;
- value = atoi($2);
- prop = matcherprop_unquote_new(criteria, NULL, 0, NULL, value);
+ value = strtol($2, NULL, 0);
+ prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_HEADER MATCHER_STRING
{
criteria = MATCHCRITERIA_HEADER;
expr = $2;
- prop = matcherprop_unquote_new(criteria, header, match_type, expr, 0);
+ prop = matcherprop_new(criteria, header, match_type, expr, 0);
g_free(header);
}
| MATCHER_NOT_HEADER MATCHER_STRING
criteria = MATCHCRITERIA_NOT_HEADER;
expr = $2;
- prop = matcherprop_unquote_new(criteria, header, match_type, expr, 0);
+ prop = matcherprop_new(criteria, header, match_type, expr, 0);
g_free(header);
}
| MATCHER_HEADERS_PART match_type MATCHER_STRING
criteria = MATCHCRITERIA_HEADERS_PART;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_HEADERS_PART match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_HEADERS_PART;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_MESSAGE match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_MESSAGE;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_MESSAGE match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_MESSAGE;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_BODY_PART match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_BODY_PART;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
| MATCHER_NOT_BODY_PART match_type MATCHER_STRING
{
criteria = MATCHCRITERIA_NOT_BODY_PART;
expr = $3;
- prop = matcherprop_unquote_new(criteria, NULL, match_type, expr, 0);
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
-| MATCHER_EXECUTE MATCHER_STRING
+| MATCHER_TEST MATCHER_STRING
{
gint criteria = 0;
gchar *expr = NULL;
- criteria = MATCHCRITERIA_EXECUTE;
+ criteria = MATCHCRITERIA_TEST;
expr = $2;
- prop = matcherprop_unquote_new(criteria, NULL, 0, expr, 0);
+ prop = matcherprop_new(criteria, NULL, 0, expr, 0);
}
-| MATCHER_NOT_EXECUTE MATCHER_STRING
+| MATCHER_NOT_TEST MATCHER_STRING
{
gint criteria = 0;
gchar *expr = NULL;
- criteria = MATCHCRITERIA_NOT_EXECUTE;
+ criteria = MATCHCRITERIA_NOT_TEST;
expr = $2;
- prop = matcherprop_unquote_new(criteria, NULL, 0, expr, 0);
+ prop = matcherprop_new(criteria, NULL, 0, expr, 0);
}
;
action_type = MATCHACTION_EXECUTE;
cmd = $2;
- action = filteringaction_new(action_type, 0, cmd, 0);
+ action = filteringaction_new(action_type, 0, cmd, 0, 0);
}
| MATCHER_MOVE MATCHER_STRING
{
action_type = MATCHACTION_MOVE;
destination = $2;
- action = filteringaction_new(action_type, 0, destination, 0);
+ action = filteringaction_new(action_type, 0, destination, 0, 0);
}
| MATCHER_COPY MATCHER_STRING
{
action_type = MATCHACTION_COPY;
destination = $2;
- action = filteringaction_new(action_type, 0, destination, 0);
+ action = filteringaction_new(action_type, 0, destination, 0, 0);
}
| MATCHER_DELETE
{
gint action_type = 0;
action_type = MATCHACTION_DELETE;
- action = filteringaction_new(action_type, 0, NULL, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0);
}
| MATCHER_MARK
{
gint action_type = 0;
action_type = MATCHACTION_MARK;
- action = filteringaction_new(action_type, 0, NULL, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0);
}
| MATCHER_UNMARK
{
gint action_type = 0;
action_type = MATCHACTION_UNMARK;
- action = filteringaction_new(action_type, 0, NULL, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0);
}
| MATCHER_LOCK
{
gint action_type = 0;
action_type = MATCHACTION_LOCK;
- action = filteringaction_new(action_type, 0, NULL, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0);
}
| MATCHER_UNLOCK
{
gint action_type = 0;
action_type = MATCHACTION_UNLOCK;
- action = filteringaction_new(action_type, 0, NULL, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0);
}
| MATCHER_MARK_AS_READ
{
gint action_type = 0;
action_type = MATCHACTION_MARK_AS_READ;
- action = filteringaction_new(action_type, 0, NULL, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0);
}
| MATCHER_MARK_AS_UNREAD
{
gint action_type = 0;
action_type = MATCHACTION_MARK_AS_UNREAD;
- action = filteringaction_new(action_type, 0, NULL, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0);
}
| MATCHER_FORWARD MATCHER_INTEGER MATCHER_STRING
{
gint account_id = 0;
action_type = MATCHACTION_FORWARD;
- account_id = atoi($2);
+ account_id = strtol($2, NULL, 10);
destination = $3;
- action = filteringaction_new(action_type, account_id, destination, 0);
+ action = filteringaction_new(action_type,
+ account_id, destination, 0, 0);
}
| MATCHER_FORWARD_AS_ATTACHMENT MATCHER_INTEGER MATCHER_STRING
{
gint account_id = 0;
action_type = MATCHACTION_FORWARD_AS_ATTACHMENT;
- account_id = atoi($2);
+ account_id = strtol($2, NULL, 10);
destination = $3;
- action = filteringaction_new(action_type, account_id, destination, 0);
+ action = filteringaction_new(action_type,
+ account_id, destination, 0, 0);
}
| MATCHER_REDIRECT MATCHER_INTEGER MATCHER_STRING
{
gint account_id = 0;
action_type = MATCHACTION_REDIRECT;
- account_id = atoi($2);
+ account_id = strtol($2, NULL, 10);
destination = $3;
- action = filteringaction_new(action_type, account_id, destination, 0);
+ action = filteringaction_new(action_type,
+ account_id, destination, 0, 0);
}
| MATCHER_COLOR MATCHER_INTEGER
{
gint color = 0;
action_type = MATCHACTION_COLOR;
- color = atoi($2);
- action = filteringaction_new(action_type, 0, NULL, color);
-}
-| MATCHER_CHANGE_SCORE MATCHER_STRING
-{
- gint action_type = MATCHACTION_CHANGE_SCORE;
- char *last_tok = NULL;
- const gchar *first_tok;
- long int chscore;
- int change_type; /* -1 == decrement, 0 == assign, 1 == increment */
-
-#define is_number(x) ( ((x) == '+') || ((x) == '-') || (isdigit((x))) )
- /* find start */
- for (first_tok = $2; *first_tok && !is_number(*first_tok); first_tok++)
- ;
-#undef is_number
-
- chscore = strtol(first_tok, &last_tok, 10);
- if (last_tok == first_tok || *last_tok == 0)
- chscore = 0;
- change_type = *first_tok == '+' ? 1 : *first_tok == '-' ? -1 : 0;
- action = filteringaction_new(MATCHACTION_CHANGE_SCORE, change_type,
- NULL, chscore);
+ color = strtol($2, NULL, 10);
+ action = filteringaction_new(action_type, 0, NULL, color, 0);
}
-;
-
-scoring_rule:
-MATCHER_SCORE MATCHER_INTEGER
+| MATCHER_CHANGE_SCORE MATCHER_INTEGER
+{
+ gint score = 0;
+
+ score = strtol($2, NULL, 10);
+ action = filteringaction_new(MATCHACTION_CHANGE_SCORE, 0,
+ NULL, 0, score);
+}
+/* backward compatibility */
+| MATCHER_SCORE MATCHER_INTEGER
+{
+ gint score = 0;
+
+ score = strtol($2, NULL, 10);
+ action = filteringaction_new(MATCHACTION_CHANGE_SCORE, 0,
+ NULL, 0, score);
+}
+| MATCHER_SET_SCORE MATCHER_INTEGER
+{
+ gint score = 0;
+
+ score = strtol($2, NULL, 10);
+ action = filteringaction_new(MATCHACTION_SET_SCORE, 0,
+ NULL, 0, score);
+}
+| MATCHER_HIDE
+{
+ action = filteringaction_new(MATCHACTION_HIDE, 0, NULL, 0, 0);
+}
+| MATCHER_STOP
{
- score = atoi($2);
+ action = filteringaction_new(MATCHACTION_STOP, 0, NULL, 0, 0);
}
;
projects / claws.git / blobdiff