Separate command and library

.gitignore

@@ -1,3 +1,4 @@
+/cmd/sqlfmt/sqlfmt
+/cmd/sqlfmt/tmp
 /y.output
-/sqlfmt
 /tmp

cmd/sqlfmt/main.go

@@ -0,0 +1,43 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"github.com/jackc/sqlfmt"
+	"io/ioutil"
+	"os"
+)
+
+const Version = "0.0.1"
+
+var options struct {
+	version bool
+}
+
+func main() {
+	flag.Usage = func() {
+		fmt.Fprintf(os.Stderr, "usage:  %s [options]\n", os.Args[0])
+		flag.PrintDefaults()
+	}
+
+	flag.BoolVar(&options.version, "version", false, "print version and exit")
+	flag.Parse()
+
+	if options.version {
+		fmt.Printf("sqlfmt v%v\n", Version)
+		os.Exit(0)
+	}
+
+	input, err := ioutil.ReadAll(os.Stdin)
+	if err != nil {
+		os.Exit(1)
+	}
+	lexer := sqlfmt.NewSqlLexer(string(input))
+	stmt, err := sqlfmt.Parse(lexer)
+	if err != nil {
+		os.Exit(1)
+	}
+
+	r := sqlfmt.NewTextRenderer(os.Stdout)
+	stmt.RenderTo(r)
+}

sqlfmt_test.go → cmd/sqlfmt/sqlfmt_test.go

@@ -416,13 +416,13 @@ func TestSqlFmt(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		input, err := ioutil.ReadFile(path.Join("testdata", tt.inputFile))
+		input, err := ioutil.ReadFile(path.Join("../../testdata", tt.inputFile))
 		if err != nil {
 			t.Errorf("%d. %v", i, err)
 			continue
 		}
 
-		expected, err := ioutil.ReadFile(path.Join("testdata", tt.expectedOutputFile))
+		expected, err := ioutil.ReadFile(path.Join("../../testdata", tt.expectedOutputFile))
 		if err != nil {
 			t.Errorf("%d. %v", i, err)
 			continue

kwlist.go

@@ -1,4 +1,4 @@
-package main
+package sqlfmt
 
 // Derived from PostgreSQL -- ./src/include/parser/kwlist.h
 

lex.go

@@ -1,4 +1,6 @@
-package main
+//go:generate -command yacc go tool yacc
+//go:generate yacc -o sql.go -p "sql" sql.y
+package sqlfmt
 
 import (
 	"log"

main.go → parsed_types.go

@@ -1,45 +1,15 @@
-//go:generate -command yacc go tool yacc
-//go:generate yacc -o sql.go -p "sql" sql.y
-package main
+package sqlfmt
 
 import (
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"os"
+	"errors"
 )
 
-const Version = "0.0.1"
-
-var options struct {
-	version bool
-}
-
-func main() {
-	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, "usage:  %s [options]\n", os.Args[0])
-		flag.PrintDefaults()
-	}
-
-	flag.BoolVar(&options.version, "version", false, "print version and exit")
-	flag.Parse()
-
-	if options.version {
-		fmt.Printf("sqlfmt v%v\n", Version)
-		os.Exit(0)
-	}
-
-	input, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		os.Exit(1)
-	}
-	lexer := NewSqlLexer(string(input))
+func Parse(lexer *sqlLex) (stmt *SelectStmt, err error) {
 	if rc := sqlParse(lexer); rc != 0 {
-		os.Exit(1)
+		return nil, errors.New("Parse failed")
 	}
 
-	r := NewTextRenderer(os.Stdout)
-	lexer.stmt.RenderTo(r)
+	return lexer.stmt, nil
 }
 
 type Expr interface {

renderer.go

@@ -1,4 +1,4 @@
-package main
+package sqlfmt
 
 import (
 	"io"

renderer_test.go

@@ -1,4 +1,4 @@
-package main
+package sqlfmt
 
 import (
 	"bytes"

sql.go

@@ -1,5 +1,5 @@
 //line sql.y:2
-package main
+package sqlfmt
 
 import __yyfmt__ "fmt"
 

sql.y

@@ -1,6 +1,6 @@
 %{
 
-package main
+package sqlfmt
 
 %}