go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scanner: // style comments are implemented too

Browse Source
This commit is contained in:
Fatih Arslan 2015-10-05 13:26:18 +03:00
parent 2216cd81e9
commit a299665100
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scanner/scanner.go
View File

@ -120,7 +120,7 @@ func (s *Scanner) Scan() (tok token.Token) {
case '"': case '"':
tok = token.STRING tok = token.STRING
s.scanString() s.scanString()
case '#': case '#', '/':
tok = token.COMMENT tok = token.COMMENT
s.scanComment(ch) s.scanComment(ch)
case '.': case '.':
@ -156,7 +156,7 @@ func (s *Scanner) Scan() (tok token.Token) {
} }
func (s *Scanner) scanComment(ch rune) { func (s *Scanner) scanComment(ch rune) {
if ch == '#' { if ch == '#' || ch == '/' {
// line comment // line comment
ch = s.next() ch = s.next()
for ch != '\n' && ch >= 0 { for ch != '\n' && ch >= 0 {

11
scanner/scanner_test.go
View File

@ -42,11 +42,12 @@ func testTokenList(t *testing.T, tokenList []tokenPair) {
func TestComment(t *testing.T) { func TestComment(t *testing.T) {
var tokenList = []tokenPair{ var tokenList = []tokenPair{
// {token.COMMENT, "//"}, {token.COMMENT, "//"},
// {token.COMMENT, "////"}, {token.COMMENT, "////"},
// {token.COMMENT, "// comment"}, {token.COMMENT, "// comment"},
// {token.COMMENT, "// /* comment */"}, {token.COMMENT, "// /* comment */"},
// {token.COMMENT, "// // comment //"}, {token.COMMENT, "// // comment //"},
{token.COMMENT, "//" + f100},
{token.COMMENT, "#"}, {token.COMMENT, "#"},
{token.COMMENT, "##"}, {token.COMMENT, "##"},
{token.COMMENT, "# comment"}, {token.COMMENT, "# comment"},