Add Count

Author: MarkReedZ

go/stringzilla/main.go

@@ -59,7 +59,7 @@ func Find( str string, pat string ) int64 {
     return int64(uintptr(ret)-uintptr(unsafe.Pointer(cstr)))
 }
 
-func RFind( str string, pat string ) int64 {
+func LastIndex( str string, pat string ) int64 {
     cstr := (*C.char)(unsafe.Pointer(unsafe.StringData(str)))
     cpat := (*C.char)(unsafe.Pointer(unsafe.StringData(pat)))
     strlen := len(str)
@@ -70,6 +70,9 @@ func RFind( str string, pat string ) int64 {
 	}
     return int64(uintptr(ret)-uintptr(unsafe.Pointer(cstr)))
 }
+func RFind( str string, pat string ) int64 {
+    return LastIndex(str,pat)
+}
 
 func IndexAny( str string, charset string ) int64 {
     cstr := (*C.char)(unsafe.Pointer(unsafe.StringData(str)))
@@ -86,5 +89,42 @@ func FindCharFrom( str string, charset string ) int64 {
 	return IndexAny( str, charset )
 }
 
+func Count( str string, pat string, overlap bool ) int64 {
+    cstr := (*C.char)(unsafe.Pointer(unsafe.StringData(str)))
+    cpat := (*C.char)(unsafe.Pointer(unsafe.StringData(pat)))
+    strlen := int64(len(str))
+    patlen := int64(len(pat))
+
+    if strlen == 0 || patlen == 0 || strlen < patlen {
+        return 0
+    }
+
+    count := int64(0);
+    if overlap == true {
+        for strlen > 0 {
+            ret := unsafe.Pointer(C.sz_find( cstr, C.ulong(strlen), cpat, C.ulong(patlen) ))
+            if ret == nil {
+                break
+            }
+            count += 1
+            strlen -= ( 1 + int64(uintptr(ret)-uintptr(unsafe.Pointer(cstr))) )
+            cstr = (*C.char)(unsafe.Add(ret,1))
+        }
+    } else {
+        for strlen > 0 {
+            ret := unsafe.Pointer(C.sz_find( cstr, C.ulong(strlen), cpat, C.ulong(patlen) ))
+            if ret == nil {
+                break
+            }
+            count += 1
+            strlen -= (patlen+int64(uintptr(ret)-uintptr(unsafe.Pointer(cstr))))
+            cstr = (*C.char)(unsafe.Add(ret,patlen))
+        }
+    }
+
+    return count
+
+}
+
 
 

scripts/bench.go

@@ -9,7 +9,7 @@ import (
 
 func main() {
 
-    str := strings.Repeat("0123456789", 100000) + "something"
+    str := strings.Repeat("0123456789", 10000) + "something"
     pat := "some"
 
 	fmt.Println("Contains")
@@ -51,5 +51,21 @@ func main() {
     }
     fmt.Println( "  ", time.Since(t) , "\tsz.IndexAny" )
 
+    str = strings.Repeat("0123456789", 100000) + "something"
+    pat = "123456789"
+	fmt.Println("Count")
+    t = time.Now()
+    for i := 0; i < 1; i++ {
+        strings.Count( str, pat )
+    }
+    fmt.Println( "  ", time.Since(t) , "\tstrings.Count" )
+
+    t = time.Now()
+    for i := 0; i < 1; i++ {
+        sz.Count( str,pat, false )
+    }
+    fmt.Println( "  ", time.Since(t) , "\tsz.Count" )
+
+
 
 }

scripts/test.go

@@ -48,5 +48,12 @@ func main() {
     assertEqual( sz.IndexAny( "west east", "ta" ), 3)
 	fmt.Println("successful")
 
+	fmt.Print("Count ... ")
+    //assertEqual( strings.Count( str, pat ), int(sz.Count( str,pat,false )) )
+    assertEqual( sz.Count( "aaaaa", "a", false ),  5 )
+    assertEqual( sz.Count( "aaaaa", "aa", false ), 2 )
+    assertEqual( sz.Count( "aaaaa", "aa", true ),  4 )
+	fmt.Println("successful")
+
 
 }