X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rcparser.y;h=114c043bcc716971a8140b8e9ea3856015bf2d5a;hp=e58a75e9220a32344289be257d189f08a68f9bf4;hb=9468c36e7656e50a91f759e3f5498b7f86dbec30;hpb=76f757084ec84861326ef36977c6e116da9a1432 diff --git a/rcparser.y b/rcparser.y index e58a75e..114c043 100644 --- a/rcparser.y +++ b/rcparser.y @@ -18,8 +18,10 @@ */ %include { +# include # include "mutt.h" # include "parse.h" +# include "buffy.h" static buffer_t *buffer_merge(buffer_t *A, buffer_t **B) { @@ -128,6 +130,7 @@ to_eol ::= sp to_eol_aux . /****************************************************************************/ /* Our macro tokens */ /****************************************************************************/ +/* {{{*/ %type svar { segment } svar(Z) ::= DOLLAR ATOM(B) . { Z = B; } @@ -180,13 +183,18 @@ uqtok(Z) ::= SQUOTE sqtok(A) SQUOTE . { Z = A; } uqtok(Z) ::= DQUOTE dqtok(A) DQUOTE . { Z = A; } uqtok(Z) ::= BQUOTE bqtok(A) BQUOTE . { /* XXX */ Z = A; } -/* token accumulator */ +/* token accumulator: NEVER USE DIRECTLY */ +%type tokaux { buffer_t* } +%destructor tokaux { abort(); } +tokaux(Z) ::= uqtok(A) . { Z = A; } +tokaux(Z) ::= tokaux(A) escnl . { Z = A; } +tokaux(Z) ::= tokaux(A) uqtok(B) . { Z = buffer_merge(A, &B); } + %type token { buffer_t* } %destructor token { buffer_delete(&$$); } -token(Z) ::= uqtok(A) . { Z = A; } -token(Z) ::= token(A) escnl . { Z = A; } -token(Z) ::= token(A) uqtok(B) . { Z = buffer_merge(A, &B); } +token(Z) ::= sp tokaux(A) . { Z = A; } +/* }}}*/ /****************************************************************************/ /* list of tokens */ /****************************************************************************/ @@ -194,10 +202,15 @@ token(Z) ::= token(A) uqtok(B) . { Z = buffer_merge(A, &B); } %type simple_list { string_list_t * } %destructor simple_list { string_list_wipe(&$$); } simple_list ::= . -simple_list(L) ::= simple_list(A) sp token(B) . { - L = string_item_new(); - L->data = buffer_unwrap(&B); - L->next = A; +simple_list(L) ::= simple_list(A) token(B) . { + if (B->len) { + L = string_item_new(); + L->data = buffer_unwrap(&B); + L->next = A; + } else { + L = A; + buffer_delete(&B); + } } @@ -209,6 +222,118 @@ rc ::= rclines . rclines ::= . rclines ::= rclines rcline . +rcline ::= to_eol . +rcline ::= BIND token token token to_eol . +rcline ::= EXEC simple_list to_eol . +rcline ::= MACRO token token token to_eol . +rcline ::= MACRO token token token token to_eol . +rcline ::= PUSH token to_eol . +rcline ::= SCORE token token to_eol . +rcline ::= UNSCORE simple_list to_eol . + +/* {{{ alias */ + +%type atok { buffer_t* } +%destructor atok { buffer_delete(&$$); } +atok(Z) ::= ATOM|SHARP|DQUOTE|EQUAL|LBRACE|SQUOTE|RBRACE(A) . { + buffer_add(Z = buffer_new(), A.s, A.len); +} +atok(Z) ::= SPACE(A) . { + buffer_add(Z = buffer_new(), A.s, A.len); +} +atok(Z) ::= atok(A) escnl . { Z = A; } +atok(Z) ::= atok(A) BSLASH non_nl(B) . { Z = buffer_escape(A, B.s, B.len); } +atok(Z) ::= atok(A) svar(B) . { substvar(Z = A, B); } +atok(Z) ::= atok(A) BQUOTE bqtok(B) BQUOTE . { /* XXX */ buffer_merge(Z = A, &B); } + +rcline ::= ALIAS token SPACE atok to_eol . + +/* }}} */ +/* {{{ colors */ + +rcline ::= COLOR token token token to_eol . +rcline ::= COLOR token token token token to_eol . +rcline ::= UNCOLOR token simple_list to_eol . +rcline ::= MONO token token to_eol . +rcline ::= MONO token token token to_eol . +rcline ::= UNMONO token simple_list to_eol . + +/* }}} */ +/* {{{ hooks */ + +rcline ::= ACCOUNT_HOOK token token to_eol . +rcline ::= APPEND_HOOK token token to_eol . +rcline ::= CHARSET_HOOK token token to_eol . +rcline ::= CLOSE_HOOK token token to_eol . +rcline ::= CRYPT_HOOK token token to_eol . +rcline ::= FCC_HOOK token token to_eol . +rcline ::= FCC_SAVE_HOOK token token to_eol . +rcline ::= FOLDER_HOOK token token to_eol . +rcline ::= ICONV_HOOK token token to_eol . +rcline ::= MBOX_HOOK token token to_eol . +rcline ::= MESSAGE_HOOK token token to_eol . +rcline ::= OPEN_HOOK token token to_eol . +rcline ::= PGP_HOOK token token to_eol . +rcline ::= REPLY_HOOK token token to_eol . +rcline ::= SAVE_HOOK token token to_eol . +rcline ::= SEND2_HOOK token token to_eol . +rcline ::= SEND_HOOK token token to_eol . + +rcline ::= UNHOOK token to_eol . + +/* }}} */ +/* {{{ buffy related */ + +mailboxes ::= . +mailboxes ::= mailboxes token(A) . { + if (A->len) { + char buf[_POSIX_PATH_MAX]; + BUFFY *tmp; + int i; + + m_strcpy(buf, sizeof(buf), A->data); + mutt_expand_path(buf, sizeof(buf)); + i = buffy_lookup(buf); + if (i < 0) { + tmp = p_new(BUFFY, 1); + tmp->path = m_strdup(buf); + buffy_array_append(&Incoming, tmp); + } else { + tmp = Incoming.arr[i]; + } + + tmp->new = 0; + tmp->notified = 1; + tmp->newly_created = 0; + } + buffer_delete(&A); +} +rcline ::= MAILBOXES mailboxes to_eol . + +unmailboxes ::= . +unmailboxes ::= unmailboxes token(A) . { + if (A->len) { + if (A->data[0] == '*' && A->len == 1) { + buffy_array_wipe(&Incoming); + } else { + char buf[_POSIX_PATH_MAX]; + BUFFY *tmp; + int i; + + m_strcpy(buf, sizeof(buf), A->data); + mutt_expand_path(buf, sizeof(buf)); + i = buffy_lookup(buf); + tmp = buffy_array_take(&Incoming, i); + buffy_delete(&tmp); + } + } + buffer_delete(&A); +} +rcline ::= UNMAILBOXES unmailboxes to_eol . + +/* }}} */ +/* {{{ lists (alternative_order, auto_view, hdr_order, mime_lookup */ + rcline ::= ALTERNATIVE_ORDER simple_list(L) to_eol . { string_list_append(&AlternativeOrderList, string_list_rev(L)); } @@ -222,5 +347,6 @@ rcline ::= MIME_LOOKUP simple_list(L) to_eol . { string_list_append(&MimeLookupList, string_list_rev(L)); } +/* }}} */ /* vim: set indentexpr= cin: */