From 61f914763d4cbc5b247fecf8a7f754076bb0ae17 Mon Sep 17 00:00:00 2001 From: Erik Hollensbe Date: Wed, 15 Oct 2014 03:08:04 +0000 Subject: [PATCH] builder: Handle trailing \ appropriately. Docker-DCO-1.1-Signed-off-by: Erik Hollensbe (github: erikh) Upstream-commit: 7fa449191ce9abc3e0a5261b66d8338948f66940 Component: engine --- components/engine/builder/parser/parser.go | 2 +- .../engine/builder/parser/testfiles/continueIndent/Dockerfile | 1 + .../engine/builder/parser/testfiles/continueIndent/result | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/builder/parser/parser.go b/components/engine/builder/parser/parser.go index c24a925e43..f016f2598b 100644 --- a/components/engine/builder/parser/parser.go +++ b/components/engine/builder/parser/parser.go @@ -32,7 +32,7 @@ type Node struct { var ( dispatch map[string]func(string) (*Node, map[string]bool, error) TOKEN_WHITESPACE = regexp.MustCompile(`[\t\v\f\r ]+`) - TOKEN_LINE_CONTINUATION = regexp.MustCompile(`\\$`) + TOKEN_LINE_CONTINUATION = regexp.MustCompile(`\\\s*$`) TOKEN_COMMENT = regexp.MustCompile(`^#.*$`) ) diff --git a/components/engine/builder/parser/testfiles/continueIndent/Dockerfile b/components/engine/builder/parser/testfiles/continueIndent/Dockerfile index 6ce6c06fb7..57a6bca92a 100644 --- a/components/engine/builder/parser/testfiles/continueIndent/Dockerfile +++ b/components/engine/builder/parser/testfiles/continueIndent/Dockerfile @@ -14,6 +14,7 @@ RUN echo hello \ goodbye\ frog RUN echo hello \ +world RUN echo hi \ \ world \ diff --git a/components/engine/builder/parser/testfiles/continueIndent/result b/components/engine/builder/parser/testfiles/continueIndent/result index e440b836d4..8c67707706 100644 --- a/components/engine/builder/parser/testfiles/continueIndent/result +++ b/components/engine/builder/parser/testfiles/continueIndent/result @@ -3,7 +3,7 @@ (run "echo hello world") (run "echo hello world") (run "echo hello goodbyefrog") -(run "echo hello \\") +(run "echo hello world") (run "echo hi world goodnight") (run "echo goodbyefrog") (run "echo goodbyefrog")