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 composite literals from { } to ( ).

Browse source 
only non-trivial changes are in
	convlit1.go
	golden.out

R=gri
OCL=25019
CL=25024
This commit is contained in:
Russ Cox 2009-02-13 14:48:32 -08:00
parent 07244f7c80
commit 9f8f2e6130
92 changed files with 1598 additions and 1600 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@ import (
"testing";
)
var good_re = []string{
var good_re = []string(
``,
`.`,
`^.$`,
@ -27,27 +27,27 @@ var good_re = []string{
`[]`,
`[abc]`,
`[^1234]`,
}
)
// TODO: nice to do this with a map
type stringError struct {
re string;
err *os.Error;
}
var bad_re = []stringError{
stringError{ `*`, regexp.ErrBareClosure },
stringError{ `(abc`, regexp.ErrUnmatchedLpar },
stringError{ `abc)`, regexp.ErrUnmatchedRpar },
stringError{ `x[a-z`, regexp.ErrUnmatchedLbkt },
stringError{ `abc]`, regexp.ErrUnmatchedRbkt },
stringError{ `[z-a]`, regexp.ErrBadRange },
stringError{ `abc\`, regexp.ErrExtraneousBackslash },
stringError{ `a**`, regexp.ErrBadClosure },
stringError{ `a*+`, regexp.ErrBadClosure },
stringError{ `a??`, regexp.ErrBadClosure },
stringError{ `*`, regexp.ErrBareClosure },
stringError{ `\x`, regexp.ErrBadBackslash },
}
var bad_re = []stringError(
stringError( `*`, regexp.ErrBareClosure ),
stringError( `(abc`, regexp.ErrUnmatchedLpar ),
stringError( `abc)`, regexp.ErrUnmatchedRpar ),
stringError( `x[a-z`, regexp.ErrUnmatchedLbkt ),
stringError( `abc]`, regexp.ErrUnmatchedRbkt ),
stringError( `[z-a]`, regexp.ErrBadRange ),
stringError( `abc\`, regexp.ErrExtraneousBackslash ),
stringError( `a**`, regexp.ErrBadClosure ),
stringError( `a*+`, regexp.ErrBadClosure ),
stringError( `a??`, regexp.ErrBadClosure ),
stringError( `*`, regexp.ErrBareClosure ),
stringError( `\x`, regexp.ErrBadBackslash ),
)
type vec []int;
@ -57,33 +57,33 @@ type tester struct {
match vec;
}
var matches = []tester {
tester{ ``, "", vec{0,0} },
tester{ `a`, "a", vec{0,1} },
tester{ `x`, "y", vec{} },
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} },
}
var matches = []tester (
tester( ``, "", vec(0,0) ),
tester( `a`, "a", vec(0,1) ),
tester( `x`, "y", vec() ),
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 {
re, err := regexp.Compile(expr);