Modify the ParseArgs() signature

magodo · Mar 3, 2022 · 1b2b24c · 1b2b24c
1 parent aaa4e3c
commit 1b2b24c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/hclgrep/cmd.go b/hclgrep/cmd.go
@@ -64,13 +64,8 @@ func (o *strCmdFlag) Set(val string) error {
 	return nil
 }
 
-type prefixFlag struct {
-	val bool
-	set bool
-}
-
-func ParseArgs(args []string, eh flag.ErrorHandling) ([]Option, []string, error) {
-	flagSet := flag.NewFlagSet("hclgrep", eh)
+func ParseArgs(args []string) ([]Option, []string, error) {
+	flagSet := flag.NewFlagSet("hclgrep", flag.ContinueOnError)
 	flagSet.Usage = usage
 
 	var prefix bool

diff --git a/hclgrep/match.go b/hclgrep/match.go
@@ -15,7 +15,7 @@ import (
 )
 
 type Matcher struct {
-	Out io.Writer
+	out io.Writer
 
 	cmds []Cmd
 
@@ -35,8 +35,8 @@ func NewMatcher(opts ...Option) Matcher {
 	for _, opt := range opts {
 		opt(&m)
 	}
-	if m.Out == nil {
-		m.Out = os.Stdout
+	if m.out == nil {
+		m.out = os.Stdout
 	}
 	return m
 }
@@ -92,7 +92,7 @@ func (m *Matcher) File(fileName string, in io.Reader) error {
 			output = fmt.Sprintf("%s:\n%s", rng, output)
 		}
 
-		fmt.Fprintf(m.Out, "%s\n", output)
+		fmt.Fprintf(m.out, "%s\n", output)
 	}
 	return nil
 }
@@ -313,16 +313,16 @@ func (m *Matcher) cmdWrite(cmd Cmd, subs []submatch) []submatch {
 		}
 		switch {
 		case val.String != nil:
-			fmt.Fprintln(m.Out, *val.String)
+			fmt.Fprintln(m.out, *val.String)
 		case val.Node != nil:
-			fmt.Fprintln(m.Out, string(val.Node.Range().SliceBytes(m.b)))
+			fmt.Fprintln(m.out, string(val.Node.Range().SliceBytes(m.b)))
 		case val.ObjectConsItem != nil:
 		case val.Traverser != nil:
 			switch trav := (*val.Traverser).(type) {
 			case hcl.TraverseRoot:
-				fmt.Fprintln(m.Out, trav.Name)
+				fmt.Fprintln(m.out, trav.Name)
 			case hcl.TraverseAttr:
-				fmt.Fprintln(m.Out, trav.Name)
+				fmt.Fprintln(m.out, trav.Name)
 			default:
 				continue
 			}

diff --git a/hclgrep/match_test.go b/hclgrep/match_test.go
@@ -2,7 +2,6 @@ package hclgrep
 
 import (
 	"bytes"
-	"flag"
 	"fmt"
 	"io"
 	"testing"
@@ -1018,7 +1017,7 @@ func matchTest(t *testing.T, args []string, src string, anyWant interface{}) {
 	tfatalf := func(format string, a ...interface{}) {
 		t.Fatalf("%v | %s: %s", args, src, fmt.Sprintf(format, a...))
 	}
-	opts, _, err := ParseArgs(args, flag.ContinueOnError)
+	opts, _, err := ParseArgs(args)
 	switch want := anyWant.(type) {
 	case wantErr:
 		if err == nil {
@@ -1103,7 +1102,7 @@ func fileTest(t *testing.T, args []string, src string, anyWant interface{}) {
 	tfatalf := func(format string, a ...interface{}) {
 		t.Fatalf("%v | %s: %s", args, src, fmt.Sprintf(format, a...))
 	}
-	opts, _, err := ParseArgs(args, flag.ContinueOnError)
+	opts, _, err := ParseArgs(args)
 	switch want := anyWant.(type) {
 	case wantErr:
 		if err == nil {

diff --git a/hclgrep/option.go b/hclgrep/option.go
@@ -18,6 +18,6 @@ func OptionPrefixPosition(include bool) Option {
 
 func OptionOutput(o io.Writer) Option {
 	return func(m *Matcher) {
-		m.Out = o
+		m.out = o
 	}
 }
diff --git a/main.go b/main.go
@@ -1,15 +1,19 @@
 package main
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"github.com/magodo/hclgrep/hclgrep"
 	"os"
 )
 
 func main() {
-	opts, files, err := hclgrep.ParseArgs(os.Args[1:], flag.ExitOnError)
+	opts, files, err := hclgrep.ParseArgs(os.Args[1:])
 	if err != nil {
+		if errors.Is(err, flag.ErrHelp) {
+			os.Exit(0)
+		}
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}