Browse code

Merge pull request #8578 from erikh/fix_slash

builder: Handle trailing \ appropriately.

Michael Crosby authored on 2014/10/16 04:11:37
Showing 3 changed files
... ...
@@ -32,7 +32,7 @@ type Node struct {
32 32
 var (
33 33
 	dispatch                map[string]func(string) (*Node, map[string]bool, error)
34 34
 	TOKEN_WHITESPACE        = regexp.MustCompile(`[\t\v\f\r ]+`)
35
-	TOKEN_LINE_CONTINUATION = regexp.MustCompile(`\\$`)
35
+	TOKEN_LINE_CONTINUATION = regexp.MustCompile(`\\\s*$`)
36 36
 	TOKEN_COMMENT           = regexp.MustCompile(`^#.*$`)
37 37
 )
38 38
 
... ...
@@ -14,6 +14,7 @@ RUN echo hello \
14 14
 goodbye\
15 15
 frog
16 16
 RUN echo hello  \  
17
+world
17 18
 RUN echo hi \
18 19
  \
19 20
  world \
... ...
@@ -3,7 +3,7 @@
3 3
 (run "echo hello    world")
4 4
 (run "echo hello  world")
5 5
 (run "echo hello goodbyefrog")
6
-(run "echo hello  \\")
6
+(run "echo hello  world")
7 7
 (run "echo hi   world  goodnight")
8 8
 (run "echo goodbyefrog")
9 9
 (run "echo goodbyefrog")