Skip to content

Commit

Permalink
path: improve comments
Browse files Browse the repository at this point in the history
  • Loading branch information
julienschmidt committed Jan 10, 2020
1 parent 8e4b52b commit 15782a7
Showing 1 changed file with 17 additions and 7 deletions.
24 changes: 17 additions & 7 deletions path.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ func CleanPath(p string) string {
trailing := n > 1 && p[n-1] == '/'

// A bit more clunky without a 'lazybuf' like the path package, but the loop
// gets completely inlined (bufApp). So in contrast to the path package this
// loop has no expensive function calls (except 1x make)
// gets completely inlined (bufApp calls).
// So in contrast to the path package this loop has no expensive function
// calls (except make, if needed).

for r < n {
switch {
Expand Down Expand Up @@ -91,14 +92,14 @@ func CleanPath(p string) string {
}

default:
// real path element.
// add slash if needed
// Real path element.
// Add slash if needed
if w > 1 {
bufApp(&buf, p, w, '/')
w++
}

// copy element
// Copy element
for r < n && p[r] != '/' {
bufApp(&buf, p, w, p[r])
w++
Expand All @@ -107,26 +108,35 @@ func CleanPath(p string) string {
}
}

// re-append trailing slash
// Re-append trailing slash
if trailing && w > 1 {
bufApp(&buf, p, w, '/')
w++
}

// If the original string was not modified (or only shortened at the end),
// return the respective substring of the original string.
// Otherwise return a new string from the buffer.
if len(buf) == 0 {
return p[:w]
}
return string(buf[:w])
}

// internal helper to lazily create a buffer if necessary
// Internal helper to lazily create a buffer if necessary.
// Calls to this function get inlined.
func bufApp(buf *[]byte, s string, w int, c byte) {
b := *buf
if len(b) == 0 {
// No modification of the original string so far.
// If the next character is the same as in the original string, we do
// not yet have to allocate a buffer.
if s[w] == c {
return
}

// Otherwise use either the stack buffer, if it is large enough, or
// allocate a new buffer on the heap, and copy all previous characters.
if l := len(s); l > cap(b) {
*buf = make([]byte, len(s))
} else {
Expand Down

0 comments on commit 15782a7

Please sign in to comment.