nesting delimited

sh/anguish.scm

@@ -102,7 +102,13 @@ copyleft.
     (('simple-command ('word s)) (list (transform s)))
     (('simple-command ('word s1) ('word s2)) (list (transform s1) (transform s2)))
     (('simple-command ('word s1) (('word s2) ...)) (cons (transform s1) (map transform s2)))
-    (('literal s) s)
+    (('literal s) (transform s))
+    (('singlequotes s) (string-concatenate (list "'" s "'")))
+    (('doublequotes s) (string-concatenate (list "\"" s "\"")))
+    (('backticks s) (string-concatenate (list "`" s "`")))
+    (('delim ('singlequotes s ...)) (string-concatenate (map transform s)))
+    (('delim ('doublequotes s ...)) (string-concatenate (map transform s)))
+    (('delim ('backticks s ...)) (string-concatenate (map transform s)))
     ((('pipe _) command ...) (map transform command))
     (((('pipe _) command) ...) (map transform command))
     ((_ o) (transform o))

sh/peg.scm

@@ -64,7 +64,13 @@
  assign           <   '='
  literal          <-- (subst / delim / (![0-9] (![()] !io-op !sp !nl !break !pipe !assign .)+) / ([0-9]+ &separator)) literal*
  subst            <-- '$' ('$' / '*' / '@' / [0-9] / identifier / ([{] (![}] .)+ [}]))
- delim            <-  (['] (!['] .)* [']) / ([\"] (![\"] .)* [\"]) / ([`] (![`] .)* [`])
+ delim            <-- singlequotes / doublequotes / backticks
+ sq               <   [']
+ dq               <   [\"]
+ bt               <   [`]
+ singlequotes     <-- (sq  (doublequotes / backticks / (!sq .))* sq)
+ doublequotes     <-- (dq (singlequotes / backticks / (!dq .))* dq)
+ backticks        <-- (bt  (singlequotes / doublequotes / (!bt .))* bt)
  separator        <-- (sp* break !semi ws*) / ws*
  break            <-- amp / semi
  sequential-sep   <-- (semi ws*) / ws+

test/nesting

@@ -0,0 +1 @@
+echo 'foo "bar"'

test/pipe

@@ -1 +1 @@
-echo a b c | grep -v a | cat
+echo -e 'a\nb\nc' | grep -v b | cat

test/substitution

@@ -1 +1 @@
-$(ls)
+echo "$(ls)"