Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow, destructuring hashes, closes #47 #151

Merged
merged 3 commits into from Feb 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 23 additions & 13 deletions evaluator/evaluator.go
Expand Up @@ -82,8 +82,7 @@ func Eval(node ast.Node, env *object.Environment) object.Object {
return &object.Number{Token: node.Token, Value: node.Value}

case *ast.NullLiteral:
return &object.Null{Token: node.Token}
// return NULL
return NULL

case *ast.StringLiteral:
return &object.String{Token: node.Token, Value: node.Value}
Expand Down Expand Up @@ -321,20 +320,31 @@ func evalAssignment(as *ast.AssignStatement, env *object.Environment) object.Obj

// destructuring x, y = [1, 2]
if len(as.Names) > 0 {
if val.Type() != object.ARRAY_OBJ {
return newError(as.Token, "wrong assignment, expected identifier or array destructuring, got %s (%s)", val.Type(), val.Inspect())
}

elements := val.(*object.Array).Elements
switch v := val.(type) {
case *object.Array:
elements := v.Elements
for i, name := range as.Names {
if i < len(elements) {
env.Set(name.String(), elements[i])
continue
}

for i, name := range as.Names {
if i < len(elements) {
env.Set(name.String(), elements[i])
continue
env.Set(name.String(), NULL)
}

env.Set(name.String(), NULL)
case *object.Hash:
for _, name := range as.Names {
x, ok := v.GetPair(name.String())

if ok {
env.Set(name.String(), x.Value)
} else {
env.Set(name.String(), NULL)
}
}
default:
return newError(as.Token, "wrong assignment, expected identifier or array destructuring, got %s (%s)", val.Type(), val.Inspect())
}

return nil
}
// support assignment to indexed expressions: a[0] = 1, h["a"] = 1
Expand Down
2 changes: 2 additions & 0 deletions evaluator/evaluator_test.go
Expand Up @@ -492,7 +492,9 @@ func TestAssignStatements(t *testing.T) {
{"a = 5; b = a; b;", 5},
{"a = 5; b = a; c = a + b + 5; c;", 15},
{"a, b, c = [1]; a;", 1},
{`a, b, c = {"a": 1}; a;`, 1},
{"a, b, c = [1]; b;", nil},
{`a, b, c = {"a": 1}; b;`, nil},
{`a = 10 + 1 + 2
b, c = [1, 2]; b`, 1},
{`a = 10 + 1 + 2
Expand Down
6 changes: 6 additions & 0 deletions object/object.go
Expand Up @@ -237,6 +237,12 @@ type Hash struct {
}

func (h *Hash) Type() ObjectType { return HASH_OBJ }
func (h *Hash) GetPair(key string) (HashPair, bool) {
record, ok := h.Pairs[HashKey{Type: "STRING", Value: key}]

return record, ok
}

func (h *Hash) Inspect() string {
var out bytes.Buffer

Expand Down