From aa8aa101514b194ef39a1836d0ab4a350bea8ab9 Mon Sep 17 00:00:00 2001 From: Rutger van Beusekom Date: Wed, 14 Nov 2018 19:31:29 +0100 Subject: [PATCH] fix 05-assignment-doublequoted-doubleqoutes.sh --- gash/grammar.scm | 2 +- gash/script.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gash/grammar.scm b/gash/grammar.scm index a83a117..7608ff6 100644 --- a/gash/grammar.scm +++ b/gash/grammar.scm @@ -152,7 +152,7 @@ sq < ['] dq < [\"] singlequotes <- sq (!sq .)* sq# - doublequotes <- dq (substitution / variable / (!dq ('\\\"' / .)))* dq# + doublequotes <- dq (substitution / variable / (!dq (escape '\"' / .)))* dq# case-keyword < 'case' do-keyword < 'do' diff --git a/gash/script.scm b/gash/script.scm index 1530d69..b1f3e6e 100644 --- a/gash/script.scm +++ b/gash/script.scm @@ -376,8 +376,8 @@ ((h ... t) t) (_ o))) -(define (delim o) - o) +(define (delim . o) + (string-join o "")) (define (name o) o)