Skip to content

fixing error messages when loading lists with heterogeneous elements #32

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.

Sign up for GitHub

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

Open
julochrobak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixing error messages when loading lists with heterogeneous elements #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/comp/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ func traverse(h Type, v interface{}) (Type, Value, error) {
case nil:
head = make(ObjectType, len(elems))
default:
return nil, nil, fmt.Errorf("expected object, got %v (%v)", h.Name(), v)
return nil, nil, fmt.Errorf("expected %v, got object (%v)", h.Name(), v)
}

idx := 0
Expand Down Expand Up @@ -316,7 +316,7 @@ func traverse(h Type, v interface{}) (Type, Value, error) {
case nil:
head = ListType{}
default:
return nil, nil, fmt.Errorf("expected list, got %v (%v)", h.Name(), v)
return nil, nil, fmt.Errorf("expected %v, got list (%v)", h.Name(), v)
}

for idx, value := range elems {
Expand All @@ -335,21 +335,21 @@ func traverse(h Type, v interface{}) (Type, Value, error) {
case nil, ScalarType:
return ScalarType(0), Bool(v.(bool)), nil
default:
return nil, nil, fmt.Errorf("expected bool, got %v (%v)", h.Name(), v)
return nil, nil, fmt.Errorf("expected %v, got bool (%v)", h.Name(), v)
}
case float64:
switch h.(type) {
case nil, ScalarType:
return ScalarType(0), Number(v.(float64)), nil
default:
return nil, nil, fmt.Errorf("expected number, got %v (%v)", h.Name(), v)
return nil, nil, fmt.Errorf("expected %v, got number (%v)", h.Name(), v)
}
default:
switch h.(type) {
case nil, ScalarType:
return ScalarType(0), String(v.(string)), nil
default:
return nil, nil, fmt.Errorf("expected string, got %v (%v)", h.Name(), v)
return nil, nil, fmt.Errorf("expected %v, got string (%v)", h.Name(), v)
}
}
}
Expand Down