parser: working assignstatement is finished

parser/ast.go

@@ -48,7 +48,7 @@ func (s *Source) String() string {
 
 func (s *Source) Pos() scanner.Pos {
 	// always returns the uninitiliazed position
-	return scanner.Pos{}
+	return s.nodes[0].Pos()
 }
 
 // IdentStatement represents an identifier.

parser/parser.go

@@ -29,14 +29,14 @@ func (p *Parser) Parse() Node {
 	node := &Source{}
 
 	for {
+		if n := p.parseStatement(); n != nil {
+			node.add(n)
+		}
+
 		// break if we hit the end
 		if p.tok.Type == scanner.EOF {
 			break
 		}
-
-		if n := p.parseStatement(); n != nil {
-			node.add(n)
-		}
 	}
 
 	return node
@@ -48,20 +48,16 @@ func (p *Parser) parseStatement() Node {
 	tok := p.scan()
 
 	if tok.Type.IsLiteral() {
-		// found an object
 		if p.prevTok.Type.IsLiteral() {
 			return p.parseObject()
 		}
-		return p.parseIdent()
-	}
 
-	switch tok.Type {
+		if tok := p.scan(); tok.Type == scanner.ASSIGN {
-	case scanner.LBRACE:
+			return p.parseAssignment()
-		return p.parseObject()
+		}
-	case scanner.LBRACK:
+
-		return p.parseList()
+		p.unscan()
-	case scanner.ASSIGN:
+		return p.parseIdent()
-		return p.parseAssignment()
 	}
 
 	return nil
@@ -113,7 +109,10 @@ func (p *Parser) scan() scanner.Token {
 }
 
 // unscan pushes the previously read token back onto the buffer.
-func (p *Parser) unscan() { p.n = 1 }
+func (p *Parser) unscan() {
+	p.n = 1
+	p.tok = p.prevTok
+}
 
 // ----------------------------------------------------------------------------
 // Parsing support

parser/parser_test.go

@@ -1,17 +1,19 @@
 package parser
 
-import (
+import "testing"
-	"fmt"
-	"testing"
-)
 
 func TestAssignStatment(t *testing.T) {
 	src := `ami = "${var.foo}"`
-
 	p := New([]byte(src))
 	p.enableTrace = true
 	n := p.Parse()
 
-	fmt.Println(n)
+	if n.String() != src {
+		t.Errorf("AssignStatement is not parsed correctly\n\twant: '%s'\n\tgot : '%s'", src, n.String())
+	}
+
+	if n.Pos().Line != 1 {
+		t.Errorf("AssignStatement position is wrong\n\twant: '%d'\n\tgot : '%d'", 1, n.Pos().Line)
+	}
 
 }