mirror of
https://github.com/golang/go
synced 2024-11-22 03:24:41 -07:00
fix occurrences of occur[^sr .,?!;\n]
R=r, r2 CC=golang-dev https://golang.org/cl/3794043
This commit is contained in:
parent
6773f1426f
commit
8184778abf
@ -656,7 +656,7 @@ func (s *State) eval(fexpr expr, value reflect.Value, index int) bool {
|
|||||||
|
|
||||||
// Eval formats each argument according to the format
|
// Eval formats each argument according to the format
|
||||||
// f and returns the resulting []byte and os.Error. If
|
// f and returns the resulting []byte and os.Error. If
|
||||||
// an error occured, the []byte contains the partially
|
// an error occurred, the []byte contains the partially
|
||||||
// formatted result. An environment env may be passed
|
// formatted result. An environment env may be passed
|
||||||
// in which is available in custom formatters through
|
// in which is available in custom formatters through
|
||||||
// the state parameter.
|
// the state parameter.
|
||||||
|
@ -178,7 +178,7 @@ func ParseFiles(fset *token.FileSet, filenames []string, mode uint) (pkgs map[st
|
|||||||
// information is recorded in the file set fset.
|
// information is recorded in the file set fset.
|
||||||
//
|
//
|
||||||
// If the directory couldn't be read, a nil map and the respective error are
|
// If the directory couldn't be read, a nil map and the respective error are
|
||||||
// returned. If a parse error occured, a non-nil but incomplete map and the
|
// returned. If a parse error occurred, a non-nil but incomplete map and the
|
||||||
// error are returned.
|
// error are returned.
|
||||||
//
|
//
|
||||||
func ParseDir(fset *token.FileSet, path string, filter func(*os.FileInfo) bool, mode uint) (map[string]*ast.Package, os.Error) {
|
func ParseDir(fset *token.FileSet, path string, filter func(*os.FileInfo) bool, mode uint) (map[string]*ast.Package, os.Error) {
|
||||||
|
@ -879,7 +879,7 @@ func (p *printer) commentBefore(next token.Position) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Flush prints any pending comments and whitespace occuring
|
// Flush prints any pending comments and whitespace occurring
|
||||||
// textually before the position of the next token tok. Flush
|
// textually before the position of the next token tok. Flush
|
||||||
// returns true if a pending formfeed character was dropped
|
// returns true if a pending formfeed character was dropped
|
||||||
// from the whitespace buffer as a result of interspersing
|
// from the whitespace buffer as a result of interspersing
|
||||||
@ -922,7 +922,7 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
// Design note: It is tempting to eliminate extra blanks occuring in
|
// Design note: It is tempting to eliminate extra blanks occurring in
|
||||||
// whitespace in this function as it could simplify some
|
// whitespace in this function as it could simplify some
|
||||||
// of the blanks logic in the node printing functions.
|
// of the blanks logic in the node printing functions.
|
||||||
// However, this would mess up any formatting done by
|
// However, this would mess up any formatting done by
|
||||||
|
@ -101,11 +101,11 @@ var testCases = []testCase{
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// find all occurences of s in source; report at most n occurences
|
// find all occurrences of s in source; report at most n occurences
|
||||||
func find(src, s string, n int) []int {
|
func find(src, s string, n int) []int {
|
||||||
var res vector.IntVector
|
var res vector.IntVector
|
||||||
if s != "" && n != 0 {
|
if s != "" && n != 0 {
|
||||||
// find at most n occurences of s in src
|
// find at most n occurrences of s in src
|
||||||
for i := -1; n < 0 || len(res) < n; {
|
for i := -1; n < 0 || len(res) < n; {
|
||||||
j := strings.Index(src[i+1:], s)
|
j := strings.Index(src[i+1:], s)
|
||||||
if j < 0 {
|
if j < 0 {
|
||||||
|
Loading…
Reference in New Issue
Block a user