Merge 34d6705 into 5e90b88

abs-lang · Aug 5, 2020 · b3a8a4c · b3a8a4c
2 parents 5e90b88 + 34d6705
commit b3a8a4c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/lexer/lexer.go b/lexer/lexer.go
@@ -79,6 +79,7 @@ func (l *Lexer) newToken(tokenType token.TokenType) token.Token {
 func (l *Lexer) NextToken() token.Token {
 	var tok token.Token
 
+getNextToken:
 	l.skipWhitespace()
 
 	switch l.ch {
@@ -138,9 +139,10 @@ func (l *Lexer) NextToken() token.Token {
 		}
 	case '/':
 		if l.peekChar() == '/' {
-			tok.Type = token.COMMENT
-			tok.Position = l.position
-			tok.Literal = l.readLine()
+			// comment chunk - skip it
+			_ = l.readLine()
+			l.readChar()
+			goto getNextToken
 		} else if l.peekChar() == '=' {
 			tok.Type = token.COMP_SLASH
 			tok.Position = l.position
@@ -150,9 +152,10 @@ func (l *Lexer) NextToken() token.Token {
 			tok = l.newToken(token.SLASH)
 		}
 	case '#':
-		tok.Type = token.COMMENT
-		tok.Position = l.position
-		tok.Literal = l.readLine()
+		// comment chunk - skip it
+		_ = l.readLine()
+		l.readChar()
+		goto getNextToken
 	case '&':
 		if l.peekChar() == '&' {
 			tok.Type = token.AND

diff --git a/lexer/lexer_test.go b/lexer/lexer_test.go
@@ -286,8 +286,8 @@ f hello(x, y) {
 		{token.IDENT, "a"},
 		{token.DOT, "."},
 		{token.IDENT, "prop"},
-		{token.COMMENT, "# Comment"},
-		{token.COMMENT, "// Comment"},
+		{token.NUMBER, "1 # Comment"},
+		{token.TRUE, "true // Comment"},
 		{token.IDENT, "hello"},
 		{token.COMMAND, "command; command"},
 		{token.COMMAND, "command2; command2"},

diff --git a/parser/parser.go b/parser/parser.go
@@ -109,7 +109,6 @@ func New(l *lexer.Lexer) *Parser {
 	p.registerPrefix(token.LBRACKET, p.ParseArrayLiteral)
 	p.registerPrefix(token.LBRACE, p.ParseHashLiteral)
 	p.registerPrefix(token.COMMAND, p.parseCommand)
-	p.registerPrefix(token.COMMENT, p.parseComment)
 	p.registerPrefix(token.BREAK, p.parseBreak)
 	p.registerPrefix(token.CONTINUE, p.parseContinue)
 	p.registerPrefix(token.CURRENT_ARGS, p.parseCurrentArgsLiteral)

diff --git a/token/token.go b/token/token.go
@@ -10,7 +10,6 @@ const (
 	IDENT        = "IDENT"  // add, foobar, x, y, ...
 	NUMBER       = "NUMBER" // 1343456, 1.23456
 	STRING       = "STRING" // "foobar"
-	COMMENT      = "#"      // # Comment
 	AT           = "@"      // @ At symbol
 	NULL         = "NULL"   // # null
 	CURRENT_ARGS = "..."    // # ... function args