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

15
src/lib/regexp/regexp.go
View file

@ -582,7 +582,7 @@ func Compiler(str string, ch *chan *RE) {
// Public interface has only execute functionality (not yet implemented)
export type Regexp interface {
Execute(s string) *[]int
Execute(s string) []int
}
// Compile in separate goroutine; wait for result
@ -595,12 +595,12 @@ export func Compile(str string) (regexp Regexp, error *os.Error) {
type State struct {
inst Inst; // next instruction to execute
match *[]int; // pairs of bracketing submatches. 0th is start,end
match []int; // pairs of bracketing submatches. 0th is start,end
}
// Append new state to to-do list. Leftmost-longest wins so avoid
// adding a state that's already active.
func AddState(s *[]State, inst Inst, match *[]int) *[]State {
func AddState(s []State, inst Inst, match []int) []State {
index := inst.Index();
l := len(s);
pos := match[0];
@ -625,8 +625,8 @@ func AddState(s *[]State, inst Inst, match *[]int) *[]State {
return s;
}
func (re *RE) DoExecute(str string, pos int) *[]int {
var s [2]*[]State; // TODO: use a vector when State values (not ptrs) can be vector elements
func (re *RE) DoExecute(str string, pos int) []int {
var s [2][]State; // TODO: use a vector when State values (not ptrs) can be vector elements
s[0] = new([]State, 10)[0:0];
s[1] = new([]State, 10)[0:0];
in, out := 0, 1;
@ -708,13 +708,10 @@ func (re *RE) DoExecute(str string, pos int) *[]int {
}
pos += charwidth;
}
if !found {
return nil
}
return final.match;
}
func (re *RE) Execute(s string) *[]int {
func (re *RE) Execute(s string) []int {
return re.DoExecute(s, 0)
}