added type-safe wrapper DiffMain around private diffMain - no more interface{} args. max int from math package.

Author: rwcarlsen

diff/dmp.go

@@ -37,7 +37,6 @@ const (
 	DiffDelete = -1
 	DiffInsert = 1
 	DiffEqual  = 0
-	max64      = int64(uint64(1<<63) - 1)
 )
 
 // unescaper unescapes selected chars for compatability with JavaScript's encodeURI.
@@ -199,24 +198,18 @@ func New() *DiffMatchPatch {
 }
 
 // DiffMain finds the differences between two texts.
-func (dmp *DiffMatchPatch) DiffMain(text1 string, text2 string, opt ...interface{}) []Diff {
-	checklines := true
+func (dmp *DiffMatchPatch) DiffMain(text1, text2 string, checklines bool) []Diff {
 	var deadline time.Time
-
-	if opt != nil && len(opt) > 0 {
-		checklines = opt[0].(bool)
-
-		if len(opt) > 1 {
-			deadline = opt[1].(time.Time)
-		} else {
-			if dmp.DiffTimeout <= 0 {
-				deadline = time.Now().Add(24*365*time.Hour)
-			} else {
-				deadline = time.Now().Add(dmp.DiffTimeout)
-			}
-		}
+	if dmp.DiffTimeout <= 0 {
+		deadline = time.Now().Add(24*365*time.Hour)
+	} else {
+		deadline = time.Now().Add(dmp.DiffTimeout)
 	}
+	return dmp.diffMain(text1, text2, checklines, deadline)
+}
 
+// DiffMain finds the differences between two texts.
+func (dmp *DiffMatchPatch) diffMain(text1, text2 string, checklines bool, deadline time.Time) []Diff {
 	diffs := []Diff{}
 	if text1 == text2 {
 		if len(text1) > 0 {
@@ -303,8 +296,8 @@ checklines bool, deadline time.Time) []Diff {
 		text2_b := hm[3]
 		mid_common := hm[4]
 		// Send both pairs off for separate processing.
-		diffs_a := dmp.DiffMain(text1_a, text2_a, checklines, deadline)
-		diffs_b := dmp.DiffMain(text1_b, text2_b, checklines, deadline)
+		diffs_a := dmp.diffMain(text1_a, text2_a, checklines, deadline)
+		diffs_b := dmp.diffMain(text1_b, text2_b, checklines, deadline)
 		// Merge the results.
 		return append(diffs_a, append([]Diff{Diff{DiffEqual, mid_common}}, diffs_b...)...)
 	} else if checklines && utf8.RuneCountInString(text1) > 100 && utf8.RuneCountInString(text2) > 100 {
@@ -320,7 +313,7 @@ deadline time.Time) []Diff {
 	// Scan the text on a line-by-line basis first.
 	text1, text2, linearray := dmp.DiffLinesToChars(text1, text2)
 
-	diffs := dmp.DiffMain(text1, text2, false, deadline)
+	diffs := dmp.diffMain(text1, text2, false, deadline)
 
 	// Convert the diff back to original text.
 	diffs = dmp.DiffCharsToLines(diffs, linearray)
@@ -353,7 +346,7 @@ deadline time.Time) []Diff {
 					count_delete+count_insert)
 
 				pointer = pointer - count_delete - count_insert
-				a := dmp.DiffMain(text_delete, text_insert, false, deadline)
+				a := dmp.diffMain(text_delete, text_insert, false, deadline)
 				for j := len(a) - 1; j >= 0; j-- {
 					diffs = splice(diffs, pointer, 0, a[j])
 				}
@@ -494,8 +487,8 @@ deadline time.Time) []Diff {
 	text2b := string(text2[y:])
 
 	// Compute both diffs serially.
-	diffs := dmp.DiffMain(text1a, text2a, false, deadline)
-	diffsb := dmp.DiffMain(text1b, text2b, false, deadline)
+	diffs := dmp.diffMain(text1a, text2a, false, deadline)
+	diffsb := dmp.diffMain(text1b, text2b, false, deadline)
 
 	return append(diffs, diffsb...)
 }

diff/dmp_test.go

@@ -891,8 +891,9 @@ func Test_diffMain(t *testing.T) {
 		a = a + a
 		b = b + b
 	}
+
 	startTime := time.Now()
-	dmp.DiffMain(a, b)
+	dmp.DiffMain(a, b, true)
 	endTime := time.Now()
 	delta := endTime.Sub(startTime)
 	// Test that we took at least the timeout period.