Skip to content

use log for errors, handle invalid flags and explicitly print to stdout #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

use log for errors, handle invalid flags and explicitly print to stdout #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"bytes"
"encoding/json"
"flag"
"fmt"
"go/ast"
"go/format"
"go/parser"
"go/token"
"log"
"os"
)

Expand All @@ -28,6 +28,8 @@ var (
)

func main() {
log.SetPrefix("go-outline: ")
log.SetFlags(0)
flag.Parse()
fset := token.NewFileSet()
parserMode := parser.ParseComments
Expand All @@ -40,12 +42,18 @@ func main() {

if len(*src) > 0 {
fileAst, err = parser.ParseFile(fset, *file, *src, parserMode)
} else {
if err != nil {
log.Fatalf("could not parse source: %v", err)
}
} else if len(*file) > 0 {
fileAst, err = parser.ParseFile(fset, *file, nil, parserMode)
}

if err != nil {
reportError(fmt.Errorf("Could not parse file %s", *file))
if err != nil {
log.Fatalf("could not parse file with name %q: %v", *file, err)
}
} else {
log.Print("invalid usage: no source or file provided")
flag.PrintDefaults()
os.Exit(1)
}

declarations := []Declaration{}
Expand All @@ -55,7 +63,8 @@ func main() {
case *ast.FuncDecl:
receiverType, err := getReceiverType(fset, decl)
if err != nil {
reportError(fmt.Errorf("Failed to parse receiver type: %v", err))
log.Printf("failed to parse receiver type: %v", err)
continue
}
declarations = append(declarations, Declaration{
decl.Name.String(),
Expand Down Expand Up @@ -99,11 +108,11 @@ func main() {
})
}
default:
reportError(fmt.Errorf("Unknown token type: %s", decl.Tok))
log.Printf("unknown token type: %s", decl.Tok)
}
}
default:
reportError(fmt.Errorf("Unknown declaration @", decl.Pos()))
log.Printf("unknown declaration @%v", decl.Pos())
}
}

Expand All @@ -116,8 +125,7 @@ func main() {
declarations,
}}

str, _ := json.Marshal(pkg)
fmt.Println(string(str))
_ = json.NewEncoder(os.Stdout).Encode(pkg)

}

Expand All @@ -133,7 +141,3 @@ func getReceiverType(fset *token.FileSet, decl *ast.FuncDecl) (string, error) {

return buf.String(), nil
}

func reportError(err error) {
fmt.Fprintln(os.Stderr, "error:", err)
}