fix dot imports

dataset.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	. "github.com/egonelbre/spexs2/search"
+	"github.com/egonelbre/spexs2/search"
 )
 
 type File struct {
@@ -27,8 +27,8 @@ func NewDataset() *Dataset {
 	return &Dataset{make(map[string][]int), make(map[string]File)}
 }
 
-func CreateDatabase(conf *Conf) (*Database, *Dataset) {
-	db := NewDatabase()
+func CreateDatabase(conf *Conf) (*search.Database, *Dataset) {
+	db := search.NewDatabase()
 	db.Separator = conf.Reader.Separator
 
 	skip := make(map[string]bool)
@@ -39,7 +39,7 @@ func CreateDatabase(conf *Conf) (*Database, *Dataset) {
 
 	ds := NewDataset()
 	for id, grp := range conf.Extension.Groups {
-		group := &TokenGroup{}
+		group := &search.TokenGroup{}
 
 		group.Name = id
 		group.FullName = "[" + grp.Elements + "]"
@@ -87,7 +87,7 @@ func loadFileList(filename string) []string {
 	return lines
 }
 
-func (ds *Dataset) AddFileGroups(db *Database, groups map[string]FileGroup, countSeparator string, skip map[string]bool) {
+func (ds *Dataset) AddFileGroups(db *search.Database, groups map[string]FileGroup, countSeparator string, skip map[string]bool) {
 	for group, filegroup := range groups {
 
 		files := make([]string, 0)
@@ -127,7 +127,7 @@ func removeInvalid(names []string, skip map[string]bool) []string {
 	return result[0:i]
 }
 
-func (ds *Dataset) AddFile(db *Database, filename string, countSeparator string, skip map[string]bool) int {
+func (ds *Dataset) AddFile(db *search.Database, filename string, countSeparator string, skip map[string]bool) int {
 	var (
 		file   *os.File
 		reader *bufio.Reader

debugger.go

@@ -4,15 +4,15 @@ import (
 	"fmt"
 
 	"github.com/egonelbre/spexs2/debugger"
-	. "github.com/egonelbre/spexs2/search"
+	"github.com/egonelbre/spexs2/search"
 )
 
 var dbg = debugger.New()
 
 func attachDebugger(s *AppSetup) {
 	debugger.RunShell(dbg)
 	f := s.Extender
-	s.Extender = func(q *Query) Querys {
+	s.Extender = func(q *search.Query) search.Querys {
 		result := f(q)
 		dbg.Break(func() {
 			fmt.Fprintf(dbg.Logout, "extending: %v\n", q.String())

features.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/rogpeppe/rjson"
 
-	. "github.com/egonelbre/spexs2/search"
+	"github.com/egonelbre/spexs2/search"
 	"github.com/egonelbre/spexs2/search/features"
 )
 
@@ -46,12 +46,12 @@ func (s *AppSetup) parseFeature(call string) (name string, args []interface{}, i
 	return
 }
 
-func (s *AppSetup) makeFeature(call string) Feature {
+func (s *AppSetup) makeFeature(call string) search.Feature {
 	feature, _ := s.makeFeatureEx(call)
 	return feature
 }
 
-func (s *AppSetup) makeFeatureEx(call string) (Feature, bool) {
+func (s *AppSetup) makeFeatureEx(call string) (search.Feature, bool) {
 	info("  feature: parse " + call)
 	name, args, isInfo, positive := s.parseFeature(call)
 
@@ -78,7 +78,7 @@ func (s *AppSetup) makeFeatureEx(call string) (Feature, bool) {
 
 	feature := createdFn
 	if !positive {
-		feature = func(q *Query) (float64, string) {
+		feature = func(q *search.Query) (float64, string) {
 			v, info := createdFn(q)
 			return -v, info
 		}

main.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/egonelbre/spexs2/search"
+	"github.com/egonelbre/spexs2/search"
 )
 
 var (
@@ -93,9 +93,9 @@ func main() {
 	starttime := time.Now()
 
 	if *procs == 1 {
-		Run(&setup.Setup)
+		search.Run(&setup.Setup)
 	} else {
-		RunParallel(&setup.Setup, *procs)
+		search.RunParallel(&setup.Setup, *procs)
 	}
 
 	finishtime := time.Now()

printer.go

@@ -7,10 +7,10 @@ import (
 	"regexp"
 	"text/template"
 
-	. "github.com/egonelbre/spexs2/search"
+	"github.com/egonelbre/spexs2/search"
 )
 
-type strFeature func(*Query) string
+type strFeature func(*search.Query) string
 
 func (s *AppSetup) initPrinter() {
 	format := s.conf.Printer.Format
@@ -32,12 +32,12 @@ func (s *AppSetup) initPrinter() {
 
 			var feat strFeature
 			if !info {
-				feat = func(q *Query) string {
+				feat = func(q *search.Query) string {
 					val, _ := feature(q)
 					return fmt.Sprintf("%v", val)
 				}
 			} else {
-				feat = func(q *Query) string {
+				feat = func(q *search.Query) string {
 					_, info := feature(q)
 					return info
 				}
@@ -56,7 +56,7 @@ func (s *AppSetup) initPrinter() {
 		log.Fatal(err)
 	}
 
-	printQuery := func(out io.Writer, q *Query) {
+	printQuery := func(out io.Writer, q *search.Query) {
 		values := make(map[string]string)
 		for name, fn := range features {
 			values[name] = fn(q)
@@ -71,7 +71,7 @@ func (s *AppSetup) initPrinter() {
 
 	s.printQuery = printQuery
 
-	s.Printer = func(out io.Writer, pool Pooler) {
+	s.Printer = func(out io.Writer, pool search.Pooler) {
 		values := pool.Values()
 
 		if showHeader {

runtime.go

@@ -7,7 +7,7 @@ import (
 	"runtime/pprof"
 	"time"
 
-	. "github.com/egonelbre/spexs2/search"
+	"github.com/egonelbre/spexs2/search"
 )
 
 const mb = 1024 * 1024
@@ -40,7 +40,7 @@ func setMemLimit(setup *AppSetup) {
 	ext := setup.Extender
 	m := new(runtime.MemStats)
 
-	setup.Extender = func(q *Query) Querys {
+	setup.Extender = func(q *search.Query) search.Querys {
 		runtime.ReadMemStats(m)
 		if m.Alloc/mb > memLimit {
 			panic("memory limit exceeded!")
@@ -57,7 +57,7 @@ func attachMemProfiler(setup *AppSetup) {
 
 	ext := setup.Extender
 
-	setup.Extender = func(q *Query) Querys {
+	setup.Extender = func(q *search.Query) search.Querys {
 		if count >= limit {
 			f, err := os.Create(filename)
 			if err != nil {
@@ -109,7 +109,7 @@ func runStats(setup *AppSetup) {
 	}()
 
 	ext := setup.Extender
-	setup.Extender = func(q *Query) Querys {
+	setup.Extender = func(q *search.Query) search.Querys {
 		seq = q.String()
 		counter++
 		return ext(q)
@@ -124,7 +124,7 @@ func endStats() {
 
 func setupLiveView(setup *AppSetup) {
 	out := setup.Outputtable
-	setup.Outputtable = func(q *Query) bool {
+	setup.Outputtable = func(q *search.Query) bool {
 		result := out(q)
 		if result {
 			setup.printQuery(os.Stderr, q)

search/extenders/all.go

@@ -1,13 +1,13 @@
 package extenders
 
 import (
-	. "github.com/egonelbre/spexs2/search"
+	"github.com/egonelbre/spexs2/search"
 	"github.com/egonelbre/spexs2/utils"
 )
 
-type CreateFunc func(Setup, []byte) Extender
+type CreateFunc func(search.Setup, []byte) search.Extender
 
-var All = [...]Extender{
+var All = [...]search.Extender{
 	Simple,
 	Group,
 	Star,
@@ -16,13 +16,13 @@ var All = [...]Extender{
 	RegexGreedy,
 }
 
-func wrap(f Extender) CreateFunc {
-	return func(s Setup, data []byte) Extender {
+func wrap(f search.Extender) CreateFunc {
+	return func(s search.Setup, data []byte) search.Extender {
 		return f
 	}
 }
 
-func Get(name string) (Extender, bool) {
+func Get(name string) (search.Extender, bool) {
 	for _, fn := range All {
 		if utils.FuncName(fn) == name {
 			return fn, true

search/extenders/extenders.go

@@ -1,16 +1,16 @@
 package extenders
 
 import (
-	. "github.com/egonelbre/spexs2/search"
+	"github.com/egonelbre/spexs2/search"
 	"github.com/egonelbre/spexs2/set/multi"
 )
 
-type queryMap map[Token]*Query
+type queryMap map[search.Token]*search.Query
 
 // TODO: method queryMap.toQuerys
 // TODO: method queryMap.addLoc(token, pos)
-func toQuerys(queryMap queryMap) Querys {
-	querys := make(Querys, len(queryMap))
+func toQuerys(queryMap queryMap) search.Querys {
+	querys := make(search.Querys, len(queryMap))
 	i := 0
 	for _, q := range queryMap {
 		querys[i] = q
@@ -19,32 +19,32 @@ func toQuerys(queryMap queryMap) Querys {
 	return querys
 }
 
-func extend(base *Query, db *Database, querys queryMap) {
+func extend(base *search.Query, db *search.Database, querys queryMap) {
 	for _, p := range base.Loc.Iter() {
 		token := db.FullSequence[p]
-		if token == ZeroToken {
+		if token == search.ZeroToken {
 			continue
 		}
 
 		q, ok := querys[token]
 		if !ok {
-			q = NewQuery(base, RegToken{Token: token, Flags: IsSingle})
+			q = search.NewQuery(base, search.RegToken{Token: token, Flags: search.IsSingle})
 			querys[token] = q
 		}
 
 		q.Loc.Add(p + 1)
 	}
 }
 
-func Simple(base *Query) Querys {
+func Simple(base *search.Query) search.Querys {
 	querys := make(queryMap)
 	extend(base, base.Db, querys)
 	return toQuerys(querys)
 }
 
-func combine(base *Query, db *Database, querys queryMap, flags RegFlags) {
+func combine(base *search.Query, db *search.Database, querys queryMap, flags search.RegFlags) {
 	for _, group := range db.Groups {
-		q := NewQuery(base, RegToken{Token: group.Token, Flags: IsGroup | flags})
+		q := search.NewQuery(base, search.RegToken{Token: group.Token, Flags: search.IsGroup | flags})
 		querys[group.Token] = q
 		sets := multi.New()
 		for _, token := range group.Elems {
@@ -56,31 +56,31 @@ func combine(base *Query, db *Database, querys queryMap, flags RegFlags) {
 	}
 }
 
-func Group(base *Query) Querys {
+func Group(base *search.Query) search.Querys {
 	querys := make(queryMap)
 	extend(base, base.Db, querys)
-	combine(base, base.Db, querys, IsSingle)
+	combine(base, base.Db, querys, search.IsSingle)
 	return toQuerys(querys)
 }
 
-func starExtendPosition(base *Query, db *Database, querys queryMap, start int) {
+func starExtendPosition(base *search.Query, db *search.Database, querys queryMap, start int) {
 	for i, token := range db.FullSequence[start:] {
 		p := start + i
-		if token == ZeroToken {
+		if token == search.ZeroToken {
 			break
 		}
 
 		q, ok := querys[token]
 		if !ok {
-			q = NewQuery(base, RegToken{Token: token, Flags: IsStar})
+			q = search.NewQuery(base, search.RegToken{Token: token, Flags: search.IsStar})
 			querys[token] = q
 		}
 
 		q.Loc.Add(p + 1)
 	}
 }
 
-func starExtend(base *Query, db *Database, querys queryMap) {
+func starExtend(base *search.Query, db *search.Database, querys queryMap) {
 	prevseq := -1
 	for _, p := range base.Loc.Iter() {
 		seq := db.PosToSequence[p]
@@ -92,20 +92,20 @@ func starExtend(base *Query, db *Database, querys queryMap) {
 	}
 }
 
-func Star(base *Query) Querys {
+func Star(base *search.Query) search.Querys {
 	patterns := make(queryMap)
 	extend(base, base.Db, patterns)
 	stars := make(queryMap)
 	starExtend(base, base.Db, stars)
 	return append(toQuerys(patterns), toQuerys(stars)...)
 }
 
-func Regex(base *Query) Querys {
+func Regex(base *search.Query) search.Querys {
 	patterns := make(queryMap)
 	extend(base, base.Db, patterns)
-	combine(base, base.Db, patterns, IsSingle)
+	combine(base, base.Db, patterns, search.IsSingle)
 	stars := make(queryMap)
 	starExtend(base, base.Db, stars)
-	combine(base, base.Db, stars, IsStar)
+	combine(base, base.Db, stars, search.IsStar)
 	return append(toQuerys(patterns), toQuerys(stars)...)
 }