argh/cmd/argh/main.go

@@ -12,7 +12,7 @@ import (
 func main() {
 	log.SetFlags(0)
 
-	ast, err := argh.ParseArgs(os.Args, nil)
+	ast, err := argh.ParseArgs2(os.Args, nil)
 	if err != nil {
 		log.Fatal(err)
 	}

argh/parser.go

@@ -1,332 +1,332 @@
-//go:generate stringer -type NValue
-
 package argh
 
 import (
 	"fmt"
 	"io"
 	"strings"
-
-	"github.com/pkg/errors"
 )
 
-var (
+type parser struct {
-	ErrSyntax = errors.New("syntax error")
-)
-
-func ParseArgs(args []string, pCfg *ParserConfig) (*ParseTree, error) {
-	reEncoded := strings.Join(args, string(nul))
-
-	return NewParser(
-		strings.NewReader(reEncoded),
-		pCfg,
-	).Parse()
-}
-
-type Parser struct {
 	s *Scanner
 
-	buf []scanEntry
-
 	cfg *ParserConfig
 
-	nodes []Node
+	errors ScannerErrorList
-	node  Node
+
+	tok Token
+	lit string
+	pos Pos
+
+	buffered bool
 }
 
 type ParseTree struct {
 	Nodes []Node `json:"nodes"`
 }
 
-type scanEntry struct {
+func ParseArgs2(args []string, pCfg *ParserConfig) (*ParseTree, error) {
-	tok Token
+	p := &parser{}
-	lit string
+	p.init(
-	pos Pos
+		strings.NewReader(strings.Join(args, string(nul))),
+		pCfg,
+	)
+
+	tracef("ParseArgs2(...) parser=%+#v", p)
+
+	return p.parseArgs()
 }
 
-func NewParser(r io.Reader, pCfg *ParserConfig) *Parser {
+func (p *parser) init(r io.Reader, pCfg *ParserConfig) {
+	p.errors = ScannerErrorList{}
+
 	if pCfg == nil {
 		pCfg = POSIXyParserConfig
 	}
 
-	parser := &Parser{
+	p.cfg = pCfg
-		buf: []scanEntry{},
-		s:   NewScanner(r, pCfg.ScannerConfig),
-		cfg: pCfg,
-	}
 
-	tracef("NewParser parser=%+#v", parser)
+	p.s = NewScanner(r, pCfg.ScannerConfig)
-	tracef("NewParser pCfg=%+#v", pCfg)
 
-	return parser
+	p.next()
 }
 
-func (p *Parser) Parse() (*ParseTree, error) {
+func (p *parser) parseArgs() (*ParseTree, error) {
-	p.nodes = []Node{}
+	if p.errors.Len() != 0 {
+		tracef("parseArgs() bailing due to initial error")
+		return nil, p.errors.Err()
+	}
 
-	for {
+	tracef("parseArgs() parsing %q as program command; cfg=%+#v", p.lit, p.cfg.Prog)
-		br, err := p.parseArg()
+	prog := p.parseCommand(&p.cfg.Prog)
-		if err != nil {
+
-			return nil, err
+	tracef("parseArgs() top level node is %T", prog)
+
+	nodes := []Node{prog}
+	if v := p.parsePassthrough(); v != nil {
+		tracef("parseArgs() appending passthrough argument %v", v)
+		nodes = append(nodes, v)
+	}
+
+	tracef("parseArgs() returning ParseTree")
+
+	return &ParseTree{Nodes: nodes}, p.errors.Err()
+}
+
+func (p *parser) next() {
+	tracef("next() before scan: %v %q %v", p.tok, p.lit, p.pos)
+
+	p.tok, p.lit, p.pos = p.s.Scan()
+
+	tracef("next() after scan: %v %q %v", p.tok, p.lit, p.pos)
+}
+
+func (p *parser) parseCommand(cCfg *CommandConfig) Node {
+	tracef("parseCommand(%+#v)", cCfg)
+
+	node := &Command{
+		Name: p.lit,
+	}
+	values := map[string]string{}
+	nodes := []Node{}
+
+	identIndex := 0
+
+	for i := 0; p.tok != EOL; i++ {
+		if !p.buffered {
+			tracef("parseCommand(...) buffered=false; scanning next")
+			p.next()
 		}
 
-		if br {
+		p.buffered = false
+
+		tracef("parseCommand(...) for=%d values=%+#v", i, values)
+		tracef("parseCommand(...) for=%d nodes=%+#v", i, nodes)
+		tracef("parseCommand(...) for=%d tok=%s lit=%q pos=%v", i, p.tok, p.lit, p.pos)
+
+		if subCfg, ok := cCfg.Commands[p.lit]; ok {
+			subCommand := p.lit
+
+			nodes = append(nodes, p.parseCommand(&subCfg))
+
+			tracef("parseCommand(...) breaking after sub-command=%v", subCommand)
+			break
+		}
+
+		switch p.tok {
+		case ARG_DELIMITER:
+			tracef("parseCommand(...) handling %s", p.tok)
+
+			nodes = append(nodes, &ArgDelimiter{})
+
+			continue
+		case IDENT, STDIN_FLAG:
+			tracef("parseCommand(...) handling %s", p.tok)
+
+			if cCfg.NValue.Contains(identIndex) {
+				name := fmt.Sprintf("%d", identIndex)
+
+				tracef("parseCommand(...) checking for name of identIndex=%d", identIndex)
+
+				if len(cCfg.ValueNames) > identIndex {
+					name = cCfg.ValueNames[identIndex]
+					tracef("parseCommand(...) setting name=%s from config value names", name)
+				} else if len(cCfg.ValueNames) == 1 && (cCfg.NValue == OneOrMoreValue || cCfg.NValue == ZeroOrMoreValue) {
+					name = fmt.Sprintf("%s.%d", cCfg.ValueNames[0], identIndex)
+					tracef("parseCommand(...) setting name=%s from repeating value name", name)
+				}
+
+				values[name] = p.lit
+			}
+
+			if p.tok == STDIN_FLAG {
+				nodes = append(nodes, &StdinFlag{})
+			} else {
+				nodes = append(nodes, &Ident{Literal: p.lit})
+			}
+
+			identIndex++
+		case LONG_FLAG, SHORT_FLAG, COMPOUND_SHORT_FLAG:
+			tok := p.tok
+
+			flagNode := p.parseFlag(cCfg.Flags)
+
+			tracef("parseCommand(...) appending %s node=%+#v", tok, flagNode)
+
+			nodes = append(nodes, flagNode)
+		case ASSIGN:
+			tracef("parseCommand(...) error on bare %s", p.tok)
+
+			p.errors.Add(Position{Column: int(p.pos)}, "invalid bare assignment")
+
+			break
+		default:
+			tracef("parseCommand(...) breaking on %s", p.tok)
 			break
 		}
 	}
 
-	return &ParseTree{Nodes: p.nodes}, nil
+	if len(nodes) > 0 {
+		node.Nodes = nodes
+	}
+
+	if len(values) > 0 {
+		node.Values = values
+	}
+
+	tracef("parseCommand(...) returning node=%+#v", node)
+	return node
 }
 
-func (p *Parser) parseArg() (bool, error) {
+func (p *parser) parseIdent() Node {
-	tok, lit, pos := p.scan()
+	node := &Ident{Literal: p.lit}
-	if tok == ILLEGAL {
+	return node
-		return false, errors.Wrapf(ErrSyntax, "illegal value %q at pos=%v", lit, pos)
-	}
-
-	if tok == EOL {
-		return true, nil
-	}
-
-	p.unscan(tok, lit, pos)
-
-	node, err := p.scanNode()
-
-	tracef("parseArg node=%+#v err=%+#v", node, err)
-
-	if err != nil {
-		return false, errors.Wrapf(err, "value %q at pos=%v", lit, pos)
-	}
-
-	if node != nil {
-		p.nodes = append(p.nodes, node)
-	}
-
-	return false, nil
 }
 
-func (p *Parser) scanNode() (Node, error) {
+func (p *parser) parseFlag(flCfgMap map[string]FlagConfig) Node {
-	tok, lit, pos := p.scan()
+	switch p.tok {
-
+	case SHORT_FLAG:
-	tracef("scanNode tok=%s lit=%q pos=%v", tok, lit, pos)
+		tracef("parseFlag(...) parsing short flag with config=%+#v", flCfgMap)
-
+		return p.parseShortFlag(flCfgMap)
-	switch tok {
+	case LONG_FLAG:
-	case ARG_DELIMITER:
+		tracef("parseFlag(...) parsing long flag with config=%+#v", flCfgMap)
-		return ArgDelimiter{}, nil
+		return p.parseLongFlag(flCfgMap)
-	case ASSIGN:
-		return nil, errors.Wrapf(ErrSyntax, "bare assignment operator at pos=%v", pos)
-	case IDENT:
-		p.unscan(tok, lit, pos)
-		return p.scanCommandOrIdent()
 	case COMPOUND_SHORT_FLAG:
-		p.unscan(tok, lit, pos)
+		tracef("parseFlag(...) parsing compound short flag with config=%+#v", flCfgMap)
-		return p.scanCompoundShortFlag()
+		return p.parseCompoundShortFlag(flCfgMap)
-	case SHORT_FLAG, LONG_FLAG:
-		p.unscan(tok, lit, pos)
-		return p.scanFlag()
-	default:
 	}
 
-	return Ident{Literal: lit}, nil
+	panic(fmt.Sprintf("token %v cannot be parsed as flag", p.tok))
 }
 
-func (p *Parser) scanCommandOrIdent() (Node, error) {
+func (p *parser) parseShortFlag(flCfgMap map[string]FlagConfig) Node {
-	tok, lit, pos := p.scan()
+	node := &Flag{Name: string(p.lit[1])}
 
-	if len(p.nodes) == 0 {
+	flCfg, ok := flCfgMap[node.Name]
-		p.unscan(tok, lit, pos)
+	if !ok {
-		values, err := p.scanValues(p.cfg.Prog.NValue, p.cfg.Prog.ValueNames)
+		return node
-		if err != nil {
-			return nil, err
-		}
-
-		return Command{Name: lit, Values: values}, nil
 	}
 
-	if cfg, ok := p.cfg.Prog.Commands[lit]; ok {
+	return p.parseConfiguredFlag(node, flCfg)
-		p.unscan(tok, lit, pos)
-		values, err := p.scanValues(cfg.NValue, cfg.ValueNames)
-		if err != nil {
-			return nil, err
-		}
-
-		return Command{Name: lit, Values: values}, nil
-	}
-
-	return Ident{Literal: lit}, nil
 }
 
-func (p *Parser) scanFlag() (Node, error) {
+func (p *parser) parseLongFlag(flCfgMap map[string]FlagConfig) Node {
-	tok, lit, pos := p.scan()
+	node := &Flag{Name: string(p.lit[2:])}
 
-	flagName := string(lit[1:])
+	flCfg, ok := flCfgMap[node.Name]
-	if tok == LONG_FLAG {
+	if !ok {
-		flagName = string(lit[2:])
+		return node
 	}
 
-	if cfg, ok := p.cfg.Prog.Flags[flagName]; ok {
+	return p.parseConfiguredFlag(node, flCfg)
-		p.unscan(tok, flagName, pos)
-
-		values, err := p.scanValues(cfg.NValue, cfg.ValueNames)
-		if err != nil {
-			return nil, err
-		}
-
-		return Flag{Name: flagName, Values: values}, nil
-	}
-
-	return Flag{Name: flagName}, nil
 }
 
-func (p *Parser) scanCompoundShortFlag() (Node, error) {
+func (p *parser) parseCompoundShortFlag(flCfgMap map[string]FlagConfig) Node {
-	tok, lit, pos := p.scan()
-
 	flagNodes := []Node{}
 
-	withoutFlagPrefix := lit[1:]
+	withoutFlagPrefix := p.lit[1:]
 
 	for i, r := range withoutFlagPrefix {
+		node := &Flag{Name: string(r)}
+
 		if i == len(withoutFlagPrefix)-1 {
-			flagName := string(r)
+			flCfg, ok := flCfgMap[node.Name]
-
+			if ok {
-			if cfg, ok := p.cfg.Prog.Flags[flagName]; ok {
+				flagNodes = append(flagNodes, p.parseConfiguredFlag(node, flCfg))
-				p.unscan(tok, flagName, pos)
-
-				values, err := p.scanValues(cfg.NValue, cfg.ValueNames)
-				if err != nil {
-					return nil, err
-				}
-
-				flagNodes = append(flagNodes, Flag{Name: flagName, Values: values})
 
 				continue
 			}
 		}
 
-		flagNodes = append(
+		flagNodes = append(flagNodes, node)
-			flagNodes,
-			Flag{
-				Name: string(r),
-			},
-		)
 	}
 
-	return CompoundShortFlag{Nodes: flagNodes}, nil
+	return &CompoundShortFlag{Nodes: flagNodes}
 }
 
-func (p *Parser) scanValuesAndFlags() (map[string]string, []Node, error) {
+func (p *parser) parseConfiguredFlag(node *Flag, flCfg FlagConfig) Node {
-	return nil, nil, nil
+	values := map[string]string{}
-}
+	nodes := []Node{}
 
-func (p *Parser) scanValues(n NValue, valueNames []string) (map[string]string, error) {
+	identIndex := 0
-	_, lit, pos := p.scan()
 
-	tracef("scanValues lit=%q pos=%v n=%v valueNames=%+v", lit, pos, n, valueNames)
+	for i := 0; p.tok != EOL; i++ {
-
+		if !flCfg.NValue.Contains(identIndex) {
-	values, err := func() (map[string]string, error) {
+			tracef("parseConfiguredFlag(...) identIndex=%d exceeds expected=%v; breaking", identIndex, flCfg.NValue)
-		if n == ZeroValue {
+			break
-			return map[string]string{}, nil
 		}
 
-		ret := map[string]string{}
+		p.next()
-		i := 0
 
-		for {
+		switch p.tok {
-			lit, err := p.scanIdent()
+		case ARG_DELIMITER:
-			if err != nil {
+			nodes = append(nodes, &ArgDelimiter{})
-				if n == NValue(1) {
-					return nil, err
-				}
 
-				if n == OneOrMoreValue {
+			continue
-					break
+		case ASSIGN:
-				}
+			nodes = append(nodes, &Assign{})
+
+			continue
+		case IDENT, STDIN_FLAG:
+			name := fmt.Sprintf("%d", identIndex)
+
+			tracef("parseConfiguredFlag(...) checking for name of identIndex=%d", identIndex)
+
+			if len(flCfg.ValueNames) > identIndex {
+				name = flCfg.ValueNames[identIndex]
+				tracef("parseConfiguredFlag(...) setting name=%s from config value names", name)
+			} else if len(flCfg.ValueNames) == 1 && (flCfg.NValue == OneOrMoreValue || flCfg.NValue == ZeroOrMoreValue) {
+				name = fmt.Sprintf("%s.%d", flCfg.ValueNames[0], identIndex)
+				tracef("parseConfiguredFlag(...) setting name=%s from repeating value name", name)
+			} else {
+				tracef("parseConfiguredFlag(...) setting name=%s", name)
 			}
 
-			name := fmt.Sprintf("%d", i)
+			values[name] = p.lit
-			if len(valueNames)-1 >= i {
+
-				name = valueNames[i]
+			if p.tok == STDIN_FLAG {
-			} else if len(valueNames) > 0 && strings.HasSuffix(valueNames[len(valueNames)-1], "+") {
+				nodes = append(nodes, &StdinFlag{})
-				name = strings.TrimSuffix(valueNames[len(valueNames)-1], "+")
+			} else {
+				nodes = append(nodes, &Ident{Literal: p.lit})
 			}
 
-			ret[name] = lit
+			identIndex++
+		default:
+			tracef("parseConfiguredFlag(...) breaking on %s %q %v; setting buffered=true", p.tok, p.lit, p.pos)
+			p.buffered = true
 
-			if n == NValue(1) && len(ret) == 1 {
+			if len(nodes) > 0 {
-				break
+				node.Nodes = nodes
 			}
 
-			i++
+			if len(values) > 0 {
+				node.Values = values
+			}
+
+			return node
 		}
-
-		return ret, nil
-	}()
-
-	if err != nil {
-		return nil, err
 	}
 
-	if len(values) == 0 {
+	if len(nodes) > 0 {
-		return nil, nil
+		node.Nodes = nodes
 	}
 
-	return values, nil
+	if len(values) > 0 {
+		node.Values = values
+	}
+
+	return node
 }
 
-func (p *Parser) scanIdent() (string, error) {
+func (p *parser) parsePassthrough() Node {
-	tok, lit, pos := p.scan()
+	nodes := []Node{}
 
-	tracef("scanIdent scanned tok=%s lit=%q pos=%v", tok, lit, pos)
+	for ; p.tok != EOL; p.next() {
-
+		nodes = append(nodes, &Ident{Literal: p.lit})
-	unscanBuf := []scanEntry{}
-
-	if tok == ASSIGN || tok == ARG_DELIMITER {
-		entry := scanEntry{tok: tok, lit: lit, pos: Pos(pos)}
-
-		tracef("scanIdent tok=%s; scanning next and pushing to unscan buffer entry=%+#v", tok, entry)
-
-		unscanBuf = append([]scanEntry{entry}, unscanBuf...)
-
-		tok, lit, pos = p.scan()
 	}
 
-	if tok == IDENT {
+	if len(nodes) == 0 {
-		return lit, nil
+		return nil
 	}
 
-	entry := scanEntry{tok: tok, lit: lit, pos: Pos(pos)}
+	return &PassthroughArgs{Nodes: nodes}
-
-	tracef("scanIdent tok=%s; unscanning entry=%+#v", tok, entry)
-
-	unscanBuf = append([]scanEntry{entry}, unscanBuf...)
-
-	for _, entry := range unscanBuf {
-		p.unscan(entry.tok, entry.lit, entry.pos)
-	}
-
-	return "", errors.Wrapf(ErrSyntax, "expected ident at pos=%v but got %s (%q)", pos, tok, lit)
-}
-
-func (p *Parser) scan() (Token, string, Pos) {
-	if len(p.buf) != 0 {
-		entry, buf := p.buf[len(p.buf)-1], p.buf[:len(p.buf)-1]
-		p.buf = buf
-
-		tracef("scan returning buffer entry=%s %+#v", entry.tok, entry)
-		return entry.tok, entry.lit, entry.pos
-	}
-
-	tok, lit, pos := p.s.Scan()
-
-	tracef("scan returning next=%s %+#v", tok, scanEntry{tok: tok, lit: lit, pos: pos})
-
-	return tok, lit, pos
-}
-
-func (p *Parser) unscan(tok Token, lit string, pos Pos) {
-	entry := scanEntry{tok: tok, lit: lit, pos: pos}
-
-	tracef("unscan entry=%s %+#v", tok, entry)
-
-	p.buf = append(p.buf, entry)
 }

argh/parser2.go

@@ -1,328 +0,0 @@
-package argh
-
-import (
-	"fmt"
-	"io"
-	"strings"
-)
-
-type parser2 struct {
-	s *Scanner
-
-	cfg *ParserConfig
-
-	errors ScannerErrorList
-
-	tok Token
-	lit string
-	pos Pos
-
-	buffered bool
-}
-
-func ParseArgs2(args []string, pCfg *ParserConfig) (*ParseTree, error) {
-	parser := &parser2{}
-	parser.init(
-		strings.NewReader(strings.Join(args, string(nul))),
-		pCfg,
-	)
-
-	tracef("ParseArgs2(...) parser=%+#v", parser)
-
-	return parser.parseArgs()
-}
-
-func (p *parser2) init(r io.Reader, pCfg *ParserConfig) {
-	p.errors = ScannerErrorList{}
-
-	if pCfg == nil {
-		pCfg = POSIXyParserConfig
-	}
-
-	p.cfg = pCfg
-
-	p.s = NewScanner(r, pCfg.ScannerConfig)
-
-	p.next()
-}
-
-func (p *parser2) parseArgs() (*ParseTree, error) {
-	if p.errors.Len() != 0 {
-		tracef("parseArgs() bailing due to initial error")
-		return nil, p.errors.Err()
-	}
-
-	tracef("parseArgs() parsing %q as program command; cfg=%+#v", p.lit, p.cfg.Prog)
-	prog := p.parseCommand(&p.cfg.Prog)
-
-	tracef("parseArgs() top level node is %T", prog)
-
-	nodes := []Node{prog}
-	if v := p.parsePassthrough(); v != nil {
-		tracef("parseArgs() appending passthrough argument %v", v)
-		nodes = append(nodes, v)
-	}
-
-	tracef("parseArgs() returning ParseTree")
-
-	return &ParseTree{Nodes: nodes}, p.errors.Err()
-}
-
-func (p *parser2) next() {
-	tracef("next() before scan: %v %q %v", p.tok, p.lit, p.pos)
-
-	p.tok, p.lit, p.pos = p.s.Scan()
-
-	tracef("next() after scan: %v %q %v", p.tok, p.lit, p.pos)
-}
-
-func (p *parser2) parseCommand(cCfg *CommandConfig) Node {
-	tracef("parseCommand(%+#v)", cCfg)
-
-	node := &Command{
-		Name: p.lit,
-	}
-	values := map[string]string{}
-	nodes := []Node{}
-
-	identIndex := 0
-
-	for i := 0; p.tok != EOL; i++ {
-		if !p.buffered {
-			tracef("parseCommand(...) buffered=false; scanning next")
-			p.next()
-		}
-
-		p.buffered = false
-
-		tracef("parseCommand(...) for=%d values=%+#v", i, values)
-		tracef("parseCommand(...) for=%d nodes=%+#v", i, nodes)
-		tracef("parseCommand(...) for=%d tok=%s lit=%q pos=%v", i, p.tok, p.lit, p.pos)
-
-		if subCfg, ok := cCfg.Commands[p.lit]; ok {
-			subCommand := p.lit
-
-			nodes = append(nodes, p.parseCommand(&subCfg))
-
-			tracef("parseCommand(...) breaking after sub-command=%v", subCommand)
-			break
-		}
-
-		switch p.tok {
-		case ARG_DELIMITER:
-			tracef("parseCommand(...) handling %s", p.tok)
-
-			nodes = append(nodes, &ArgDelimiter{})
-
-			continue
-		case IDENT, STDIN_FLAG:
-			tracef("parseCommand(...) handling %s", p.tok)
-
-			if cCfg.NValue.Contains(identIndex) {
-				name := fmt.Sprintf("%d", identIndex)
-
-				tracef("parseCommand(...) checking for name of identIndex=%d", identIndex)
-
-				if len(cCfg.ValueNames) > identIndex {
-					name = cCfg.ValueNames[identIndex]
-					tracef("parseCommand(...) setting name=%s from config value names", name)
-				} else if len(cCfg.ValueNames) == 1 && (cCfg.NValue == OneOrMoreValue || cCfg.NValue == ZeroOrMoreValue) {
-					name = fmt.Sprintf("%s.%d", cCfg.ValueNames[0], identIndex)
-					tracef("parseCommand(...) setting name=%s from repeating value name", name)
-				}
-
-				values[name] = p.lit
-			}
-
-			if p.tok == STDIN_FLAG {
-				nodes = append(nodes, &StdinFlag{})
-			} else {
-				nodes = append(nodes, &Ident{Literal: p.lit})
-			}
-
-			identIndex++
-		case LONG_FLAG, SHORT_FLAG, COMPOUND_SHORT_FLAG:
-			tok := p.tok
-
-			flagNode := p.parseFlag(cCfg.Flags)
-
-			tracef("parseCommand(...) appending %s node=%+#v", tok, flagNode)
-
-			nodes = append(nodes, flagNode)
-		case ASSIGN:
-			tracef("parseCommand(...) error on bare %s", p.tok)
-
-			p.errors.Add(Position{Column: int(p.pos)}, "invalid bare assignment")
-
-			break
-		default:
-			tracef("parseCommand(...) breaking on %s", p.tok)
-			break
-		}
-	}
-
-	if len(nodes) > 0 {
-		node.Nodes = nodes
-	}
-
-	if len(values) > 0 {
-		node.Values = values
-	}
-
-	tracef("parseCommand(...) returning node=%+#v", node)
-	return node
-}
-
-func (p *parser2) parseIdent() Node {
-	node := &Ident{Literal: p.lit}
-	return node
-}
-
-func (p *parser2) parseFlag(flCfgMap map[string]FlagConfig) Node {
-	switch p.tok {
-	case SHORT_FLAG:
-		tracef("parseFlag(...) parsing short flag with config=%+#v", flCfgMap)
-		return p.parseShortFlag(flCfgMap)
-	case LONG_FLAG:
-		tracef("parseFlag(...) parsing long flag with config=%+#v", flCfgMap)
-		return p.parseLongFlag(flCfgMap)
-	case COMPOUND_SHORT_FLAG:
-		tracef("parseFlag(...) parsing compound short flag with config=%+#v", flCfgMap)
-		return p.parseCompoundShortFlag(flCfgMap)
-	}
-
-	panic(fmt.Sprintf("token %v cannot be parsed as flag", p.tok))
-}
-
-func (p *parser2) parseShortFlag(flCfgMap map[string]FlagConfig) Node {
-	node := &Flag{Name: string(p.lit[1])}
-
-	flCfg, ok := flCfgMap[node.Name]
-	if !ok {
-		return node
-	}
-
-	return p.parseConfiguredFlag(node, flCfg)
-}
-
-func (p *parser2) parseLongFlag(flCfgMap map[string]FlagConfig) Node {
-	node := &Flag{Name: string(p.lit[2:])}
-
-	flCfg, ok := flCfgMap[node.Name]
-	if !ok {
-		return node
-	}
-
-	return p.parseConfiguredFlag(node, flCfg)
-}
-
-func (p *parser2) parseCompoundShortFlag(flCfgMap map[string]FlagConfig) Node {
-	flagNodes := []Node{}
-
-	withoutFlagPrefix := p.lit[1:]
-
-	for i, r := range withoutFlagPrefix {
-		node := &Flag{Name: string(r)}
-
-		if i == len(withoutFlagPrefix)-1 {
-			flCfg, ok := flCfgMap[node.Name]
-			if ok {
-				flagNodes = append(flagNodes, p.parseConfiguredFlag(node, flCfg))
-
-				continue
-			}
-		}
-
-		flagNodes = append(flagNodes, node)
-	}
-
-	return &CompoundShortFlag{Nodes: flagNodes}
-}
-
-func (p *parser2) parseConfiguredFlag(node *Flag, flCfg FlagConfig) Node {
-	values := map[string]string{}
-	nodes := []Node{}
-
-	identIndex := 0
-
-	for i := 0; p.tok != EOL; i++ {
-		if !flCfg.NValue.Contains(identIndex) {
-			tracef("parseConfiguredFlag(...) identIndex=%d exceeds expected=%v; breaking", identIndex, flCfg.NValue)
-			break
-		}
-
-		p.next()
-
-		switch p.tok {
-		case ARG_DELIMITER:
-			nodes = append(nodes, &ArgDelimiter{})
-
-			continue
-		case ASSIGN:
-			nodes = append(nodes, &Assign{})
-
-			continue
-		case IDENT, STDIN_FLAG:
-			name := fmt.Sprintf("%d", identIndex)
-
-			tracef("parseConfiguredFlag(...) checking for name of identIndex=%d", identIndex)
-
-			if len(flCfg.ValueNames) > identIndex {
-				name = flCfg.ValueNames[identIndex]
-				tracef("parseConfiguredFlag(...) setting name=%s from config value names", name)
-			} else if len(flCfg.ValueNames) == 1 && (flCfg.NValue == OneOrMoreValue || flCfg.NValue == ZeroOrMoreValue) {
-				name = fmt.Sprintf("%s.%d", flCfg.ValueNames[0], identIndex)
-				tracef("parseConfiguredFlag(...) setting name=%s from repeating value name", name)
-			} else {
-				tracef("parseConfiguredFlag(...) setting name=%s", name)
-			}
-
-			values[name] = p.lit
-
-			if p.tok == STDIN_FLAG {
-				nodes = append(nodes, &StdinFlag{})
-			} else {
-				nodes = append(nodes, &Ident{Literal: p.lit})
-			}
-
-			identIndex++
-		default:
-			tracef("parseConfiguredFlag(...) breaking on %s %q %v; setting buffered=true", p.tok, p.lit, p.pos)
-			p.buffered = true
-
-			if len(nodes) > 0 {
-				node.Nodes = nodes
-			}
-
-			if len(values) > 0 {
-				node.Values = values
-			}
-
-			return node
-		}
-	}
-
-	if len(nodes) > 0 {
-		node.Nodes = nodes
-	}
-
-	if len(values) > 0 {
-		node.Values = values
-	}
-
-	return node
-}
-
-func (p *parser2) parsePassthrough() Node {
-	nodes := []Node{}
-
-	for ; p.tok != EOL; p.next() {
-		nodes = append(nodes, &Ident{Literal: p.lit})
-	}
-
-	if len(nodes) == 0 {
-		return nil
-	}
-
-	return &PassthroughArgs{Nodes: nodes}
-}

argh/parser2_test.go

@@ -1,807 +0,0 @@
-package argh_test
-
-import (
-	"testing"
-
-	"git.meatballhat.com/x/box-o-sand/argh"
-	"github.com/davecgh/go-spew/spew"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestParser2(t *testing.T) {
-	for _, tc := range []struct {
-		name   string
-		args   []string
-		cfg    *argh.ParserConfig
-		expErr error
-		expPT  []argh.Node
-		expAST []argh.Node
-		skip   bool
-	}{
-		{
-			name: "basic",
-			args: []string{
-				"pies", "-eat", "--wat", "hello", "mario",
-			},
-			cfg: &argh.ParserConfig{
-				Prog: argh.CommandConfig{
-					Commands: map[string]argh.CommandConfig{
-						"hello": argh.CommandConfig{
-							NValue:     1,
-							ValueNames: []string{"name"},
-						},
-					},
-				},
-			},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pies",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.CompoundShortFlag{
-							Nodes: []argh.Node{
-								&argh.Flag{Name: "e"},
-								&argh.Flag{Name: "a"},
-								&argh.Flag{Name: "t"},
-							},
-						},
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "wat"},
-						&argh.ArgDelimiter{},
-						&argh.Command{
-							Name: "hello",
-							Values: map[string]string{
-								"name": "mario",
-							},
-							Nodes: []argh.Node{
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "mario"},
-							},
-						},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pies",
-					Nodes: []argh.Node{
-						&argh.Flag{Name: "e"},
-						&argh.Flag{Name: "a"},
-						&argh.Flag{Name: "t"},
-						&argh.Flag{Name: "wat"},
-						&argh.Command{
-							Name: "hello",
-							Values: map[string]string{
-								"name": "mario",
-							},
-							Nodes: []argh.Node{
-								&argh.Ident{Literal: "mario"},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "bare",
-			args: []string{"pizzas"},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-				},
-			},
-		},
-		{
-			name: "one positional arg",
-			args: []string{"pizzas", "excel"},
-			cfg: &argh.ParserConfig{
-				Prog: argh.CommandConfig{NValue: 1},
-			},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name:   "pizzas",
-					Values: map[string]string{"0": "excel"},
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.Ident{Literal: "excel"},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name:   "pizzas",
-					Values: map[string]string{"0": "excel"},
-					Nodes: []argh.Node{
-						&argh.Ident{Literal: "excel"},
-					},
-				},
-			},
-		},
-		{
-			name: "many positional args",
-			args: []string{"pizzas", "excel", "wildly", "when", "feral"},
-			cfg: &argh.ParserConfig{
-				Prog: argh.CommandConfig{
-					NValue:     argh.OneOrMoreValue,
-					ValueNames: []string{"word"},
-				},
-			},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Values: map[string]string{
-						"word":   "excel",
-						"word.1": "wildly",
-						"word.2": "when",
-						"word.3": "feral",
-					},
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.Ident{Literal: "excel"},
-						&argh.ArgDelimiter{},
-						&argh.Ident{Literal: "wildly"},
-						&argh.ArgDelimiter{},
-						&argh.Ident{Literal: "when"},
-						&argh.ArgDelimiter{},
-						&argh.Ident{Literal: "feral"},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Values: map[string]string{
-						"word":   "excel",
-						"word.1": "wildly",
-						"word.2": "when",
-						"word.3": "feral",
-					},
-					Nodes: []argh.Node{
-						&argh.Ident{Literal: "excel"},
-						&argh.Ident{Literal: "wildly"},
-						&argh.Ident{Literal: "when"},
-						&argh.Ident{Literal: "feral"},
-					},
-				},
-			},
-		},
-		{
-			name: "long value-less flags",
-			args: []string{"pizzas", "--tasty", "--fresh", "--super-hot-right-now"},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "tasty"},
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "fresh"},
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "super-hot-right-now"},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.Flag{Name: "tasty"},
-						&argh.Flag{Name: "fresh"},
-						&argh.Flag{Name: "super-hot-right-now"},
-					},
-				},
-			},
-		},
-		{
-			name: "long flags mixed",
-			args: []string{
-				"pizzas",
-				"--tasty",
-				"--fresh", "soon",
-				"--super-hot-right-now",
-				"--box", "square", "shaped", "hot",
-				"--please",
-			},
-			cfg: &argh.ParserConfig{
-				Prog: argh.CommandConfig{
-					Commands: map[string]argh.CommandConfig{},
-					Flags: map[string]argh.FlagConfig{
-						"fresh": argh.FlagConfig{NValue: 1},
-						"box":   argh.FlagConfig{NValue: argh.OneOrMoreValue},
-					},
-				},
-			},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "tasty"},
-						&argh.ArgDelimiter{},
-						&argh.Flag{
-							Name:   "fresh",
-							Values: map[string]string{"0": "soon"},
-							Nodes: []argh.Node{
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "soon"},
-							},
-						},
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "super-hot-right-now"},
-						&argh.ArgDelimiter{},
-						&argh.Flag{
-							Name:   "box",
-							Values: map[string]string{"0": "square", "1": "shaped", "2": "hot"},
-							Nodes: []argh.Node{
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "square"},
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "shaped"},
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "hot"},
-								&argh.ArgDelimiter{},
-							},
-						},
-						&argh.Flag{Name: "please"},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.Flag{Name: "tasty"},
-						&argh.Flag{
-							Name:   "fresh",
-							Values: map[string]string{"0": "soon"},
-							Nodes: []argh.Node{
-								&argh.Ident{Literal: "soon"},
-							},
-						},
-						&argh.Flag{Name: "super-hot-right-now"},
-						&argh.Flag{
-							Name:   "box",
-							Values: map[string]string{"0": "square", "1": "shaped", "2": "hot"},
-							Nodes: []argh.Node{
-								&argh.Ident{Literal: "square"},
-								&argh.Ident{Literal: "shaped"},
-								&argh.Ident{Literal: "hot"},
-							},
-						},
-						&argh.Flag{Name: "please"},
-					},
-				},
-			},
-		},
-		{
-			name: "short value-less flags",
-			args: []string{"pizzas", "-t", "-f", "-s"},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "t"},
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "f"},
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "s"},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.Flag{Name: "t"},
-						&argh.Flag{Name: "f"},
-						&argh.Flag{Name: "s"},
-					},
-				},
-			},
-		},
-		{
-			name: "compound short flags",
-			args: []string{"pizzas", "-aca", "-blol"},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.CompoundShortFlag{
-							Nodes: []argh.Node{
-								&argh.Flag{Name: "a"},
-								&argh.Flag{Name: "c"},
-								&argh.Flag{Name: "a"},
-							},
-						},
-						&argh.ArgDelimiter{},
-						&argh.CompoundShortFlag{
-							Nodes: []argh.Node{
-								&argh.Flag{Name: "b"},
-								&argh.Flag{Name: "l"},
-								&argh.Flag{Name: "o"},
-								&argh.Flag{Name: "l"},
-							},
-						},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.Flag{Name: "a"},
-						&argh.Flag{Name: "c"},
-						&argh.Flag{Name: "a"},
-						&argh.Flag{Name: "b"},
-						&argh.Flag{Name: "l"},
-						&argh.Flag{Name: "o"},
-						&argh.Flag{Name: "l"},
-					},
-				},
-			},
-		},
-		{
-			name: "mixed long short value flags",
-			args: []string{"pizzas", "-a", "--ca", "-b", "1312", "-lol"},
-			cfg: &argh.ParserConfig{
-				Prog: argh.CommandConfig{
-					Commands: map[string]argh.CommandConfig{},
-					Flags: map[string]argh.FlagConfig{
-						"b": argh.FlagConfig{NValue: 1},
-					},
-				},
-			},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "a"},
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "ca"},
-						&argh.ArgDelimiter{},
-						&argh.Flag{
-							Name:   "b",
-							Values: map[string]string{"0": "1312"},
-							Nodes: []argh.Node{
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "1312"},
-							},
-						},
-						&argh.ArgDelimiter{},
-						&argh.CompoundShortFlag{
-							Nodes: []argh.Node{
-								&argh.Flag{Name: "l"},
-								&argh.Flag{Name: "o"},
-								&argh.Flag{Name: "l"},
-							},
-						},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.Flag{Name: "a"},
-						&argh.Flag{Name: "ca"},
-						&argh.Flag{
-							Name:   "b",
-							Values: map[string]string{"0": "1312"},
-							Nodes: []argh.Node{
-								&argh.Ident{Literal: "1312"},
-							},
-						},
-						&argh.Flag{Name: "l"},
-						&argh.Flag{Name: "o"},
-						&argh.Flag{Name: "l"},
-					},
-				},
-			},
-		},
-		{
-			name: "nested commands with positional args",
-			args: []string{"pizzas", "fly", "freely", "sometimes", "and", "other", "times", "fry", "deeply", "--forever"},
-			cfg: &argh.ParserConfig{
-				Prog: argh.CommandConfig{
-					Commands: map[string]argh.CommandConfig{
-						"fly": argh.CommandConfig{
-							Commands: map[string]argh.CommandConfig{
-								"fry": argh.CommandConfig{},
-							},
-						},
-					},
-					Flags: map[string]argh.FlagConfig{},
-				},
-			},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.Command{
-							Name: "fly",
-							Nodes: []argh.Node{
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "freely"},
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "sometimes"},
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "and"},
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "other"},
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "times"},
-								&argh.ArgDelimiter{},
-								&argh.Command{
-									Name: "fry",
-									Nodes: []argh.Node{
-										&argh.ArgDelimiter{},
-										&argh.Ident{Literal: "deeply"},
-										&argh.ArgDelimiter{},
-										&argh.Flag{Name: "forever"},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.Command{
-							Name: "fly",
-							Nodes: []argh.Node{
-								&argh.Ident{Literal: "freely"},
-								&argh.Ident{Literal: "sometimes"},
-								&argh.Ident{Literal: "and"},
-								&argh.Ident{Literal: "other"},
-								&argh.Ident{Literal: "times"},
-								&argh.Command{
-									Name: "fry",
-									Nodes: []argh.Node{
-										&argh.Ident{Literal: "deeply"},
-										&argh.Flag{Name: "forever"},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "compound flags with values",
-			args: []string{"pizzas", "-need", "sauce", "heat", "love", "-also", "over9000"},
-			cfg: &argh.ParserConfig{
-				Prog: argh.CommandConfig{
-					Flags: map[string]argh.FlagConfig{
-						"a": {NValue: argh.ZeroOrMoreValue},
-						"d": {NValue: argh.OneOrMoreValue},
-						"e": {},
-						"l": {},
-						"n": {},
-						"o": {NValue: 1, ValueNames: []string{"level"}},
-						"s": {NValue: argh.ZeroOrMoreValue},
-					},
-				},
-			},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.CompoundShortFlag{
-							Nodes: []argh.Node{
-								&argh.Flag{Name: "n"},
-								&argh.Flag{Name: "e"},
-								&argh.Flag{Name: "e"},
-								&argh.Flag{
-									Name: "d",
-									Values: map[string]string{
-										"0": "sauce",
-										"1": "heat",
-										"2": "love",
-									},
-									Nodes: []argh.Node{
-										&argh.ArgDelimiter{},
-										&argh.Ident{Literal: "sauce"},
-										&argh.ArgDelimiter{},
-										&argh.Ident{Literal: "heat"},
-										&argh.ArgDelimiter{},
-										&argh.Ident{Literal: "love"},
-										&argh.ArgDelimiter{},
-									},
-								},
-							},
-						},
-						&argh.CompoundShortFlag{
-							Nodes: []argh.Node{
-								&argh.Flag{Name: "a"},
-								&argh.Flag{Name: "l"},
-								&argh.Flag{Name: "s"},
-								&argh.Flag{
-									Name: "o",
-									Values: map[string]string{
-										"level": "over9000",
-									},
-									Nodes: []argh.Node{
-										&argh.ArgDelimiter{},
-										&argh.Ident{Literal: "over9000"},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.Flag{Name: "n"},
-						&argh.Flag{Name: "e"},
-						&argh.Flag{Name: "e"},
-						&argh.Flag{
-							Name: "d",
-							Values: map[string]string{
-								"0": "sauce",
-								"1": "heat",
-								"2": "love",
-							},
-							Nodes: []argh.Node{
-								&argh.Ident{Literal: "sauce"},
-								&argh.Ident{Literal: "heat"},
-								&argh.Ident{Literal: "love"},
-							},
-						},
-						&argh.Flag{Name: "a"},
-						&argh.Flag{Name: "l"},
-						&argh.Flag{Name: "s"},
-						&argh.Flag{
-							Name: "o",
-							Values: map[string]string{
-								"level": "over9000",
-							},
-							Nodes: []argh.Node{
-								&argh.Ident{Literal: "over9000"},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "command specific flags",
-			args: []string{"pizzas", "fly", "--freely", "fry", "--deeply", "-wAt", "hugs"},
-			cfg: &argh.ParserConfig{
-				Prog: argh.CommandConfig{
-					Commands: map[string]argh.CommandConfig{
-						"fly": argh.CommandConfig{
-							Flags: map[string]argh.FlagConfig{
-								"freely": {},
-							},
-							Commands: map[string]argh.CommandConfig{
-								"fry": argh.CommandConfig{
-									Flags: map[string]argh.FlagConfig{
-										"deeply": {},
-										"w":      {},
-										"A":      {},
-										"t":      argh.FlagConfig{NValue: 1},
-									},
-								},
-							},
-						},
-					},
-					Flags: map[string]argh.FlagConfig{},
-				},
-			},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.Command{
-							Name: "fly",
-							Nodes: []argh.Node{
-								&argh.ArgDelimiter{},
-								&argh.Flag{Name: "freely"},
-								&argh.ArgDelimiter{},
-								&argh.Command{
-									Name: "fry",
-									Nodes: []argh.Node{
-										&argh.ArgDelimiter{},
-										&argh.Flag{Name: "deeply"},
-										&argh.ArgDelimiter{},
-										&argh.CompoundShortFlag{
-											Nodes: []argh.Node{
-												&argh.Flag{Name: "w"},
-												&argh.Flag{Name: "A"},
-												&argh.Flag{
-													Name:   "t",
-													Values: map[string]string{"0": "hugs"},
-													Nodes: []argh.Node{
-														&argh.ArgDelimiter{},
-														&argh.Ident{Literal: "hugs"},
-													},
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			expAST: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.Command{
-							Name: "fly",
-							Nodes: []argh.Node{
-								&argh.Flag{Name: "freely"},
-								&argh.Command{
-									Name: "fry",
-									Nodes: []argh.Node{
-										&argh.Flag{Name: "deeply"},
-										&argh.Flag{Name: "w"},
-										&argh.Flag{Name: "A"},
-										&argh.Flag{
-											Name:   "t",
-											Values: map[string]string{"0": "hugs"},
-											Nodes: []argh.Node{
-												&argh.Ident{Literal: "hugs"},
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "total weirdo",
-			args: []string{"PIZZAs", "^wAT@golf", "^^hecKing", "goose", "bonk", "^^FIERCENESS@-2"},
-			cfg: &argh.ParserConfig{
-				Prog: argh.CommandConfig{
-					Commands: map[string]argh.CommandConfig{
-						"goose": argh.CommandConfig{
-							NValue: 1,
-							Flags: map[string]argh.FlagConfig{
-								"FIERCENESS": argh.FlagConfig{NValue: 1},
-							},
-						},
-					},
-					Flags: map[string]argh.FlagConfig{
-						"w":       argh.FlagConfig{},
-						"A":       argh.FlagConfig{},
-						"T":       argh.FlagConfig{NValue: 1},
-						"hecking": argh.FlagConfig{},
-					},
-				},
-				ScannerConfig: &argh.ScannerConfig{
-					AssignmentOperator: '@',
-					FlagPrefix:         '^',
-					MultiValueDelim:    ',',
-				},
-			},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "PIZZAs",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.CompoundShortFlag{
-							Nodes: []argh.Node{
-								&argh.Flag{Name: "w"},
-								&argh.Flag{Name: "A"},
-								&argh.Flag{
-									Name:   "T",
-									Values: map[string]string{"0": "golf"},
-									Nodes: []argh.Node{
-										&argh.Assign{},
-										&argh.Ident{Literal: "golf"},
-									},
-								},
-							},
-						},
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "hecKing"},
-						&argh.ArgDelimiter{},
-						&argh.Command{
-							Name:   "goose",
-							Values: map[string]string{"0": "bonk"},
-							Nodes: []argh.Node{
-								&argh.ArgDelimiter{},
-								&argh.Ident{Literal: "bonk"},
-								&argh.ArgDelimiter{},
-								&argh.Flag{
-									Name:   "FIERCENESS",
-									Values: map[string]string{"0": "-2"},
-									Nodes: []argh.Node{
-										&argh.Assign{},
-										&argh.Ident{Literal: "-2"},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "invalid bare assignment",
-			args: []string{"pizzas", "=", "--wat"},
-			expErr: argh.ScannerErrorList{
-				&argh.ScannerError{Pos: argh.Position{Column: 8}, Msg: "invalid bare assignment"},
-			},
-			expPT: []argh.Node{
-				&argh.Command{
-					Name: "pizzas",
-					Nodes: []argh.Node{
-						&argh.ArgDelimiter{},
-						&argh.ArgDelimiter{},
-						&argh.Flag{Name: "wat"},
-					},
-				},
-			},
-		},
-	} {
-		if tc.expPT != nil {
-			t.Run(tc.name+" parse tree", func(ct *testing.T) {
-				if tc.skip {
-					ct.SkipNow()
-					return
-				}
-
-				pt, err := argh.ParseArgs2(tc.args, tc.cfg)
-				if err != nil || tc.expErr != nil {
-					if !assert.ErrorIs(ct, err, tc.expErr) {
-						spew.Dump(err, tc.expErr)
-						spew.Dump(pt)
-					}
-					return
-				}
-
-				if !assert.Equal(ct, tc.expPT, pt.Nodes) {
-					spew.Dump(pt)
-				}
-			})
-		}
-
-		if tc.expAST != nil {
-			t.Run(tc.name+" ast", func(ct *testing.T) {
-				if tc.skip {
-					ct.SkipNow()
-					return
-				}
-
-				pt, err := argh.ParseArgs2(tc.args, tc.cfg)
-				if err != nil || tc.expErr != nil {
-					if !assert.ErrorIs(ct, err, tc.expErr) {
-						spew.Dump(pt)
-					}
-					return
-				}
-
-				ast := argh.NewQuerier(pt.Nodes).AST()
-
-				if !assert.Equal(ct, tc.expAST, ast) {
-					spew.Dump(ast)
-				}
-			})
-		}
-	}
-}

argh/parser_test.go

@@ -4,27 +4,96 @@ import (
 	"testing"
 
 	"git.meatballhat.com/x/box-o-sand/argh"
+	"github.com/davecgh/go-spew/spew"
 	"github.com/stretchr/testify/assert"
 )
 
-func TestParser(t *testing.T) {
+func TestParser2(t *testing.T) {
 	for _, tc := range []struct {
 		name   string
 		args   []string
 		cfg    *argh.ParserConfig
+		expErr error
 		expPT  []argh.Node
 		expAST []argh.Node
-		expErr error
 		skip   bool
 	}{
+		{
+			name: "basic",
+			args: []string{
+				"pies", "-eat", "--wat", "hello", "mario",
+			},
+			cfg: &argh.ParserConfig{
+				Prog: argh.CommandConfig{
+					Commands: map[string]argh.CommandConfig{
+						"hello": argh.CommandConfig{
+							NValue:     1,
+							ValueNames: []string{"name"},
+						},
+					},
+				},
+			},
+			expPT: []argh.Node{
+				&argh.Command{
+					Name: "pies",
+					Nodes: []argh.Node{
+						&argh.ArgDelimiter{},
+						&argh.CompoundShortFlag{
+							Nodes: []argh.Node{
+								&argh.Flag{Name: "e"},
+								&argh.Flag{Name: "a"},
+								&argh.Flag{Name: "t"},
+							},
+						},
+						&argh.ArgDelimiter{},
+						&argh.Flag{Name: "wat"},
+						&argh.ArgDelimiter{},
+						&argh.Command{
+							Name: "hello",
+							Values: map[string]string{
+								"name": "mario",
+							},
+							Nodes: []argh.Node{
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "mario"},
+							},
+						},
+					},
+				},
+			},
+			expAST: []argh.Node{
+				&argh.Command{
+					Name: "pies",
+					Nodes: []argh.Node{
+						&argh.Flag{Name: "e"},
+						&argh.Flag{Name: "a"},
+						&argh.Flag{Name: "t"},
+						&argh.Flag{Name: "wat"},
+						&argh.Command{
+							Name: "hello",
+							Values: map[string]string{
+								"name": "mario",
+							},
+							Nodes: []argh.Node{
+								&argh.Ident{Literal: "mario"},
+							},
+						},
+					},
+				},
+			},
+		},
 		{
 			name: "bare",
 			args: []string{"pizzas"},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
+					Name: "pizzas",
+				},
 			},
 			expAST: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
+					Name: "pizzas",
+				},
 			},
 		},
 		{
@@ -34,42 +103,98 @@ func TestParser(t *testing.T) {
 				Prog: argh.CommandConfig{NValue: 1},
 			},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas", Values: map[string]string{"0": "excel"}},
+				&argh.Command{
+					Name:   "pizzas",
+					Values: map[string]string{"0": "excel"},
+					Nodes: []argh.Node{
+						&argh.ArgDelimiter{},
+						&argh.Ident{Literal: "excel"},
+					},
+				},
 			},
 			expAST: []argh.Node{
-				argh.Command{Name: "pizzas", Values: map[string]string{"0": "excel"}},
+				&argh.Command{
+					Name:   "pizzas",
+					Values: map[string]string{"0": "excel"},
+					Nodes: []argh.Node{
+						&argh.Ident{Literal: "excel"},
+					},
+				},
 			},
 		},
 		{
 			name: "many positional args",
 			args: []string{"pizzas", "excel", "wildly", "when", "feral"},
 			cfg: &argh.ParserConfig{
-				Prog: argh.CommandConfig{NValue: argh.OneOrMoreValue},
+				Prog: argh.CommandConfig{
+					NValue:     argh.OneOrMoreValue,
+					ValueNames: []string{"word"},
+				},
 			},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas", Values: map[string]string{"0": "excel", "1": "wildly", "2": "when", "3": "feral"}},
+				&argh.Command{
+					Name: "pizzas",
+					Values: map[string]string{
+						"word":   "excel",
+						"word.1": "wildly",
+						"word.2": "when",
+						"word.3": "feral",
+					},
+					Nodes: []argh.Node{
+						&argh.ArgDelimiter{},
+						&argh.Ident{Literal: "excel"},
+						&argh.ArgDelimiter{},
+						&argh.Ident{Literal: "wildly"},
+						&argh.ArgDelimiter{},
+						&argh.Ident{Literal: "when"},
+						&argh.ArgDelimiter{},
+						&argh.Ident{Literal: "feral"},
+					},
+				},
 			},
 			expAST: []argh.Node{
-				argh.Command{Name: "pizzas", Values: map[string]string{"0": "excel", "1": "wildly", "2": "when", "3": "feral"}},
+				&argh.Command{
+					Name: "pizzas",
+					Values: map[string]string{
+						"word":   "excel",
+						"word.1": "wildly",
+						"word.2": "when",
+						"word.3": "feral",
+					},
+					Nodes: []argh.Node{
+						&argh.Ident{Literal: "excel"},
+						&argh.Ident{Literal: "wildly"},
+						&argh.Ident{Literal: "when"},
+						&argh.Ident{Literal: "feral"},
+					},
+				},
 			},
 		},
 		{
 			name: "long value-less flags",
 			args: []string{"pizzas", "--tasty", "--fresh", "--super-hot-right-now"},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.ArgDelimiter{},
+					Name: "pizzas",
-				argh.Flag{Name: "tasty"},
+					Nodes: []argh.Node{
-				argh.ArgDelimiter{},
+						&argh.ArgDelimiter{},
-				argh.Flag{Name: "fresh"},
+						&argh.Flag{Name: "tasty"},
-				argh.ArgDelimiter{},
+						&argh.ArgDelimiter{},
-				argh.Flag{Name: "super-hot-right-now"},
+						&argh.Flag{Name: "fresh"},
+						&argh.ArgDelimiter{},
+						&argh.Flag{Name: "super-hot-right-now"},
+					},
+				},
 			},
 			expAST: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.Flag{Name: "tasty"},
+					Name: "pizzas",
-				argh.Flag{Name: "fresh"},
+					Nodes: []argh.Node{
-				argh.Flag{Name: "super-hot-right-now"},
+						&argh.Flag{Name: "tasty"},
+						&argh.Flag{Name: "fresh"},
+						&argh.Flag{Name: "super-hot-right-now"},
+					},
+				},
 			},
 		},
 		{
@@ -92,78 +217,134 @@ func TestParser(t *testing.T) {
 				},
 			},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.ArgDelimiter{},
+					Name: "pizzas",
-				argh.Flag{Name: "tasty"},
+					Nodes: []argh.Node{
-				argh.ArgDelimiter{},
+						&argh.ArgDelimiter{},
-				argh.Flag{Name: "fresh", Values: map[string]string{"0": "soon"}},
+						&argh.Flag{Name: "tasty"},
-				argh.ArgDelimiter{},
+						&argh.ArgDelimiter{},
-				argh.Flag{Name: "super-hot-right-now"},
+						&argh.Flag{
-				argh.ArgDelimiter{},
+							Name:   "fresh",
-				argh.Flag{Name: "box", Values: map[string]string{"0": "square", "1": "shaped", "2": "hot"}},
+							Values: map[string]string{"0": "soon"},
-				argh.ArgDelimiter{},
+							Nodes: []argh.Node{
-				argh.Flag{Name: "please"},
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "soon"},
+							},
+						},
+						&argh.ArgDelimiter{},
+						&argh.Flag{Name: "super-hot-right-now"},
+						&argh.ArgDelimiter{},
+						&argh.Flag{
+							Name:   "box",
+							Values: map[string]string{"0": "square", "1": "shaped", "2": "hot"},
+							Nodes: []argh.Node{
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "square"},
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "shaped"},
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "hot"},
+								&argh.ArgDelimiter{},
+							},
+						},
+						&argh.Flag{Name: "please"},
+					},
+				},
 			},
 			expAST: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.Flag{Name: "tasty"},
+					Name: "pizzas",
-				argh.Flag{Name: "fresh", Values: map[string]string{"0": "soon"}},
+					Nodes: []argh.Node{
-				argh.Flag{Name: "super-hot-right-now"},
+						&argh.Flag{Name: "tasty"},
-				argh.Flag{Name: "box", Values: map[string]string{"0": "square", "1": "shaped", "2": "hot"}},
+						&argh.Flag{
-				argh.Flag{Name: "please"},
+							Name:   "fresh",
+							Values: map[string]string{"0": "soon"},
+							Nodes: []argh.Node{
+								&argh.Ident{Literal: "soon"},
+							},
+						},
+						&argh.Flag{Name: "super-hot-right-now"},
+						&argh.Flag{
+							Name:   "box",
+							Values: map[string]string{"0": "square", "1": "shaped", "2": "hot"},
+							Nodes: []argh.Node{
+								&argh.Ident{Literal: "square"},
+								&argh.Ident{Literal: "shaped"},
+								&argh.Ident{Literal: "hot"},
+							},
+						},
+						&argh.Flag{Name: "please"},
+					},
+				},
 			},
 		},
 		{
 			name: "short value-less flags",
 			args: []string{"pizzas", "-t", "-f", "-s"},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.ArgDelimiter{},
+					Name: "pizzas",
-				argh.Flag{Name: "t"},
+					Nodes: []argh.Node{
-				argh.ArgDelimiter{},
+						&argh.ArgDelimiter{},
-				argh.Flag{Name: "f"},
+						&argh.Flag{Name: "t"},
-				argh.ArgDelimiter{},
+						&argh.ArgDelimiter{},
-				argh.Flag{Name: "s"},
+						&argh.Flag{Name: "f"},
+						&argh.ArgDelimiter{},
+						&argh.Flag{Name: "s"},
+					},
+				},
 			},
 			expAST: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.Flag{Name: "t"},
+					Name: "pizzas",
-				argh.Flag{Name: "f"},
+					Nodes: []argh.Node{
-				argh.Flag{Name: "s"},
+						&argh.Flag{Name: "t"},
+						&argh.Flag{Name: "f"},
+						&argh.Flag{Name: "s"},
+					},
+				},
 			},
 		},
 		{
 			name: "compound short flags",
 			args: []string{"pizzas", "-aca", "-blol"},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.ArgDelimiter{},
+					Name: "pizzas",
-				argh.CompoundShortFlag{
 					Nodes: []argh.Node{
-						argh.Flag{Name: "a"},
+						&argh.ArgDelimiter{},
-						argh.Flag{Name: "c"},
+						&argh.CompoundShortFlag{
-						argh.Flag{Name: "a"},
+							Nodes: []argh.Node{
-					},
+								&argh.Flag{Name: "a"},
-				},
+								&argh.Flag{Name: "c"},
-				argh.ArgDelimiter{},
+								&argh.Flag{Name: "a"},
-				argh.CompoundShortFlag{
+							},
-					Nodes: []argh.Node{
+						},
-						argh.Flag{Name: "b"},
+						&argh.ArgDelimiter{},
-						argh.Flag{Name: "l"},
+						&argh.CompoundShortFlag{
-						argh.Flag{Name: "o"},
+							Nodes: []argh.Node{
-						argh.Flag{Name: "l"},
+								&argh.Flag{Name: "b"},
+								&argh.Flag{Name: "l"},
+								&argh.Flag{Name: "o"},
+								&argh.Flag{Name: "l"},
+							},
+						},
 					},
 				},
 			},
 			expAST: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.Flag{Name: "a"},
+					Name: "pizzas",
-				argh.Flag{Name: "c"},
+					Nodes: []argh.Node{
-				argh.Flag{Name: "a"},
+						&argh.Flag{Name: "a"},
-				argh.Flag{Name: "b"},
+						&argh.Flag{Name: "c"},
-				argh.Flag{Name: "l"},
+						&argh.Flag{Name: "a"},
-				argh.Flag{Name: "o"},
+						&argh.Flag{Name: "b"},
-				argh.Flag{Name: "l"},
+						&argh.Flag{Name: "l"},
+						&argh.Flag{Name: "o"},
+						&argh.Flag{Name: "l"},
+					},
+				},
 			},
 		},
 		{
@@ -178,55 +359,230 @@ func TestParser(t *testing.T) {
 				},
 			},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.ArgDelimiter{},
+					Name: "pizzas",
-				argh.Flag{Name: "a"},
-				argh.ArgDelimiter{},
-				argh.Flag{Name: "ca"},
-				argh.ArgDelimiter{},
-				argh.Flag{Name: "b", Values: map[string]string{"0": "1312"}},
-				argh.ArgDelimiter{},
-				argh.CompoundShortFlag{
 					Nodes: []argh.Node{
-						argh.Flag{Name: "l"},
+						&argh.ArgDelimiter{},
-						argh.Flag{Name: "o"},
+						&argh.Flag{Name: "a"},
-						argh.Flag{Name: "l"},
+						&argh.ArgDelimiter{},
+						&argh.Flag{Name: "ca"},
+						&argh.ArgDelimiter{},
+						&argh.Flag{
+							Name:   "b",
+							Values: map[string]string{"0": "1312"},
+							Nodes: []argh.Node{
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "1312"},
+							},
+						},
+						&argh.ArgDelimiter{},
+						&argh.CompoundShortFlag{
+							Nodes: []argh.Node{
+								&argh.Flag{Name: "l"},
+								&argh.Flag{Name: "o"},
+								&argh.Flag{Name: "l"},
+							},
+						},
 					},
 				},
 			},
 			expAST: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.Flag{Name: "a"},
