From 827a83efbc178390ddd8aaa36d26bce593d0d58f Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sat, 20 Aug 2016 01:46:54 +0900 Subject: Remove Offset slice from Result struct --- src/merger.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/merger.go') 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, -- cgit v1.2.3