*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#include "defs.h"
#include "matcher.h"
#include "matcher_parser.h"
#include "matcher_parser_lex.h"
-#include "procmsg.h"
-
-#define MAX_COLORLABELS (MSG_CLABEL_7 - MSG_CLABEL_NONE)
+#include "colorlabel.h"
static gint error = 0;
static gint bool_op = 0;
void matcher_parser_init(void);
void matcher_parser_switch_to_buffer(void * new_buffer);
void matcher_parser_delete_buffer(void * b);
+void matcher_parserpop_buffer_state(void);
int matcher_parserlex(void);
void matcher_parser_start_parsing(FILE *f)
{
+ matcher_parserlineno = 1;
matcher_parserrestart(f);
account_id = 0;
matcher_parserparse();
matcher_parserlineno = 1;
matcher_parse_op = MATCHER_PARSE_NO_EOL;
matcher_parserrestart(NULL);
+ matcher_parserpop_buffer_state();
matcher_parser_init();
bufstate = matcher_parser_scan_string((const char *) tmp_str);
matcher_parser_switch_to_buffer(bufstate);
matcher_parserlineno = 1;
matcher_parse_op = MATCHER_PARSE_NAME;
matcher_parserrestart(NULL);
+ matcher_parserpop_buffer_state();
matcher_parser_init();
bufstate = matcher_parser_scan_string(str);
matcher_parserparse();
matcher_parserlineno = 1;
matcher_parse_op = MATCHER_PARSE_ENABLED;
matcher_parserrestart(NULL);
+ matcher_parserpop_buffer_state();
matcher_parser_init();
bufstate = matcher_parser_scan_string(str);
matcher_parserparse();
matcher_parserlineno = 1;
matcher_parse_op = MATCHER_PARSE_ACCOUNT;
matcher_parserrestart(NULL);
+ matcher_parserpop_buffer_state();
matcher_parser_init();
bufstate = matcher_parser_scan_string(str);
matcher_parserparse();
matcher_parserlineno = 1;
matcher_parse_op = MATCHER_PARSE_CONDITION;
matcher_parserrestart(NULL);
+ matcher_parserpop_buffer_state();
matcher_parser_init();
bufstate = matcher_parser_scan_string(str);
matcher_parserparse();
matcher_parserlineno = 1;
matcher_parse_op = MATCHER_PARSE_FILTERING_ACTION;
matcher_parserrestart(NULL);
+ matcher_parserpop_buffer_state();
matcher_parser_init();
bufstate = matcher_parser_scan_string(str);
matcher_parserparse();
%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_MARK_AS_SPAM MATCHER_MARK_AS_HAM
+%token MATCHER_FORWARD_AS_ATTACHMENT MATCHER_EOL
%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_PARTIAL MATCHER_NOT_PARTIAL
%token MATCHER_COLORLABEL MATCHER_NOT_COLORLABEL
%token MATCHER_IGNORE_THREAD MATCHER_NOT_IGNORE_THREAD
+%token MATCHER_WATCH_THREAD MATCHER_NOT_WATCH_THREAD
%token MATCHER_CHANGE_SCORE MATCHER_SET_SCORE
-%token MATCHER_STOP MATCHER_HIDE MATCHER_IGNORE
+%token MATCHER_ADD_TO_ADDRESSBOOK
+%token MATCHER_STOP MATCHER_HIDE MATCHER_IGNORE MATCHER_WATCH
%token MATCHER_SPAM MATCHER_NOT_SPAM
+%token MATCHER_TAG MATCHER_NOT_TAG MATCHER_SET_TAG MATCHER_UNSET_TAG
+%token MATCHER_TAGGED MATCHER_NOT_TAGGED MATCHER_CLEAR_TAGS
%start file
criteria = MATCHCRITERIA_COLORLABEL;
value = strtol($2, NULL, 10);
if (value < 0) value = 0;
- else if (value > MAX_COLORLABELS) value = MAX_COLORLABELS;
+ else if (value > COLORLABELS) value = COLORLABELS;
prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_NOT_COLORLABEL MATCHER_INTEGER
criteria = MATCHCRITERIA_NOT_COLORLABEL;
value = strtol($2, NULL, 0);
if (value < 0) value = 0;
- else if (value > MAX_COLORLABELS) value = MAX_COLORLABELS;
+ else if (value > COLORLABELS) value = COLORLABELS;
prop = matcherprop_new(criteria, NULL, 0, NULL, value);
}
| MATCHER_IGNORE_THREAD
criteria = MATCHCRITERIA_NOT_IGNORE_THREAD;
prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
}
+| MATCHER_WATCH_THREAD
+{
+ gint criteria = 0;
+
+ criteria = MATCHCRITERIA_WATCH_THREAD;
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
+}
+| MATCHER_NOT_WATCH_THREAD
+{
+ gint criteria = 0;
+
+ criteria = MATCHCRITERIA_NOT_WATCH_THREAD;
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
+}
| MATCHER_SUBJECT match_type MATCHER_STRING
{
gint criteria = 0;
expr = $3;
prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
}
+| MATCHER_TAG match_type MATCHER_STRING
+{
+ gint criteria = 0;
+ gchar *expr = NULL;
+
+ criteria = MATCHCRITERIA_TAG;
+ expr = $3;
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
+}
+| MATCHER_NOT_TAG match_type MATCHER_STRING
+{
+ gint criteria = 0;
+ gchar *expr = NULL;
+
+ criteria = MATCHCRITERIA_NOT_TAG;
+ expr = $3;
+ prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
+}
+| MATCHER_TAGGED
+{
+ gint criteria = 0;
+
+ criteria = MATCHCRITERIA_TAGGED;
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
+}
+| MATCHER_NOT_TAGGED
+{
+ gint criteria = 0;
+
+ criteria = MATCHCRITERIA_NOT_TAGGED;
+ prop = matcherprop_new(criteria, NULL, 0, NULL, 0);
+}
| MATCHER_AGE_GREATER MATCHER_INTEGER
{
gint criteria = 0;
action_type = MATCHACTION_EXECUTE;
cmd = $2;
- action = filteringaction_new(action_type, 0, cmd, 0, 0);
+ action = filteringaction_new(action_type, 0, cmd, 0, 0, NULL);
}
| MATCHER_MOVE MATCHER_STRING
{
action_type = MATCHACTION_MOVE;
destination = $2;
- action = filteringaction_new(action_type, 0, destination, 0, 0);
+ action = filteringaction_new(action_type, 0, destination, 0, 0, NULL);
+}
+| MATCHER_SET_TAG MATCHER_STRING
+{
+ gchar *destination = NULL;
+ gint action_type = 0;
+
+ action_type = MATCHACTION_SET_TAG;
+ destination = $2;
+ action = filteringaction_new(action_type, 0, destination, 0, 0, NULL);
+}
+| MATCHER_UNSET_TAG MATCHER_STRING
+{
+ gchar *destination = NULL;
+ gint action_type = 0;
+
+ action_type = MATCHACTION_UNSET_TAG;
+ destination = $2;
+ action = filteringaction_new(action_type, 0, destination, 0, 0, NULL);
+}
+| MATCHER_CLEAR_TAGS
+{
+ gint action_type = 0;
+
+ action_type = MATCHACTION_CLEAR_TAGS;
+ action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL);
}
| MATCHER_COPY MATCHER_STRING
{
action_type = MATCHACTION_COPY;
destination = $2;
- action = filteringaction_new(action_type, 0, destination, 0, 0);
+ action = filteringaction_new(action_type, 0, destination, 0, 0, NULL);
}
| MATCHER_DELETE
{
gint action_type = 0;
action_type = MATCHACTION_DELETE;
- action = filteringaction_new(action_type, 0, NULL, 0, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL);
}
| MATCHER_MARK
{
gint action_type = 0;
action_type = MATCHACTION_MARK;
- action = filteringaction_new(action_type, 0, NULL, 0, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL);
}
| MATCHER_UNMARK
{
gint action_type = 0;
action_type = MATCHACTION_UNMARK;
- action = filteringaction_new(action_type, 0, NULL, 0, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL);
}
| MATCHER_LOCK
{
gint action_type = 0;
action_type = MATCHACTION_LOCK;
- action = filteringaction_new(action_type, 0, NULL, 0, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL);
}
| MATCHER_UNLOCK
{
gint action_type = 0;
action_type = MATCHACTION_UNLOCK;
- action = filteringaction_new(action_type, 0, NULL, 0, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL);
}
| MATCHER_MARK_AS_READ
{
gint action_type = 0;
action_type = MATCHACTION_MARK_AS_READ;
- action = filteringaction_new(action_type, 0, NULL, 0, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL);
}
| MATCHER_MARK_AS_UNREAD
{
gint action_type = 0;
action_type = MATCHACTION_MARK_AS_UNREAD;
- action = filteringaction_new(action_type, 0, NULL, 0, 0);
+ action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL);
+}
+| MATCHER_MARK_AS_SPAM
+{
+ gint action_type = 0;
+
+ action_type = MATCHACTION_MARK_AS_SPAM;
+ action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL);
+}
+| MATCHER_MARK_AS_HAM
+{
+ gint action_type = 0;
+
+ action_type = MATCHACTION_MARK_AS_HAM;
+ action = filteringaction_new(action_type, 0, NULL, 0, 0, NULL);
}
| MATCHER_FORWARD MATCHER_INTEGER MATCHER_STRING
{
account_id = strtol($2, NULL, 10);
destination = $3;
action = filteringaction_new(action_type,
- account_id, destination, 0, 0);
+ account_id, destination, 0, 0, NULL);
}
| MATCHER_FORWARD_AS_ATTACHMENT MATCHER_INTEGER MATCHER_STRING
{
account_id = strtol($2, NULL, 10);
destination = $3;
action = filteringaction_new(action_type,
- account_id, destination, 0, 0);
+ account_id, destination, 0, 0, NULL);
}
| MATCHER_REDIRECT MATCHER_INTEGER MATCHER_STRING
{
account_id = strtol($2, NULL, 10);
destination = $3;
action = filteringaction_new(action_type,
- account_id, destination, 0, 0);
+ account_id, destination, 0, 0, NULL);
}
| MATCHER_COLOR MATCHER_INTEGER
{
action_type = MATCHACTION_COLOR;
color = strtol($2, NULL, 10);
- action = filteringaction_new(action_type, 0, NULL, color, 0);
+ action = filteringaction_new(action_type, 0, NULL, color, 0, NULL);
}
| MATCHER_CHANGE_SCORE MATCHER_INTEGER
{
score = strtol($2, NULL, 10);
action = filteringaction_new(MATCHACTION_CHANGE_SCORE, 0,
- NULL, 0, score);
+ NULL, 0, score, NULL);
}
/* backward compatibility */
| MATCHER_SCORE MATCHER_INTEGER
score = strtol($2, NULL, 10);
action = filteringaction_new(MATCHACTION_CHANGE_SCORE, 0,
- NULL, 0, score);
+ NULL, 0, score, NULL);
}
| MATCHER_SET_SCORE MATCHER_INTEGER
{
score = strtol($2, NULL, 10);
action = filteringaction_new(MATCHACTION_SET_SCORE, 0,
- NULL, 0, score);
+ NULL, 0, score, NULL);
}
| MATCHER_HIDE
{
- action = filteringaction_new(MATCHACTION_HIDE, 0, NULL, 0, 0);
+ action = filteringaction_new(MATCHACTION_HIDE, 0, NULL, 0, 0, NULL);
}
| MATCHER_IGNORE
{
- action = filteringaction_new(MATCHACTION_IGNORE, 0, NULL, 0, 0);
+ action = filteringaction_new(MATCHACTION_IGNORE, 0, NULL, 0, 0, NULL);
+}
+| MATCHER_ADD_TO_ADDRESSBOOK MATCHER_STRING
+{
+ header = g_strdup($2);
+} MATCHER_STRING
+{
+ gchar *addressbook = NULL;
+ gint action_type = 0;
+
+ action_type = MATCHACTION_ADD_TO_ADDRESSBOOK;
+ addressbook = $2;
+ action = filteringaction_new(action_type, 0, addressbook, 0, 0, header);
+ g_free(header);
}
| MATCHER_STOP
{
- action = filteringaction_new(MATCHACTION_STOP, 0, NULL, 0, 0);
+ action = filteringaction_new(MATCHACTION_STOP, 0, NULL, 0, 0, NULL);
}
;
projects / claws.git / blobdiff