From 4f23155ca7f8591cae0be6938610386513d24b7f Mon Sep 17 00:00:00 2001
From: Mel <einebeere@gmail.com>
Date: Wed, 27 Jul 2022 22:20:28 +0000
Subject: Put correct token strings in parser errors

---
 pkg/lang/parser/exprs.go  | 4 ++--
 pkg/lang/parser/parser.go | 2 +-
 pkg/lang/parser/stmts.go  | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkg/lang/parser')

diff --git a/pkg/lang/parser/exprs.go b/pkg/lang/parser/exprs.go
index 56904a1..d0725f6 100644
--- a/pkg/lang/parser/exprs.go
+++ b/pkg/lang/parser/exprs.go
@@ -176,7 +176,7 @@ func (p *Parser) parseUnitExpr() (ast.Expr, error) {
 	case token.KwTrue, token.KwFalse, token.KwNull, token.KwThis:
 		return p.parseValueLitExpr()
 	default:
-		panic(fmt.Errorf("unexpected token %+v, wanted unit expression start", p.peek()))
+		panic(fmt.Errorf("unexpected token '%v', wanted unit expression start", p.peek()))
 	}
 }
 
@@ -371,6 +371,6 @@ func (p *Parser) parseValueLitExpr() (ast.Expr, error) {
 			Value: ast.ExprThis{},
 		}, nil
 	default:
-		panic(fmt.Errorf("unexpected token %+v, wanted value literal", tok))
+		panic(fmt.Errorf("unexpected token '%v', wanted value literal", tok))
 	}
 }
diff --git a/pkg/lang/parser/parser.go b/pkg/lang/parser/parser.go
index 1a9d1d0..0ff4b09 100644
--- a/pkg/lang/parser/parser.go
+++ b/pkg/lang/parser/parser.go
@@ -88,7 +88,7 @@ func (p *Parser) next() token.Token {
 func (p *Parser) expect(kind token.TokenKind) (token.Token, error) {
 	tok := p.next()
 	if tok.Kind != kind {
-		return token.Token{}, fmt.Errorf("expected %v, got %v", kind, tok.Kind)
+		return token.Token{}, fmt.Errorf("expected '%v', got '%v'", kind, tok.Kind)
 	}
 
 	return tok, nil
diff --git a/pkg/lang/parser/stmts.go b/pkg/lang/parser/stmts.go
index 713b1aa..7d10e61 100644
--- a/pkg/lang/parser/stmts.go
+++ b/pkg/lang/parser/stmts.go
@@ -12,8 +12,8 @@ func (p *Parser) parseStmt() (ast.Stmt, error) {
 		return p.parseUseStmt()
 	case token.KwFn:
 		return p.parseFnDeclStmt()
-	case token.KwObject:
-		return p.parseObjectDeclStmt()
+	case token.KwType:
+		return p.parseTypeDeclStmt()
 	case token.KwVar:
 		return p.parseVarDeclStmt()
 	case token.KwIf:
@@ -110,7 +110,7 @@ func (p *Parser) parseFnParams() ([]ast.IdentNode, error) {
 	return params, nil
 }
 
-func (p *Parser) parseObjectDeclStmt() (ast.Stmt, error) {
+func (p *Parser) parseTypeDeclStmt() (ast.Stmt, error) {
 	panic("not implemented")
 }
 
@@ -438,7 +438,7 @@ func (p *Parser) parseEmptyStmt() (ast.Stmt, error) {
 func (p *Parser) parseStmtEnd() error {
 	tok := p.peek()
 	if !tok.CanEndStmt() {
-		panic(fmt.Errorf("wanted statement end, received: %+v", tok))
+		panic(fmt.Errorf("wanted statement end, received: '%v'", tok))
 	}
 	p.next()
 	return nil
-- 
cgit 1.4.1