Skip to content

Commit 636c301

Browse files
GeremWDvbeaucha
authored andcommitted
refacto getPNode (nodeToString) for consistency
1 parent fab48aa commit 636c301

1 file changed

Lines changed: 5 additions & 13 deletions

File tree

CLI/ast.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -369,33 +369,25 @@ func (n *getObjectNode) execute() (interface{}, error) {
369369
}
370370

371371
type getPNode struct {
372-
path node
372+
path node
373373
filter node
374374
}
375375

376376
func (n *getPNode) execute() (interface{}, error) {
377-
val, err := n.path.execute()
377+
path, err := nodeToString(n.path, "path")
378378
if err != nil {
379379
return nil, err
380380
}
381-
path, ok := val.(string)
382-
if !ok {
383-
return nil, fmt.Errorf("Object path should be a string")
384-
}
385-
val ,err = n.filter.execute()
381+
filter, err := nodeToString(n.filter, "filter")
386382
if err != nil {
387383
return nil, err
388384
}
389-
filter, ok := val.(string)
390-
if !ok {
391-
return nil, fmt.Errorf("Object filter should be a string")
392-
}
393-
obj,err := cmd.GetDevicesInfo(path,filter)
385+
obj, err := cmd.GetDevicesInfo(path, filter)
394386
if err != nil {
395387
return nil, err
396388
}
397389
cmd.DisplayObject(obj)
398-
return obj,nil
390+
return obj, nil
399391
}
400392

401393
type selectObjectNode struct {

0 commit comments

Comments
 (0)