fix: tests all working

Author: dnitsch

pkg/ast/ast.go

@@ -2,6 +2,7 @@ package ast
 
 import (
 	"bytes"
+	"fmt"
 
 	"github.com/dnitsch/async-api-generator/pkg/token"
 )
@@ -64,7 +65,7 @@ func (ls *GenDocStatement) String() string {
 	var out bytes.Buffer
 
 	out.WriteString(ls.TokenLiteral())
-	out.WriteString(ls.Name.String())
+	out.WriteString(fmt.Sprintf("%s %s", ls.Name.String(), ls.Token.MetaTags))
 
 	if ls.Value != nil {
 		out.WriteString(ls.Value.String())

pkg/ast/ast_test.go

@@ -22,14 +22,14 @@ func TestString(t *testing.T) {
 				},
 			},
 			&ast.GenDocStatement{
-				Token: token.Token{Type: token.BEGIN_DOC_GEN, Literal: "// gendoc"},
+				Token: token.Token{Type: token.BEGIN_DOC_GEN, Literal: "// gendoc", MetaTags: "type=message,subtype=example,consumer=[],producer=[]"},
 				Name: &ast.EnclosedIdentifier{
-					Token: token.Token{Type: token.TEXT, Literal: ""},
+					Token: token.Token{Type: token.CONTENT_DOC_GEN, Literal: "content_gendoc"},
 					Value: "",
 				},
 				Value: &ast.EnclosedIdentifier{
-					Token: token.Token{Type: token.NEW_LINE, Literal: "gendoc"},
-					Value: " type=message,subtype=example,consumer=[],producer=[]",
+					Token: token.Token{Type: token.TEXT, Literal: "text"},
+					Value: "", //
 				},
 			},
 		},

pkg/parser/parser.go

@@ -20,8 +20,6 @@ const (
 	INDEX       // array[index]
 )
 
-var precedences = map[token.TokenType]int{}
-
 type Parser struct {
 	l      *lexer.Lexer
 	errors []string
@@ -102,6 +100,8 @@ func (p *Parser) parseStatement() ast.Statement {
 
 func (p *Parser) parseBeginGenDocStatement() *ast.GenDocStatement {
 	stmt := &ast.GenDocStatement{Token: p.curToken}
+	// do some parsing here perhaps of the name and file name/location etc...
+	stmt.Name = &ast.EnclosedIdentifier{Token: token.Token{Type: token.BEGIN_DOC_GEN, Literal: "// gendoc", MetaTags: p.curToken.MetaTags}, Value: "// gendoc"} //p.curToken.MetaTags}
 	// move past gendoc token
 	p.nextToken()
 
@@ -115,8 +115,8 @@ func (p *Parser) parseBeginGenDocStatement() *ast.GenDocStatement {
 		}
 		p.nextToken()
 	}
-	
-	stmt.Value = &ast.EnclosedIdentifier{token.Token{token.CONTENT_DOC_GEN, genDocValue, stmt.Token.MetaTags}, genDocValue}
+
+	stmt.Value = &ast.EnclosedIdentifier{Token: token.Token{Type: token.CONTENT_DOC_GEN, Literal: genDocValue, MetaTags: stmt.Token.MetaTags}, Value: genDocValue}
 	// skip end doc
 	p.nextToken()
 	return stmt
@@ -129,31 +129,14 @@ func (p *Parser) parseIgnoreStatement() *ast.IgnoreStatement {
 	for !p.curTokenIs(token.EOF) {
 		ignoreValue += p.curToken.Literal
 		if p.peekTokenIs(token.BEGIN_DOC_GEN) {
-			p.nextToken()
 			break
 		}
 		p.nextToken()
 	}
-	stmt.Value = &ast.UnusedIdentifier{token.Token{Type: token.NEW_LINE, Literal: ignoreValue}, ignoreValue}
+	stmt.Value = &ast.UnusedIdentifier{Token: token.Token{Type: token.NEW_LINE, Literal: ignoreValue}, Value: ignoreValue}
 	return stmt
 }
 
 func (p *Parser) parseExpression(precedence int) ast.Expression {
 	return &ast.EnclosedIdentifier{}
 }
-
-func (p *Parser) peekPrecedence() int {
-	if p, ok := precedences[p.peekToken.Type]; ok {
-		return p
-	}
-
-	return LOWEST
-}
-
-func (p *Parser) curPrecedence() int {
-	if p, ok := precedences[p.curToken.Type]; ok {
-		return p
-	}
-
-	return LOWEST
-}

pkg/parser/parser_test.go

@@ -20,7 +20,7 @@ stuff {
 	here string
 }
 // !gendoc
-`, "gendoc", `stuff {
+`, "// gendoc", `stuff {
 	here string
 }`},
 		// "bool":   {"let y = true;", "y", true},
@@ -46,25 +46,25 @@ stuff {
 }
 
 func testGenDocStatement(t *testing.T, s ast.Statement, name string) bool {
-	if s.TokenLiteral() != "gendoc" {
-		t.Errorf("got=%q, wanted s.TokenLiteral = 'gendoc'.", s.TokenLiteral())
+	if s.TokenLiteral() != "// gendoc" {
+		t.Errorf("got=%q, wanted s.TokenLiteral = '// gendoc'.", s.TokenLiteral())
 		return false
 	}
 
-	letStmt, ok := s.(*ast.GenDocStatement)
+	genStmt, ok := s.(*ast.GenDocStatement)
 	if !ok {
 		t.Errorf("s not *ast.GenDocStatement. got=%T", s)
 		return false
 	}
 
-	if letStmt.Name.Value != name {
-		t.Errorf("letStmt.Name.Value not '%s'. got=%s", name, letStmt.Name.Value)
+	if genStmt.Name.Value != name {
+		t.Errorf("letStmt.Name.Value not '%s'. got=%s", name, genStmt.Name.Value)
 		return false
 	}
 
-	if letStmt.Name.TokenLiteral() != name {
+	if genStmt.Name.TokenLiteral() != name {
 		t.Errorf("letStmt.Name.TokenLiteral() not '%s'. got=%s",
-			name, letStmt.Name.TokenLiteral())
+			name, genStmt.Name.TokenLiteral())
 		return false
 	}
 

pkg/token/token.go

@@ -5,13 +5,13 @@ type TokenType string
 const (
 	ILLEGAL TokenType = "ILLEGAL"
 	EOF     TokenType = "EOF"
-	
+
 	SPACE           TokenType = "SPACE"           // ' '
 	TAB             TokenType = "TAB"             // '\t'
 	NEW_LINE        TokenType = "NEW_LINE"        // '\n'
 	CARRIAGE_RETURN TokenType = "CARRIAGE_RETURN" // '\r'
 	CONTROL         TokenType = "CONTROL"
-	
+
 	// Identifiers + literals
 	TEXT            TokenType = "TEXT"            //
 	CONTENT_DOC_GEN TokenType = "CONTENT_DOC_GEN" //