Make regexp build and install officially
R=rsc
DELTA=335 (172 added, 156 deleted, 7 changed)
OCL=17167
CL=17180
diff --git a/src/lib/clean.bash b/src/lib/clean.bash
index 93bb64a..e3d7b61 100755
--- a/src/lib/clean.bash
+++ b/src/lib/clean.bash
@@ -6,7 +6,7 @@
rm -f $GOROOT/pkg/*
-for i in syscall os math net time
+for i in syscall os math net time http regexp
do
cd $i
make nuke
diff --git a/src/lib/container/vector.go b/src/lib/container/vector.go
index 72a0fff..c646917 100644
--- a/src/lib/container/vector.go
+++ b/src/lib/container/vector.go
@@ -56,6 +56,10 @@
}
+func (v *Vector) Reset() {
+ v.elem = v.elem[0:0];
+}
+
func (v *Vector) Insert(i int, e Element) {
n := v.Len();
// range check unnecessary - done by runtime
diff --git a/src/lib/make.bash b/src/lib/make.bash
index c791b23..5cc9762 100755
--- a/src/lib/make.bash
+++ b/src/lib/make.bash
@@ -33,7 +33,7 @@
6g -o $GOROOT/pkg/$base.6 $i
done
-for i in net time http
+for i in net time http regexp
do
echo; echo; echo %%%% making lib/$i %%%%; echo
cd $i
diff --git a/src/lib/regexp/Makefile b/src/lib/regexp/Makefile
index ac466a0..86c1680 100644
--- a/src/lib/regexp/Makefile
+++ b/src/lib/regexp/Makefile
@@ -5,16 +5,22 @@
A=6
G=$(A)g
L=$(A)l
+PKG=$(GOROOT)/pkg/regexp.$A
-all: main
+test: main.$A test.$A
+ $L -o test test.$A
+ ./test
-main: main.6
- $L -o main main.6
+install: regexp.$A
+ cp regexp.$A $(PKG)
-main.6: regexp.6
+main: main.$A
+ $L -o main main.$A
+
+main.$A: regexp.$A
clean:
- rm -f *.6 main
+ rm -f *.6 test
%.6: %.go
$G $<
diff --git a/src/lib/regexp/main.go b/src/lib/regexp/test.go
similarity index 98%
rename from src/lib/regexp/main.go
rename to src/lib/regexp/test.go
index c89f9b5..223064c 100644
--- a/src/lib/regexp/main.go
+++ b/src/lib/regexp/test.go
@@ -34,7 +34,7 @@
err *os.Error;
}
var bad_re = []StringError{
- StringError{ `*`, regexp.ErrBareClosure },
+ StringError{ `*`, regexp.ErrBareClosure },
StringError{ `(abc`, regexp.ErrUnmatchedLpar },
StringError{ `abc)`, regexp.ErrUnmatchedRpar },
StringError{ `x[a-z`, regexp.ErrUnmatchedLbkt },
diff --git a/src/run.bash b/src/run.bash
index cd33b89..72a5406 100755
--- a/src/run.bash
+++ b/src/run.bash
@@ -10,6 +10,12 @@
echo --- cd $1
}
+(xcd lib/regexp
+make clean
+time make
+make test
+)
+
(xcd ../usr/gri/gosrc
make clean
time make
