X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rcparser.y;h=e58a75e9220a32344289be257d189f08a68f9bf4;hp=4f5c572b3e1019358ed723a14600699087c460c7;hb=18ebc21bf1d29ed07fa007329879493493e18eb3;hpb=24b852b7ee31a675952de8c42643d2448086bbba

diff --git a/rcparser.y b/rcparser.y
index 4f5c572..e58a75e 100644
--- a/rcparser.y
+++ b/rcparser.y
@@ -80,6 +80,24 @@
         buffer_add(buf, s, len);
         return buf;
     }
+
+    static void substvar(buffer_t *buf, const segment seg)
+    {
+        const char *res;
+        char tmp[STRING];
+        char var[STRING];
+
+        if (m_strncpy(var, sizeof(var), seg.s, seg.len) <= 0)
+            return;
+
+        if ((res = getenv(var))) {
+            buffer_addstr(buf, res);
+            return;
+        }
+        if (mutt_option_value(var, tmp, sizeof(tmp))) {
+            buffer_addstr(buf, tmp);
+        }
+    }
 }
 
 %name rcparse
@@ -98,7 +116,7 @@ sp ::= SPACE .
 sp ::= sp SPACE .
 sp ::= sp escnl SPACE .
 
-non_nl ::= ATOM|SPACE|BQUOTE|BSLASH|SHARP|DOLLAR|DQUOTE|EQUAL|LBRACE|QUOTE|RBRACE .
+non_nl ::= ATOM|SPACE|BQUOTE|BSLASH|SHARP|DOLLAR|DQUOTE|EQUAL|LBRACE|SQUOTE|RBRACE .
 non_nl_star ::= .
 non_nl_star ::= non_nl_star non_nl .
 
@@ -111,12 +129,16 @@ to_eol ::= sp to_eol_aux .
 /* Our macro tokens                                                         */
 /****************************************************************************/
 
+%type svar { segment }
+svar(Z) ::= DOLLAR ATOM(B) .               { Z = B; }
+svar(Z) ::= DOLLAR LBRACE ATOM(B) RBRACE . { Z = B; }
+
 /* '-quoted tokens */
 %type sqtok { buffer_t* }
 %destructor sqtok  { buffer_delete(&$$); }
 sqtok(Z) ::= .                                 { Z = buffer_new(); }
 sqtok(Z) ::= sqtok(A) escnl .                  { Z = A; }
-sqtok(Z) ::= sqtok(A) BSLASH BSLASH|QUOTE(B) . { buffer_addch(Z = A, *B.s); }
+sqtok(Z) ::= sqtok(A) BSLASH BSLASH|SQUOTE(B) . { buffer_addch(Z = A, *B.s); }
 sqtok(Z) ::= sqtok(A) BSLASH ATOM|SPACE|BQUOTE|SHARP|DOLLAR|DQUOTE|EQUAL|LBRACE|RBRACE(B) . {
     buffer_addch(Z = A, '\\');
     buffer_add(Z, B.s, B.len);
@@ -125,33 +147,38 @@ sqtok(Z) ::= sqtok(A) ATOM|SPACE|BQUOTE|SHARP|DOLLAR|DQUOTE|EQUAL|LBRACE|RBRACE(
     buffer_add(Z = A, B.s, B.len);
 }
 
+/* `-quoted tokens */
+%type bqtok { buffer_t* }
+%destructor bqtok { buffer_delete(&$$); }
+bqtok(Z) ::= .                             { Z = buffer_new(); }
+bqtok(Z) ::= bqtok(A) escnl .              { Z = A; }
+bqtok(Z) ::= bqtok(A) BSLASH non_nl(B) .   { Z = buffer_escape(A, B.s, B.len); }
+bqtok(Z) ::= bqtok(A) svar(B) .            { substvar(Z = A, B); }
+bqtok(Z) ::= bqtok(A) ATOM|SPACE|SHARP|EQUAL|LBRACE|RBRACE|SQUOTE|DQUOTE(B)  . {
+    buffer_add(Z = A, B.s, B.len);
+}
+
 /* "-quoted tokens */
 %type dqtok { buffer_t* }
-%destructor dqtok  { buffer_delete(&$$); }
+%destructor dqtok { buffer_delete(&$$); }
 dqtok(Z) ::= .                             { Z = buffer_new(); }
 dqtok(Z) ::= dqtok(A) escnl .              { Z = A; }
 dqtok(Z) ::= dqtok(A) BSLASH non_nl(B) .   { Z = buffer_escape(A, B.s, B.len); }
-dqtok(Z) ::= dqtok(A) ATOM|SPACE|SHARP|EQUAL|LBRACE|RBRACE(B)  . {
+dqtok(Z) ::= dqtok(A) svar(B) .            { substvar(Z = A, B); }
+dqtok(Z) ::= dqtok(A) ATOM|SPACE|SHARP|EQUAL|LBRACE|RBRACE|SQUOTE(B)  . {
     buffer_add(Z = A, B.s, B.len);
 }
-dqtok(Z) ::= dqtok(A) DOLLAR ATOM(B) . {
-    // FIXME
-    B = B;
-    Z = A;
-}
-dqtok(Z) ::= dqtok(A) DOLLAR LBRACE ATOM(B) RBRACE . {
-    // FIXME
-    B = B;
-    Z = A;
-}
+dqtok(Z) ::= dqtok(A) BQUOTE bqtok(B) BQUOTE . { /* XXX */ buffer_merge(Z = A, &B); }
 
 /* unquoted tokens */
 %type uqtok { buffer_t* }
 %destructor uqtok { buffer_delete(&$$); }
-uqtok(Z) ::= ATOM|EQUAL|LBRACE|RBRACE(A) . { buffer_add(Z = buffer_new(), A.s, A.len); }
 uqtok(Z) ::= BSLASH non_nl(A) .            { buffer_add(Z = buffer_new(), A.s, A.len); }
-uqtok(Z) ::= QUOTE  sqtok(A) QUOTE .       { Z = A; }
+uqtok(Z) ::= svar(A) .                     { substvar(Z = buffer_new(), A); }
+uqtok(Z) ::= ATOM|EQUAL|LBRACE|RBRACE(A) . { buffer_add(Z = buffer_new(), A.s, A.len); }
+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 */
 %type token { buffer_t* }