+					Name: "pizzas",
-				argh.Flag{Name: "ca"},
+					Nodes: []argh.Node{
-				argh.Flag{Name: "b", Values: map[string]string{"0": "1312"}},
+						&argh.Flag{Name: "a"},
-				argh.Flag{Name: "l"},
+						&argh.Flag{Name: "ca"},
-				argh.Flag{Name: "o"},
+						&argh.Flag{
-				argh.Flag{Name: "l"},
+							Name:   "b",
+							Values: map[string]string{"0": "1312"},
+							Nodes: []argh.Node{
+								&argh.Ident{Literal: "1312"},
+							},
+						},
+						&argh.Flag{Name: "l"},
+						&argh.Flag{Name: "o"},
+						&argh.Flag{Name: "l"},
+					},
+				},
 			},
 		},
 		{
-			name: "commands",
+			name: "nested commands with positional args",
-			args: []string{"pizzas", "fly", "fry"},
+			args: []string{"pizzas", "fly", "freely", "sometimes", "and", "other", "times", "fry", "deeply", "--forever"},
 			cfg: &argh.ParserConfig{
 				Prog: argh.CommandConfig{
 					Commands: map[string]argh.CommandConfig{
-						"fly": argh.CommandConfig{},
+						"fly": argh.CommandConfig{
-						"fry": argh.CommandConfig{},
+							Commands: map[string]argh.CommandConfig{
+								"fry": argh.CommandConfig{},
+							},
+						},
 					},
 					Flags: map[string]argh.FlagConfig{},
 				},
 			},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.ArgDelimiter{},
+					Name: "pizzas",
-				argh.Command{Name: "fly"},
+					Nodes: []argh.Node{
-				argh.ArgDelimiter{},
+						&argh.ArgDelimiter{},
-				argh.Command{Name: "fry"},
+						&argh.Command{
+							Name: "fly",
+							Nodes: []argh.Node{
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "freely"},
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "sometimes"},
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "and"},
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "other"},
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "times"},
+								&argh.ArgDelimiter{},
+								&argh.Command{
+									Name: "fry",
+									Nodes: []argh.Node{
+										&argh.ArgDelimiter{},
+										&argh.Ident{Literal: "deeply"},
+										&argh.ArgDelimiter{},
+										&argh.Flag{Name: "forever"},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			expAST: []argh.Node{
+				&argh.Command{
+					Name: "pizzas",
+					Nodes: []argh.Node{
+						&argh.Command{
+							Name: "fly",
+							Nodes: []argh.Node{
+								&argh.Ident{Literal: "freely"},
+								&argh.Ident{Literal: "sometimes"},
+								&argh.Ident{Literal: "and"},
+								&argh.Ident{Literal: "other"},
+								&argh.Ident{Literal: "times"},
+								&argh.Command{
+									Name: "fry",
+									Nodes: []argh.Node{
+										&argh.Ident{Literal: "deeply"},
+										&argh.Flag{Name: "forever"},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "compound flags with values",
+			args: []string{"pizzas", "-need", "sauce", "heat", "love", "-also", "over9000"},
+			cfg: &argh.ParserConfig{
+				Prog: argh.CommandConfig{
+					Flags: map[string]argh.FlagConfig{
+						"a": {NValue: argh.ZeroOrMoreValue},
+						"d": {NValue: argh.OneOrMoreValue},
+						"e": {},
+						"l": {},
+						"n": {},
+						"o": {NValue: 1, ValueNames: []string{"level"}},
+						"s": {NValue: argh.ZeroOrMoreValue},
+					},
+				},
+			},
+			expPT: []argh.Node{
+				&argh.Command{
+					Name: "pizzas",
+					Nodes: []argh.Node{
+						&argh.ArgDelimiter{},
+						&argh.CompoundShortFlag{
+							Nodes: []argh.Node{
+								&argh.Flag{Name: "n"},
+								&argh.Flag{Name: "e"},
+								&argh.Flag{Name: "e"},
+								&argh.Flag{
+									Name: "d",
+									Values: map[string]string{
+										"0": "sauce",
+										"1": "heat",
+										"2": "love",
+									},
+									Nodes: []argh.Node{
+										&argh.ArgDelimiter{},
+										&argh.Ident{Literal: "sauce"},
+										&argh.ArgDelimiter{},
+										&argh.Ident{Literal: "heat"},
+										&argh.ArgDelimiter{},
+										&argh.Ident{Literal: "love"},
+										&argh.ArgDelimiter{},
+									},
+								},
+							},
+						},
+						&argh.CompoundShortFlag{
+							Nodes: []argh.Node{
+								&argh.Flag{Name: "a"},
+								&argh.Flag{Name: "l"},
+								&argh.Flag{Name: "s"},
+								&argh.Flag{
+									Name: "o",
+									Values: map[string]string{
+										"level": "over9000",
+									},
+									Nodes: []argh.Node{
+										&argh.ArgDelimiter{},
+										&argh.Ident{Literal: "over9000"},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			expAST: []argh.Node{
+				&argh.Command{
+					Name: "pizzas",
+					Nodes: []argh.Node{
+						&argh.Flag{Name: "n"},
+						&argh.Flag{Name: "e"},
+						&argh.Flag{Name: "e"},
+						&argh.Flag{
+							Name: "d",
+							Values: map[string]string{
+								"0": "sauce",
+								"1": "heat",
+								"2": "love",
+							},
+							Nodes: []argh.Node{
+								&argh.Ident{Literal: "sauce"},
+								&argh.Ident{Literal: "heat"},
+								&argh.Ident{Literal: "love"},
+							},
+						},
+						&argh.Flag{Name: "a"},
+						&argh.Flag{Name: "l"},
+						&argh.Flag{Name: "s"},
+						&argh.Flag{
+							Name: "o",
+							Values: map[string]string{
+								"level": "over9000",
+							},
+							Nodes: []argh.Node{
+								&argh.Ident{Literal: "over9000"},
+							},
+						},
+					},
+				},
 			},
 		},
 		{
 			name: "command specific flags",
-			args: []string{"pizzas", "fly", "--freely", "fry", "--deeply", "-wAt"},
+			args: []string{"pizzas", "fly", "--freely", "fry", "--deeply", "-wAt", "hugs"},
 			cfg: &argh.ParserConfig{
 				Prog: argh.CommandConfig{
 					Commands: map[string]argh.CommandConfig{
@@ -234,13 +590,15 @@ func TestParser(t *testing.T) {
 							Flags: map[string]argh.FlagConfig{
 								"freely": {},
 							},
-						},
+							Commands: map[string]argh.CommandConfig{
-						"fry": argh.CommandConfig{
+								"fry": argh.CommandConfig{
-							Flags: map[string]argh.FlagConfig{
+									Flags: map[string]argh.FlagConfig{
-								"deeply": {},
+										"deeply": {},
-								"w":      {},
+										"w":      {},
-								"A":      {},
+										"A":      {},
-								"t":      {},
+										"t":      argh.FlagConfig{NValue: 1},
+									},
+								},
 							},
 						},
 					},
@@ -248,21 +606,68 @@ func TestParser(t *testing.T) {
 				},
 			},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
-				argh.ArgDelimiter{},
+					Name: "pizzas",
-				argh.Command{Name: "fly"},
-				argh.ArgDelimiter{},
-				argh.Flag{Name: "freely"},
-				argh.ArgDelimiter{},
-				argh.Command{Name: "fry"},
-				argh.ArgDelimiter{},
-				argh.Flag{Name: "deeply"},
-				argh.ArgDelimiter{},
-				argh.CompoundShortFlag{
 					Nodes: []argh.Node{
-						argh.Flag{Name: "w"},
+						&argh.ArgDelimiter{},
-						argh.Flag{Name: "A"},
+						&argh.Command{
-						argh.Flag{Name: "t"},
+							Name: "fly",
+							Nodes: []argh.Node{
+								&argh.ArgDelimiter{},
+								&argh.Flag{Name: "freely"},
+								&argh.ArgDelimiter{},
+								&argh.Command{
+									Name: "fry",
+									Nodes: []argh.Node{
+										&argh.ArgDelimiter{},
+										&argh.Flag{Name: "deeply"},
+										&argh.ArgDelimiter{},
+										&argh.CompoundShortFlag{
+											Nodes: []argh.Node{
+												&argh.Flag{Name: "w"},
+												&argh.Flag{Name: "A"},
+												&argh.Flag{
+													Name:   "t",
+													Values: map[string]string{"0": "hugs"},
+													Nodes: []argh.Node{
+														&argh.ArgDelimiter{},
+														&argh.Ident{Literal: "hugs"},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			expAST: []argh.Node{
+				&argh.Command{
+					Name: "pizzas",
+					Nodes: []argh.Node{
+						&argh.Command{
+							Name: "fly",
+							Nodes: []argh.Node{
+								&argh.Flag{Name: "freely"},
+								&argh.Command{
+									Name: "fry",
+									Nodes: []argh.Node{
+										&argh.Flag{Name: "deeply"},
+										&argh.Flag{Name: "w"},
+										&argh.Flag{Name: "A"},
+										&argh.Flag{
+											Name:   "t",
+											Values: map[string]string{"0": "hugs"},
+											Nodes: []argh.Node{
+												&argh.Ident{Literal: "hugs"},
+											},
+										},
+									},
+								},
+							},
+						},
 					},
 				},
 			},
@@ -273,14 +678,18 @@ func TestParser(t *testing.T) {
 			cfg: &argh.ParserConfig{
 				Prog: argh.CommandConfig{
 					Commands: map[string]argh.CommandConfig{
-						"goose": argh.CommandConfig{NValue: 1},
+						"goose": argh.CommandConfig{
+							NValue: 1,
+							Flags: map[string]argh.FlagConfig{
+								"FIERCENESS": argh.FlagConfig{NValue: 1},
+							},
+						},
 					},
 					Flags: map[string]argh.FlagConfig{
-						"w":          argh.FlagConfig{},
+						"w":       argh.FlagConfig{},
-						"A":          argh.FlagConfig{},
+						"A":       argh.FlagConfig{},
-						"T":          argh.FlagConfig{NValue: 1},
+						"T":       argh.FlagConfig{NValue: 1},
-						"hecking":    argh.FlagConfig{},
+						"hecking": argh.FlagConfig{},
-						"FIERCENESS": argh.FlagConfig{NValue: 1},
 					},
 				},
 				ScannerConfig: &argh.ScannerConfig{
@@ -290,61 +699,109 @@ func TestParser(t *testing.T) {
 				},
 			},
 			expPT: []argh.Node{
-				argh.Command{Name: "PIZZAs"},
+				&argh.Command{
-				argh.ArgDelimiter{},
+					Name: "PIZZAs",
-				argh.CompoundShortFlag{
 					Nodes: []argh.Node{
-						argh.Flag{Name: "w"},
+						&argh.ArgDelimiter{},
-						argh.Flag{Name: "A"},
+						&argh.CompoundShortFlag{
-						argh.Flag{Name: "T", Values: map[string]string{"0": "golf"}},
+							Nodes: []argh.Node{
+								&argh.Flag{Name: "w"},
+								&argh.Flag{Name: "A"},
+								&argh.Flag{
+									Name:   "T",
+									Values: map[string]string{"0": "golf"},
+									Nodes: []argh.Node{
+										&argh.Assign{},
+										&argh.Ident{Literal: "golf"},
+									},
+								},
+							},
+						},
+						&argh.ArgDelimiter{},
+						&argh.Flag{Name: "hecKing"},
+						&argh.ArgDelimiter{},
+						&argh.Command{
+							Name:   "goose",
+							Values: map[string]string{"0": "bonk"},
+							Nodes: []argh.Node{
+								&argh.ArgDelimiter{},
+								&argh.Ident{Literal: "bonk"},
+								&argh.ArgDelimiter{},
+								&argh.Flag{
+									Name:   "FIERCENESS",
+									Values: map[string]string{"0": "-2"},
+									Nodes: []argh.Node{
+										&argh.Assign{},
+										&argh.Ident{Literal: "-2"},
+									},
+								},
+							},
+						},
 					},
 				},
-				argh.ArgDelimiter{},
-				argh.Flag{Name: "hecKing"},
-				argh.ArgDelimiter{},
-				argh.Command{Name: "goose", Values: map[string]string{"0": "bonk"}},
-				argh.ArgDelimiter{},
-				argh.Flag{Name: "FIERCENESS", Values: map[string]string{"0": "-2"}},
 			},
 		},
 		{
-			name:   "invalid bare assignment",
+			name: "invalid bare assignment",
-			args:   []string{"pizzas", "=", "--wat"},
+			args: []string{"pizzas", "=", "--wat"},
-			expErr: argh.ErrSyntax,
+			expErr: argh.ScannerErrorList{
+				&argh.ScannerError{Pos: argh.Position{Column: 8}, Msg: "invalid bare assignment"},
+			},
 			expPT: []argh.Node{
-				argh.Command{Name: "pizzas"},
+				&argh.Command{
+					Name: "pizzas",
+					Nodes: []argh.Node{
+						&argh.ArgDelimiter{},
+						&argh.ArgDelimiter{},
+						&argh.Flag{Name: "wat"},
+					},
+				},
 			},
 		},
-		{},
 	} {
-		if tc.skip {
-			continue
-		}
-
 		if tc.expPT != nil {
 			t.Run(tc.name+" parse tree", func(ct *testing.T) {
-				actual, err := argh.ParseArgs(tc.args, tc.cfg)
+				if tc.skip {
-				if err != nil {
+					ct.SkipNow()
-					assert.ErrorIs(ct, err, tc.expErr)
 					return
 				}
 
-				assert.Equal(ct, tc.expPT, actual.Nodes)
+				pt, err := argh.ParseArgs2(tc.args, tc.cfg)
+				if err != nil || tc.expErr != nil {
+					if !assert.ErrorIs(ct, err, tc.expErr) {
+						spew.Dump(err, tc.expErr)
+						spew.Dump(pt)
+					}
+					return
+				}
+
+				if !assert.Equal(ct, tc.expPT, pt.Nodes) {
+					spew.Dump(pt)
+				}
 			})
 		}
 
-		/*
+		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 {
-					actual, err := argh.ParseArgs(tc.args, tc.cfg)
+					ct.SkipNow()
-					if err != nil {
+					return
-						assert.ErrorIs(ct, err, tc.expErr)
+				}
-						return
-					}
 
-					assert.Equal(ct, tc.expAST, argh.NewQuerier(actual.Nodes).AST())
+				pt, err := argh.ParseArgs2(tc.args, tc.cfg)
-				})
+				if err != nil || tc.expErr != nil {
-			}
+					if !assert.ErrorIs(ct, err, tc.expErr) {
-		*/
+						spew.Dump(pt)
+					}
+					return
+				}
+
+				ast := argh.NewQuerier(pt.Nodes).AST()
+
+				if !assert.Equal(ct, tc.expAST, ast) {
+					spew.Dump(ast)
+				}
+			})
+		}
 	}
 }