go: Rename Declartion to Decl

Rename Declartion to Decl for consistency with FuncDecl and the upcoming
TypedDecl and InferredDecl.

Author: juliaogris

pkg/evaluator/evaluator.go

@@ -68,8 +68,8 @@ func (e *Evaluator) Eval(node parser.Node) Value {
 	switch node := node.(type) {
 	case *parser.Program:
 		return e.evalProgram(node)
-	case *parser.Declaration:
-		return e.evalDeclaration(node)
+	case *parser.Decl:
+		return e.evalDecl(node)
 	case *parser.AssignmentStmt:
 		return e.evalAssignment(node)
 	case *parser.Var:
@@ -170,7 +170,7 @@ func (e *Evaluator) evalBool(b *parser.Bool) Value {
 	return &Bool{Val: b.Value}
 }
 
-func (e *Evaluator) evalDeclaration(decl *parser.Declaration) Value {
+func (e *Evaluator) evalDecl(decl *parser.Decl) Value {
 	val := e.Eval(decl.Value)
 	if isError(val) {
 		return val

pkg/evaluator/evaluator_test.go

@@ -24,7 +24,7 @@ func TestBasicEval(t *testing.T) {
 	assert.Equal(t, want, got)
 }
 
-func TestParseDeclaration(t *testing.T) {
+func TestParseDecl(t *testing.T) {
 	tests := map[string]string{
 		"a:=1":          "1",
 		`a:="abc"`:      "abc",

pkg/parser/ast.go

@@ -60,7 +60,7 @@ type DotExpression struct {
 	Key   string // m := { age: 42}; m.age => key: "age"
 }
 
-type Declaration struct {
+type Decl struct {
 	Token *lexer.Token
 	Var   *Var
 	Value Node // literal, expression, assignable, ...
@@ -249,14 +249,14 @@ func (d *DotExpression) Type() *Type {
 	return d.T
 }
 
-func (d *Declaration) String() string {
+func (d *Decl) String() string {
 	if d.Value == nil {
 		return d.Var.String()
 	}
 	return d.Var.String() + "=" + d.Value.String()
 }
 
-func (d *Declaration) Type() *Type {
+func (d *Decl) Type() *Type {
 	return d.Var.T
 }
 

pkg/parser/parser.go

@@ -407,10 +407,10 @@ func (p *Parser) parseTypedDeclStatement(scope *scope) Node {
 
 // parseTypedDecl parses declarations like
 // `x:num` or `y:any[]{}`.
-func (p *Parser) parseTypedDecl() *Declaration {
+func (p *Parser) parseTypedDecl() *Decl {
 	p.assertToken(lexer.IDENT)
 	varName := p.cur.Literal
-	decl := &Declaration{
+	decl := &Decl{
 		Token: p.cur,
 		Var:   &Var{Token: p.cur, Name: varName},
 	}
@@ -448,7 +448,7 @@ func (p *Parser) validateVarDecl(scope *scope, v *Var, tok *lexer.Token, allowUn
 func (p *Parser) parseInferredDeclStatement(scope *scope) Node {
 	p.assertToken(lexer.IDENT)
 	varName := p.cur.Literal
-	decl := &Declaration{
+	decl := &Decl{
 		Token: p.cur,
 		Var:   &Var{Token: p.cur, Name: varName},
 	}

pkg/parser/parser_test.go

@@ -7,7 +7,7 @@ import (
 	"foxygo.at/evy/pkg/assert"
 )
 
-func TestParseDeclaration(t *testing.T) {
+func TestParseDecl(t *testing.T) {
 	tests := map[string][]string{
 		"a := 1":     {"a=1"},
 		"a:bool":     {"a=false"},
@@ -62,7 +62,7 @@ func TestEmptyProgram(t *testing.T) {
 	}
 }
 
-func TestParseDeclarationError(t *testing.T) {
+func TestParseDeclError(t *testing.T) {
 	tests := map[string]string{
 		"a :invalid":    "line 1 column 1: invalid type declaration for 'a'",
 		"a :":           "line 1 column 1: invalid type declaration for 'a'",