Fix spaces between concatenated lines

3 files changed, 24 insertions, 1 deletions

diff --git a/parser.go b/parser.go
index bc03e68..09f407f 100644
--- a/parser.go
+++ b/parser.go
@@ -111,9 +111,11 @@ func (p *parser) processDefineLine(line []byte) []byte {
 	// TODO: Handle \\ at the end of the line?
 	for len(line) > 0 && line[len(line)-1] == '\\' {
 		line = line[:len(line)-1]
+		line = bytes.TrimRight(line, "\t ")
 		lineno := p.lineno
-		nline := p.readLine()
+		nline := trimLeftSpaceBytes(p.readLine())
 		p.lineno = lineno
+		line = append(line, ' ')
 		line = append(line, nline...)
 	}
 	return line
diff --git a/strutil.go b/strutil.go
index f080569..03d29d0 100644
--- a/strutil.go
+++ b/strutil.go
@@ -153,3 +153,12 @@ func trimLeftSpace(s string) string {
 	}
 	return ""
 }
+
+func trimLeftSpaceBytes(s []byte) []byte {
+	for i, ch := range s {
+		if ch != ' ' && ch != '\t' {
+			return s[i:]
+		}
+	}
+	return nil
+}
diff --git a/testcase/multiline_and_leading_space.mk b/testcase/multiline_and_leading_space.mk
new file mode 100644
index 0000000..71f0a5e
--- /dev/null
+++ b/testcase/multiline_and_leading_space.mk
@@ -0,0 +1,12 @@
+X:=foo \
+	 bar
+
+Y:=foo \
+   \
+	 bar
+
+$(info foo \
+	 bar)
+
+test:
+	echo PASS $(X) $(Y)