x/box-o-sand
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arghing #1

Merged
meatballhat merged 23 commits from arghing into main 2022-06-06 22:44:25 +00:00
Conversation 0 Commits 23 Files Changed 18 +39 -58
2 changed files with 39 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1ffbe25a3 - Show all commits

50
argh/parser2_test.go
View File

@ -59,31 +59,25 @@ func TestParser2(t *testing.T) {
}, },
}, },
}, },
/* expAST: []argh.Node{
expAST: []argh.Node{ &argh.Command{
&argh.Command{ Name: "pies",
Name: "pies", Values: map[string]string{},
Values: map[string]string{}, Nodes: []argh.Node{
Nodes: []argh.Node{ &argh.Flag{Name: "e"},
&argh.CompoundShortFlag{ &argh.Flag{Name: "a"},
Nodes: []argh.Node{ &argh.Flag{Name: "t"},
&argh.Flag{Name: "e"}, &argh.Flag{Name: "wat"},
&argh.Flag{Name: "a"}, &argh.Command{
&argh.Flag{Name: "t"}, Name: "hello",
}, Values: map[string]string{
}, "name": "mario",
&argh.Flag{Name: "wat"},
&argh.Command{
Name: "hello",
Values: map[string]string{
"name": "mario",
},
Nodes: []argh.Node{},
}, },
Nodes: []argh.Node{},
}, },
}, },
}, },
*/ },
}, },
{ {
name: "bare", name: "bare",
@ -432,12 +426,13 @@ func TestParser2(t *testing.T) {
}, },
}, },
} { } {
if tc.skip {
continue
}
if tc.expPT != nil { if tc.expPT != nil {
t.Run(tc.name+" parse tree", func(ct *testing.T) { t.Run(tc.name+" parse tree", func(ct *testing.T) {
if tc.skip {
ct.SkipNow()
return
}
pt, err := argh.ParseArgs2(tc.args, tc.cfg) pt, err := argh.ParseArgs2(tc.args, tc.cfg)
if err != nil { if err != nil {
assert.ErrorIs(ct, err, tc.expErr) assert.ErrorIs(ct, err, tc.expErr)
@ -452,6 +447,11 @@ func TestParser2(t *testing.T) {
if tc.expAST != nil { if tc.expAST != nil {
t.Run(tc.name+" ast", func(ct *testing.T) { t.Run(tc.name+" ast", func(ct *testing.T) {
if tc.skip {
ct.SkipNow()
return
}
pt, err := argh.ParseArgs2(tc.args, tc.cfg) pt, err := argh.ParseArgs2(tc.args, tc.cfg)
if err != nil { if err != nil {
ct.Logf("err=%+#v", err) ct.Logf("err=%+#v", err)

47
argh/querier.go
View File

@ -1,10 +1,7 @@
package argh package argh
import "fmt"
type Querier interface { type Querier interface {
Program() (Command, bool) Program() (Command, bool)
TypedAST() []TypedNode
AST() []Node AST() []Node
} }
@ -25,50 +22,34 @@ func (dq *defaultQuerier) Program() (Command, bool) {
return v, ok return v, ok
} }
func (dq *defaultQuerier) TypedAST() []TypedNode {
ret := []TypedNode{}
for _, node := range dq.nodes {
if _, ok := node.(ArgDelimiter); ok {
continue
}
if _, ok := node.(StopFlag); ok {
continue
}
ret = append(
ret,
TypedNode{
Type: fmt.Sprintf("%T", node),
Node: node,
},
)
}
return ret
}
func (dq *defaultQuerier) AST() []Node { func (dq *defaultQuerier) AST() []Node {
ret := []Node{} ret := []Node{}
for _, node := range dq.nodes { for i, node := range dq.nodes {
if _, ok := node.(ArgDelimiter); ok { tracef("AST i=%d node type=%T", i, node)
if _, ok := node.(*ArgDelimiter); ok {
continue continue
} }
if _, ok := node.(StopFlag); ok { if _, ok := node.(*StopFlag); ok {
continue continue
} }
if v, ok := node.(CompoundShortFlag); ok { if v, ok := node.(*CompoundShortFlag); ok {
ret = append(ret, NewQuerier(v.Nodes).AST()...) ret = append(ret, NewQuerier(v.Nodes).AST()...)
continue continue
} }
if v, ok := node.(Command); ok { if v, ok := node.(*Command); ok {
ret = append(ret, NewQuerier(v.Nodes).AST()...) ret = append(
ret,
&Command{
Name: v.Name,
Values: v.Values,
Nodes: NewQuerier(v.Nodes).AST(),
})
continue continue
} }