summaryrefslogtreecommitdiffstats
path: root/src/merger.go
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2016-08-20 01:46:54 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2016-08-20 01:53:32 +0900
commit827a83efbc178390ddd8aaa36d26bce593d0d58f (patch)
treef8f7533acf360e3e143892249f9e1613375638a3 /src/merger.go
parent3e888493866d42845f11c4d57fc8f093a6e28644 (diff)
Remove Offset slice from Result struct
Diffstat (limited to 'src/merger.go')
-rw-r--r--src/merger.go13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/merger.go b/src/merger.go
index 3879ab7e..2c7675d1 100644
--- a/src/merger.go
+++ b/src/merger.go
@@ -3,11 +3,12 @@ package fzf
import "fmt"
// EmptyMerger is a Merger with no data
-var EmptyMerger = NewMerger([][]*Result{}, false, false)
+var EmptyMerger = NewMerger(nil, [][]*Result{}, false, false)
// Merger holds a set of locally sorted lists of items and provides the view of
// a single, globally-sorted list
type Merger struct {
+ pattern *Pattern
lists [][]*Result
merged []*Result
chunks *[]*Chunk
@@ -22,9 +23,10 @@ type Merger struct {
// original order
func PassMerger(chunks *[]*Chunk, tac bool) *Merger {
mg := Merger{
- chunks: chunks,
- tac: tac,
- count: 0}
+ pattern: nil,
+ chunks: chunks,
+ tac: tac,
+ count: 0}
for _, chunk := range *mg.chunks {
mg.count += len(*chunk)
@@ -33,8 +35,9 @@ func PassMerger(chunks *[]*Chunk, tac bool) *Merger {
}
// NewMerger returns a new Merger
-func NewMerger(lists [][]*Result, sorted bool, tac bool) *Merger {
+func NewMerger(pattern *Pattern, lists [][]*Result, sorted bool, tac bool) *Merger {
mg := Merger{
+ pattern: pattern,
lists: lists,
merged: []*Result{},
chunks: nil,