go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-12-05 22:26:09 +02:00
Code Issues Releases Activity

Move value specific Iterable and Iterator interfaces into core module (#233)

Browse Source 
* Move value specific Iterable and Iterator interfaces into core module

* Update Makefile

Reverted test command

* Update collection.go

* Fixed wrong iterator usage

* Updated use of switch statements
This commit is contained in:
Tim Voronov
2019-02-15 07:41:08 -05:00
committed by GitHub
parent 1af8b37a0f
commit f8e061cc80
13 changed files with 82 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/runtime/expressions/data_source.go
View File

@@ -54,20 +54,19 @@ func (ds *DataSource) Iterate(ctx context.Context, scope *core.Scope) (collectio
return collections.NewHTMLNodeIterator(ds.valVariable, ds.keyVariable, data.(values.HTMLNode))
default:
// fallback to user defined types
switch data.(type) {
case collections.IterableCollection:
collection := data.(collections.IterableCollection)
switch collection := data.(type) {
case core.Iterable:
iterator, err := collection.Iterate(ctx)
if err != nil {
return nil, err
}
return collections.NewCollectionIterator(ds.valVariable, ds.keyVariable, iterator)
return collections.NewCoreIterator(ds.valVariable, ds.keyVariable, iterator)
case collections.KeyedCollection:
return collections.NewIndexedIterator(ds.valVariable, ds.keyVariable, data.(collections.IndexedCollection))
return collections.NewKeyedIterator(ds.valVariable, ds.keyVariable, collection)
case collections.IndexedCollection:
return collections.NewKeyedIterator(ds.valVariable, ds.keyVariable, data.(collections.KeyedCollection))
return collections.NewIndexedIterator(ds.valVariable, ds.keyVariable, collection)
default:
return nil, core.TypeError(
data.Type(),
@@ -75,6 +74,7 @@ func (ds *DataSource) Iterate(ctx context.Context, scope *core.Scope) (collectio
types.Object,
types.HTMLDocument,
types.HTMLElement,
core.NewType("Iterable"),
)
}
}