[dev.power64] code review 152570049: all: merge default into dev.power64

src/regexp/regexp.go

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // Package regexp implements regular expression search.
 //
 // The syntax of the regular expressions accepted is the same
 // general syntax used by Perl, Python, and other languages.
 // More precisely, it is the syntax accepted by RE2 and described at
 // http://code.google.com/p/re2/wiki/Syntax, except for \C.
@@ skipping 434 matching lines @@
         n := 2
         if strings.Index(repl, "$") >= 0 {
                 n = 2 * (re.numSubexp + 1)
         }
         b := re.replaceAll(nil, src, n, func(dst []byte, match []int) []byte {
                 return re.expand(dst, repl, nil, src, match)
         })
         return string(b)
 }
 
-// ReplaceAllStringLiteral returns a copy of src, replacing matches of the Regexp
+// ReplaceAllLiteralString returns a copy of src, replacing matches of the Regexp
 // with the replacement string repl.  The replacement repl is substituted directly,
 // without using Expand.
 func (re *Regexp) ReplaceAllLiteralString(src, repl string) string {
         return string(re.replaceAll(nil, src, 2, func(dst []byte, match []int) []byte {
                 return append(dst, repl...)
         }))
 }
 
 // ReplaceAllStringFunc returns a copy of src in which all matches of the
 // Regexp have been replaced by the return value of function repl applied
@@ skipping 645 matching lines @@
                 }
                 beg = match[1]
         }
 
         if end != len(s) {
                 strings = append(strings, s[beg:])
         }
 
         return strings
 }