1a2f01efa6
Update the Go library to the 1.10beta1 release.
Requires a few changes to the compiler for modifications to the map
runtime code, and to handle some nowritebarrier cases in the runtime.
Reviewed-on: https://go-review.googlesource.com/86455
gotools/:
* Makefile.am (go_cmd_vet_files): New variable.
(go_cmd_buildid_files, go_cmd_test2json_files): New variables.
(s-zdefaultcc): Change from constants to functions.
(noinst_PROGRAMS): Add vet, buildid, and test2json.
(cgo$(EXEEXT)): Link against $(LIBGOTOOL).
(vet$(EXEEXT)): New target.
(buildid$(EXEEXT)): New target.
(test2json$(EXEEXT)): New target.
(install-exec-local): Install all $(noinst_PROGRAMS).
(uninstall-local): Uninstasll all $(noinst_PROGRAMS).
(check-go-tool): Depend on $(noinst_PROGRAMS). Copy down
objabi.go.
(check-runtime): Depend on $(noinst_PROGRAMS).
(check-cgo-test, check-carchive-test): Likewise.
(check-vet): New target.
(check): Depend on check-vet. Look at cmd_vet-testlog.
(.PHONY): Add check-vet.
* Makefile.in: Rebuild.
From-SVN: r256365
93 lines
2.5 KiB
Go
93 lines
2.5 KiB
Go
// Copyright 2017 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 edit implements buffered position-based editing of byte slices.
|
|
package edit
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
)
|
|
|
|
// A Buffer is a queue of edits to apply to a given byte slice.
|
|
type Buffer struct {
|
|
old []byte
|
|
q edits
|
|
}
|
|
|
|
// An edit records a single text modification: change the bytes in [start,end) to new.
|
|
type edit struct {
|
|
start int
|
|
end int
|
|
new string
|
|
}
|
|
|
|
// An edits is a list of edits that is sortable by start offset, breaking ties by end offset.
|
|
type edits []edit
|
|
|
|
func (x edits) Len() int { return len(x) }
|
|
func (x edits) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
|
|
func (x edits) Less(i, j int) bool {
|
|
if x[i].start != x[j].start {
|
|
return x[i].start < x[j].start
|
|
}
|
|
return x[i].end < x[j].end
|
|
}
|
|
|
|
// NewBuffer returns a new buffer to accumulate changes to an initial data slice.
|
|
// The returned buffer maintains a reference to the data, so the caller must ensure
|
|
// the data is not modified until after the Buffer is done being used.
|
|
func NewBuffer(data []byte) *Buffer {
|
|
return &Buffer{old: data}
|
|
}
|
|
|
|
func (b *Buffer) Insert(pos int, new string) {
|
|
if pos < 0 || pos > len(b.old) {
|
|
panic("invalid edit position")
|
|
}
|
|
b.q = append(b.q, edit{pos, pos, new})
|
|
}
|
|
|
|
func (b *Buffer) Delete(start, end int) {
|
|
if end < start || start < 0 || end > len(b.old) {
|
|
panic("invalid edit position")
|
|
}
|
|
b.q = append(b.q, edit{start, end, ""})
|
|
}
|
|
|
|
func (b *Buffer) Replace(start, end int, new string) {
|
|
if end < start || start < 0 || end > len(b.old) {
|
|
panic("invalid edit position")
|
|
}
|
|
b.q = append(b.q, edit{start, end, new})
|
|
}
|
|
|
|
// Bytes returns a new byte slice containing the original data
|
|
// with the queued edits applied.
|
|
func (b *Buffer) Bytes() []byte {
|
|
// Sort edits by starting position and then by ending position.
|
|
// Breaking ties by ending position allows insertions at point x
|
|
// to be applied before a replacement of the text at [x, y).
|
|
sort.Stable(b.q)
|
|
|
|
var new []byte
|
|
offset := 0
|
|
for i, e := range b.q {
|
|
if e.start < offset {
|
|
e0 := b.q[i-1]
|
|
panic(fmt.Sprintf("overlapping edits: [%d,%d)->%q, [%d,%d)->%q", e0.start, e0.end, e0.new, e.start, e.end, e.new))
|
|
}
|
|
new = append(new, b.old[offset:e.start]...)
|
|
offset = e.end
|
|
new = append(new, e.new...)
|
|
}
|
|
new = append(new, b.old[offset:]...)
|
|
return new
|
|
}
|
|
|
|
// String returns a string containing the original data
|
|
// with the queued edits applied.
|
|
func (b *Buffer) String() string {
|
|
return string(b.Bytes())
|
|
}
|