Merge pull request #37 from nasa9084/fix-comment

Comments must be separated from other tokens by white space characters
goccy · Nov 12, 2019 · b6878e0 · b6878e0
2 parents 97cdb16 + 6db264d
commit b6878e0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/parser/parser_test.go b/parser/parser_test.go
@@ -259,6 +259,14 @@ d: e # comment
 a:
  b: c
 d: e
+`,
+		},
+		{
+			`
+a: b#notcomment
+`,
+			`
+a: b#notcomment
 `,
 		},
 		{

diff --git a/scanner/scanner.go b/scanner/scanner.go
@@ -476,13 +476,15 @@ func (s *Scanner) scan(ctx *Context) (pos int) {
 				return
 			}
 		case '#':
-			s.addBufferedTokenIfExists(ctx)
-			token, progress := s.scanComment(ctx)
-			ctx.addToken(token)
-			s.progressColumn(ctx, progress)
-			s.progressLine(ctx)
-			pos += progress
-			return
+			if ctx.bufferedSrc() == "" || ctx.previousChar() == ' ' {
+				s.addBufferedTokenIfExists(ctx)
+				token, progress := s.scanComment(ctx)
+				ctx.addToken(token)
+				s.progressColumn(ctx, progress)
+				s.progressLine(ctx)
+				pos += progress
+				return
+			}
 		case '\'', '"':
 			if ctx.bufferedSrc() == "" {
 				token, progress := s.scanQuote(ctx, c)
-Original file line number
+Diff line change
@@ Expand Up / @@ -259,6 +259,14 @@ d: e # comment @@
     a:
      b: c
     d: e
+    `,
+    		},
+    		{
+    			`
+    a: b#notcomment
+    `,
+    			`
+    a: b#notcomment
     `,
     		},
     		{
@@ Expand Down @@