revert matcher.c and matcher_parse_lex.l to previous revision
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Tue, 11 Dec 2001 19:21:45 +0000 (19:21 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Tue, 11 Dec 2001 19:21:45 +0000 (19:21 +0000)
ChangeLog.claws
configure.in
src/matcher.c
src/matcher_parser_lex.l

index 993352f473035d6e1a598210d2102702ebc5b8d9..fb06953e679ef50a04569b866fc3aa243a2c974d 100644 (file)
@@ -1,3 +1,10 @@
+2001-12-11 [alfons]    0.6.5claws77
+       
+       * src/matcher.c                 (1.3)
+       * src/matcher_parser_lex.l      (1.28)
+               revert for another attempt
+               mark 0.6.5claws77 as LAST_STABLE
+
 2001-12-11 [christoph] 0.6.5claws76
 
        * po/de.po
index 9546932fb58d12b7ca97788c94a31e32c3ed185f..58708b7a2861f01383c6e03878a125ea6a6d929b 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws76
+EXTRA_VERSION=claws77
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index b8a353089ffe67725283d8226f8d4d61226e9ba9..46605fe3085addc0afb900c816844bc9633d563c 100644 (file)
@@ -127,20 +127,12 @@ gchar *matcher_unescape_str(gchar *str)
                else {
                        src++;
                        if (*src == '\\')
-                               *dst++ = '\\';                          /* insert backslash */
-                       else if (*src == 'n')                           /* insert control characters */
+                               *dst++ = '\\';
+                       else if (*src == 'n')
                                *dst++ = '\n';
                        else if (*src == 'r') 
                                *dst++ = '\r';
-                       else if (*src == 't') 
-                               *dst++ = '\t';
-                       else if (*src == 'r') 
-                               *dst++ = '\r';
-                       else if (*src == 'b')
-                               *dst++ = '\b';
-                       else if (*src == 'f')
-                               *dst++ = '\f';
-                       else if (*src == '\'' || *src == '\"')          /* insert \' or \" */
+                       else if (*src == '\'' || *src == '\"')
                                *dst++ = *src;
                        else {
                                src--;
@@ -1072,7 +1064,6 @@ static void prefs_filtering_write(FILE * fp, GSList * prefs_scoring)
 
                prop = (FilteringProp *) cur->data;
                filtering_str = filteringprop_to_string(prop);
-               debug_print("FILTERING WRITING %s\n", filtering_str);
                
                if (fputs(filtering_str, fp) == EOF ||
                    fputc('\n', fp) == EOF) {
index e638e51f042c39e32187e11dbc1759dd275705d1..84bfd4ec378ec214d34fd7ee514c4d7cb0f4a7fe 100644 (file)
@@ -92,48 +92,12 @@ static void add_char(char ch)
                BEGIN(string);
                string_buf_ptr = string_buf;
                }
-               /* the following tokens \n \t \r \b \f \\ could be
-                * removed from the list, but we let them here for
-                * the sake of clarity; they are unescaped by 
-                * matcher.c:unescape_str()) */
-<string>\\n    {
-               /* paste as-is */
-               add_char('\\');
-               add_char('n');
-               }
-<string>\\t    {
-               /* paste as-is */
-               add_char('\\');
-               add_char('t');
-               }
-<string>\\r    {
-               /* paste as-is */
-               add_char('\\');
-               add_char('r');
-               }
-<string>\\b    {
-               /* paste as-is */
-               add_char('\\');
-               add_char('b');
-               }
-<string>\\f    {
-               /* paste as-is */
-               add_char('\\');
-               add_char('f');
-               }
-<string>\\\'   {
-               /* paste as-is */
-               add_char('\\');
-               add_char('\'');
-               }
-<string>\\\"   {
-               /* paste as-is */
-               add_char('\\');
-               add_char('\"');
-               }
-               /* we only miss the thing with nested escaping like
-                * \\\\" which should mean something like 'forget it, we want a "'
-                * right here in the token stream.... */
+<string>\\n    add_char('\n');
+<string>\\t    add_char('\t');
+<string>\\r    add_char('\r');
+<string>\\b    add_char('\b');
+<string>\\f    add_char('\f');
+<string>\\.    add_char(yytext[1]);
 <string>\"     {
                BEGIN(0);
                *string_buf_ptr = '\0';
@@ -141,14 +105,14 @@ static void add_char(char ch)
                return MATCHER_STRING;
                }
 <string>.      {
-               add_char(yytext[0]);
-               }
+add_char(yytext[0]);
+}
 \[[^\[\]]*\]   {
-               BEGIN(0);
-               yylval.str = yytext + 1;
-               yytext[strlen(yytext) - 1] = '\0';
-               return MATCHER_SECTION;
-               }
+                       BEGIN(0);
+                       yylval.str = yytext + 1;
+                       yytext[strlen(yytext) - 1] = '\0';
+                       return MATCHER_SECTION;
+                       }
 [-+]?[0-9]+    {
                yylval.str = yytext;
                return MATCHER_INTEGER;