[go] backport [C++] Do not strip words which do not start with '#'

commit e7f2d9d24c9cff8f9f19b9d0b37c61e1c2da4d42

1 files changed, 5 insertions, 1 deletions

diff --git a/ninja.go b/ninja.go
index 013bfd5..f993eb6 100644
--- a/ninja.go
+++ b/ninja.go
@@ -137,6 +137,9 @@ func stripShellComment(s string) string {
 		// Fast path.
 		return s
 	}
+	// set space as an initial value so the leading comment will be
+	// stripped out.
+	lastch := rune(' ')
 	var escape bool
 	var quote rune
 	for i, c := range s {
@@ -145,7 +148,7 @@ func stripShellComment(s string) string {
 				quote = 0
 			}
 		} else if !escape {
-			if c == '#' {
+			if c == '#' && isWhitespace(lastch) {
 				return s[:i]
 			} else if c == '\'' || c == '"' || c == '`' {
 				quote = c
@@ -158,6 +161,7 @@ func stripShellComment(s string) string {
 		} else {
 			escape = false
 		}
+		lastch = c
 	}
 	return s
 }