blob: d1da453f436de99d1edc4766f9b85e3f9f3594c7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From 16a2ec331c2f928f41dd5c22455e0713d2975130 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Mon, 8 Dec 2014 13:16:14 +0200
Subject: [PATCH 04/19] Shellvars: allow wrapping loop condition to multiple
lines
---
lenses/shellvars.aug | 2 +-
lenses/tests/test_shellvars.aug | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
index d25e8ca..c767067 100644
--- a/lenses/shellvars.aug
+++ b/lenses/shellvars.aug
@@ -34,7 +34,7 @@ module Shellvars =
let xchgs = Build.xchgs
let semicol = del /;?/ ""
- let char = /[^`;() '"\t\n\\]|\\\\./
+ let char = /[^`;() '"\t\n\\]|\\\\(.|\n)/
let dquot =
let char = /[^"\\]|\\\\./ | Rx.cl
in "\"" . char* . "\"" (* " Emacs, relax *)
diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
index 864cb6c..065130a 100644
--- a/lenses/tests/test_shellvars.aug
+++ b/lenses/tests/test_shellvars.aug
@@ -549,6 +549,10 @@ fi\n" =
{ "@condition" = "-f $FILENAME"
{ "type" = "[[" } }
+ (* Allow wrapping loop condition to multiple lines *)
+ test Shellvars.lns get "for x in foo \\\nbar\\\nbaz; do y=$x; done\n" =
+ { "@for" = "x in foo \\\nbar\\\nbaz" { "y" = "$x" } }
+
(* Local Variables: *)
(* mode: caml *)
(* End: *)
--
2.5.0
|
