reduce unused Regexp compile

vim-jp · Sep 19, 2016 · 64a3a04 · 64a3a04
1 parent b12279c
commit 64a3a04
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 61 deletions.
diff --git a/go/vimlfunc.go b/go/vimlfunc.go
@@ -66,12 +66,10 @@ var patVim2Go = map[string]string{
 }
 
 var patVim2GoRegh = make(map[string]*regexp.Regexp)
-var patVim2GoRegq = make(map[string]*regexp.Regexp)
 
 func init() {
 	for k, v := range patVim2Go {
 		patVim2GoRegh[k] = regexp.MustCompile(v)
-		patVim2GoRegq[k] = regexp.MustCompile("(?i)" + v)
 	}
 }
 
@@ -84,12 +82,6 @@ func viml_empty(obj interface{}) bool {
 func viml_equalci(a, b string) bool {
 	return strings.ToLower(a) == strings.ToLower(b)
 }
-func viml_eqreg(s, reg string) bool {
-	if r, ok := patVim2GoRegq[reg]; ok {
-		return r.MatchString(s)
-	}
-	panic(fmt.Errorf("NotImplemented viml_eqreg for %v", reg))
-}
 
 func viml_eqregh(s, reg string) bool {
 	if r, ok := patVim2GoRegh[reg]; ok {
@@ -98,13 +90,6 @@ func viml_eqregh(s, reg string) bool {
 	panic("NotImplemented viml_eqregh")
 }
 
-func viml_eqregq(s, reg string) bool {
-	if r, ok := patVim2GoRegq[reg]; ok {
-		return r.MatchString(s)
-	}
-	panic("NotImplemented viml_eqregq")
-}
-
 func viml_escape(s string, chars string) string {
 	r := ""
 	for _, c := range s {

diff --git a/go/vimlfunc_test.go b/go/vimlfunc_test.go
@@ -5,34 +5,6 @@ import (
 	"testing"
 )
 
-func TestViml_eqreg(t *testing.T) {
-	tests := []struct {
-		in   string
-		reg  string
-		want bool
-	}{
-		{in: ``, reg: "^\\s*\\\\", want: false},
-		{in: `hoge`, reg: "^\\s*\\\\", want: false},
-		{in: ` \ hoge`, reg: "^\\s*\\\\", want: true},
-		{in: `\`, reg: "^\\s*\\\\", want: true},
-
-		// ^++
-		{in: `++hoge`, reg: "^++", want: true},
-		{in: `hoge`, reg: "^++", want: false},
-
-		// case
-		{in: `deletel`, reg: "\\v^d%[elete][lp]$", want: true},
-		{in: `deleteL`, reg: "\\v^d%[elete][lp]$", want: true},
-		{in: `++bad=keep`, reg: "^++bad=keep", want: true},
-		{in: `++bad=KEEP`, reg: "^++bad=keep", want: true},
-	}
-	for _, tt := range tests {
-		if got := viml_eqreg(tt.in, tt.reg); got != tt.want {
-			t.Errorf("viml_eqreg(%q, %q) = %v, want %v", tt.in, tt.reg, got, tt.want)
-		}
-	}
-}
-
 func TestViml_eqregh(t *testing.T) {
 	tests := []struct {
 		in   string
@@ -51,24 +23,6 @@ func TestViml_eqregh(t *testing.T) {
 	}
 }
 
-func TestViml_eqregq(t *testing.T) {
-	tests := []struct {
-		in   string
-		reg  string
-		want bool
-	}{
-		{in: `deletel`, reg: "\\v^d%[elete][lp]$", want: true},
-		{in: `deleteL`, reg: "\\v^d%[elete][lp]$", want: true},
-		{in: `++bad=keep`, reg: "^++bad=keep", want: true},
-		{in: `++bad=KEEP`, reg: "^++bad=keep", want: true},
-	}
-	for _, tt := range tests {
-		if got := viml_eqregq(tt.in, tt.reg); got != tt.want {
-			t.Errorf("viml_eqregq(%q, %q) = %v, want %v", tt.in, tt.reg, got, tt.want)
-		}
-	}
-}
-
 func TestViml_printf(t *testing.T) {
 	tests := []struct {
 		f    string