Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

convert *[] to [].

Browse source 
R=r
OCL=21563
CL=21571
This commit is contained in:
Russ Cox 2008-12-18 22:37:22 -08:00
parent 9786f69f74
commit d47d888ba6
74 changed files with 532 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/lib/regexp/all_test.go
View file

@ -49,7 +49,7 @@ var bad_re = []StringError{
StringError{ `\x`, regexp.ErrBadBackslash },
}
type Vec [20]int;
type Vec []int;
type Tester struct {
re string;
@ -57,33 +57,31 @@ type Tester struct {
match Vec;
}
const END = -1000
var matches = []Tester {
Tester{ ``, "", Vec{0,0, END} },
Tester{ `a`, "a", Vec{0,1, END} },
Tester{ `b`, "abc", Vec{1,2, END} },
Tester{ `.`, "a", Vec{0,1, END} },
Tester{ `.*`, "abcdef", Vec{0,6, END} },
Tester{ `^abcd$`, "abcd", Vec{0,4, END} },
Tester{ `^bcd'`, "abcdef", Vec{END} },
Tester{ `^abcd$`, "abcde", Vec{END} },
Tester{ `a+`, "baaab", Vec{1,4, END} },
Tester{ `a*`, "baaab", Vec{0,0, END} },
Tester{ `[a-z]+`, "abcd", Vec{0,4, END} },
Tester{ `[^a-z]+`, "ab1234cd", Vec{2,6, END} },
Tester{ `[a\-\]z]+`, "az]-bcz", Vec{0,4, END} },
Tester{ `[日本語]+`, "日本語日本語", Vec{0,18, END} },
Tester{ `()`, "", Vec{0,0, 0,0, END} },
Tester{ `(a)`, "a", Vec{0,1, 0,1, END} },
Tester{ `(.)(.)`, "日a", Vec{0,4, 0,3, 3,4, END} },
Tester{ `(.*)`, "", Vec{0,0, 0,0, END} },
Tester{ `(.*)`, "abcd", Vec{0,4, 0,4, END} },
Tester{ `(..)(..)`, "abcd", Vec{0,4, 0,2, 2,4, END} },
Tester{ `(([^xyz]*)(d))`, "abcd", Vec{0,4, 0,4, 0,3, 3,4, END} },
Tester{ `((a|b|c)*(d))`, "abcd", Vec{0,4, 0,4, 2,3, 3,4, END} },
Tester{ `(((a|b|c)*)(d))`, "abcd", Vec{0,4, 0,4, 0,3, 2,3, 3,4, END} },
Tester{ `a*(|(b))c*`, "aacc", Vec{0,4, 2,2, -1,-1, END} },
Tester{ ``, "", Vec{0,0} },
Tester{ `a`, "a", Vec{0,1} },
Tester{ `b`, "abc", Vec{1,2} },
Tester{ `.`, "a", Vec{0,1} },
Tester{ `.*`, "abcdef", Vec{0,6} },
Tester{ `^abcd$`, "abcd", Vec{0,4} },
Tester{ `^bcd'`, "abcdef", Vec{} },
Tester{ `^abcd$`, "abcde", Vec{} },
Tester{ `a+`, "baaab", Vec{1,4} },
Tester{ `a*`, "baaab", Vec{0,0} },
Tester{ `[a-z]+`, "abcd", Vec{0,4} },
Tester{ `[^a-z]+`, "ab1234cd", Vec{2,6} },
Tester{ `[a\-\]z]+`, "az]-bcz", Vec{0,4} },
Tester{ `[日本語]+`, "日本語日本語", Vec{0,18} },
Tester{ `()`, "", Vec{0,0, 0,0} },
Tester{ `(a)`, "a", Vec{0,1, 0,1} },
Tester{ `(.)(.)`, "日a", Vec{0,4, 0,3, 3,4} },
Tester{ `(.*)`, "", Vec{0,0, 0,0} },
Tester{ `(.*)`, "abcd", Vec{0,4, 0,4} },
Tester{ `(..)(..)`, "abcd", Vec{0,4, 0,2, 2,4} },
Tester{ `(([^xyz]*)(d))`, "abcd", Vec{0,4, 0,4, 0,3, 3,4} },
Tester{ `((a|b|c)*(d))`, "abcd", Vec{0,4, 0,4, 2,3, 3,4} },
Tester{ `(((a|b|c)*)(d))`, "abcd", Vec{0,4, 0,4, 0,3, 2,3, 3,4} },
Tester{ `a*(|(b))c*`, "aacc", Vec{0,4, 2,2, -1,-1} },
}
func CompileTest(t *testing.T, expr string, error *os.Error) regexp.Regexp {
@ -94,30 +92,20 @@ func CompileTest(t *testing.T, expr string, error *os.Error) regexp.Regexp {
return re
}
func MarkedLen(m *[] int) int {
if m == nil {
return 0
}
var i int;
for i = 0; i < len(m) && m[i] != END; i = i+2 {
}
return i
}
func PrintVec(t *testing.T, m *[] int) {
l := MarkedLen(m);
func PrintVec(t *testing.T, m [] int) {
l := len(m);
if l == 0 {
t.Log("\t<no match>");
} else {
for i := 0; i < l && m[i] != END; i = i+2 {
for i := 0; i < l; i = i+2 {
t.Log("\t", m[i], ",", m[i+1])
}
}
}
func Equal(m1, m2 *[]int) bool {
l := MarkedLen(m1);
if l != MarkedLen(m2) {
func Equal(m1, m2 []int) bool {
l := len(m1);
if l != len(m2) {
return false
}
for i := 0; i < l; i++ {
@ -128,7 +116,7 @@ func Equal(m1, m2 *[]int) bool {
return true
}
func MatchTest(t *testing.T, expr string, str string, match *[]int) {
func MatchTest(t *testing.T, expr string, str string, match []int) {
re := CompileTest(t, expr, nil);
if re == nil {
return
@ -157,6 +145,6 @@ export func TestBadCompile(t *testing.T) {
export func TestMatch(t *testing.T) {
for i := 0; i < len(matches); i++ {
test := &matches[i];
MatchTest(t, test.re, test.text, &test.match)
MatchTest(t, test.re, test.text, test.match)
}
}