qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 11:04:56 -07:00
Code Releases Activity

Automated g4 rollback of changelist 19913.

Browse Source 
*** Reason for rollback ***

broke build

*** Original change description ***

bufio.ReadRune

TBR=r
OCL=19923
CL=19923
This commit is contained in:
Russ Cox 2008-11-24 13:29:59 -08:00
parent 85fea81d70
commit c00295d115
2 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/bufio.go
View File

@ -3,12 +3,8 @@
// license that can be found in the LICENSE file.
package bufio
import (
"os";
"io";
"utf8";
)
import "os"
import "io"
// TODO:
@ -69,7 +65,7 @@ func (b *BufRead) Fill() *os.Error {
}
// Slide existing data to beginning.
if b.w > b.r {
if b.w > b.r {
CopySlice(b.buf[0:b.w-b.r], b.buf[b.r:b.w]);
b.w -= b.r;
} else {
@ -144,30 +140,6 @@ func (b *BufRead) UnreadByte() *os.Error {
return nil
}
// Read a single Unicode character; returns the rune and its size.
func (b *BufRead) ReadRune() (rune int, size int, err *os.Error) {
for b.r + utf8.UTFMax > b.w && !utf8.FullRune(b.buf[b.r:b.w]) {
n := b.w - b.r;
b.Fill();
if b.err != nil {
return 0, 0, b.err
}
if b.w - b.r == n {
// no bytes read
if b.r == b.w {
return 0, 0, EndOfFile
}
break;
}
}
rune, size = int(b.buf[b.r]), 1;
if rune >= 0x80 {
rune, size = utf8.DecodeRune(b.buf[b.r:b.w]);
}
b.r += size;
return rune, size, nil
}
// Helper function: look for byte c in array p,
// returning its index or -1.
func FindByte(p *[]byte, c byte) int {

1
src/lib/utf8.go
View File

@ -7,7 +7,6 @@
package utf8
export const (
UTFMax = 4;
RuneError = 0xFFFD;
RuneSelf = 0x80;
RuneMax = 1<<21 - 1;