delete export
TBR=r
OCL=23121
CL=23127
diff --git a/src/lib/regexp/all_test.go b/src/lib/regexp/all_test.go
index f72671c..5e97549 100644
--- a/src/lib/regexp/all_test.go
+++ b/src/lib/regexp/all_test.go
@@ -36,16 +36,16 @@
}
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{ `(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 },
}
@@ -155,19 +155,19 @@
}
}
-export func TestGoodCompile(t *testing.T) {
+func TestGoodCompile(t *testing.T) {
for i := 0; i < len(good_re); i++ {
compileTest(t, good_re[i], nil);
}
}
-export func TestBadCompile(t *testing.T) {
+func TestBadCompile(t *testing.T) {
for i := 0; i < len(bad_re); i++ {
compileTest(t, bad_re[i].re, bad_re[i].err)
}
}
-export func TestExecute(t *testing.T) {
+func TestExecute(t *testing.T) {
for i := 0; i < len(matches); i++ {
test := &matches[i];
executeTest(t, test.re, test.text, test.match)
@@ -185,7 +185,7 @@
}
}
-export func TestMatch(t *testing.T) {
+func TestMatch(t *testing.T) {
for i := 0; i < len(matches); i++ {
test := &matches[i];
matchTest(t, test.re, test.text, test.match)
@@ -210,7 +210,7 @@
}
}
-export func TestMatchStrings(t *testing.T) {
+func TestMatchStrings(t *testing.T) {
for i := 0; i < len(matches); i++ {
test := &matches[i];
matchTest(t, test.re, test.text, test.match)
@@ -227,7 +227,7 @@
}
}
-export func TestMatchFunction(t *testing.T) {
+func TestMatchFunction(t *testing.T) {
for i := 0; i < len(matches); i++ {
test := &matches[i];
matchFunctionTest(t, test.re, test.text, test.match)
diff --git a/src/lib/regexp/regexp.go b/src/lib/regexp/regexp.go
index e838603..b406443 100644
--- a/src/lib/regexp/regexp.go
+++ b/src/lib/regexp/regexp.go
@@ -15,16 +15,16 @@
var debug = false;
-export var ErrInternal = os.NewError("internal error");
-export var ErrUnmatchedLpar = os.NewError("unmatched '('");
-export var ErrUnmatchedRpar = os.NewError("unmatched ')'");
-export var ErrUnmatchedLbkt = os.NewError("unmatched '['");
-export var ErrUnmatchedRbkt = os.NewError("unmatched ']'");
-export var ErrBadRange = os.NewError("bad range in character class");
-export var ErrExtraneousBackslash = os.NewError("extraneous backslash");
-export var ErrBadClosure = os.NewError("repeated closure (**, ++, etc.)");
-export var ErrBareClosure = os.NewError("closure applies to nothing");
-export var ErrBadBackslash = os.NewError("illegal backslash escape");
+var ErrInternal = os.NewError("internal error");
+var ErrUnmatchedLpar = os.NewError("unmatched '('");
+var ErrUnmatchedRpar = os.NewError("unmatched ')'");
+var ErrUnmatchedLbkt = os.NewError("unmatched '['");
+var ErrUnmatchedRbkt = os.NewError("unmatched ']'");
+var ErrBadRange = os.NewError("bad range in character class");
+var ErrExtraneousBackslash = os.NewError("extraneous backslash");
+var ErrBadClosure = os.NewError("repeated closure (**, ++, etc.)");
+var ErrBareClosure = os.NewError("closure applies to nothing");
+var ErrBadBackslash = os.NewError("illegal backslash escape");
// An instruction executed by the NFA
type instr interface {
@@ -582,14 +582,14 @@
}
// Public interface has only execute functionality
-export type Regexp interface {
+type Regexp interface {
Execute(s string) []int;
Match(s string) bool;
MatchStrings(s string) []string;
}
// Compile in separate goroutine; wait for result
-export func Compile(str string) (regexp Regexp, error *os.Error) {
+func Compile(str string) (regexp Regexp, error *os.Error) {
ch := make(chan *_RE);
go compiler(str, ch);
re := <-ch;
@@ -739,7 +739,7 @@
// Exported function for simple boolean check. Anything more fancy
// needs a call to Compile.
-export func Match(pattern string, s string) (matched bool, error *os.Error) {
+func Match(pattern string, s string) (matched bool, error *os.Error) {
re, err := Compile(pattern);
if err != nil {
return false, err
