qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 22:57:57 -07:00
Code Releases Activity

big: update for fmt interface changes

Browse Source 
Nothing terribly interesting here.

R=gri
CC=golang-dev
https://golang.org/cl/5305046
This commit is contained in:
Russ Cox 2011-10-25 22:21:49 -07:00
parent 4e4eca2618
commit 0e513317b1
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pkg/big/int.go
View File

@ -302,7 +302,7 @@ func (x *Int) String() string {
return x.abs.decimalString() return x.abs.decimalString()
} }
func charset(ch int) string { func charset(ch rune) string {
switch ch { switch ch {
case 'b': case 'b':
return lowercaseDigits[0:2] return lowercaseDigits[0:2]
@ -339,7 +339,7 @@ func writeMultiple(s fmt.State, text string, count int) {
// output field width, space or zero padding, and left or // output field width, space or zero padding, and left or
// right justification. // right justification.
// //
func (x *Int) Format(s fmt.State, ch int) { func (x *Int) Format(s fmt.State, ch rune) {
cs := charset(ch) cs := charset(ch)
// special cases // special cases
@ -460,7 +460,7 @@ func (z *Int) scan(r io.RuneScanner, base int) (*Int, int, os.Error) {
// Scan is a support routine for fmt.Scanner; it sets z to the value of // Scan is a support routine for fmt.Scanner; it sets z to the value of
// the scanned number. It accepts the formats 'b' (binary), 'o' (octal), // the scanned number. It accepts the formats 'b' (binary), 'o' (octal),
// 'd' (decimal), 'x' (lowercase hexadecimal), and 'X' (uppercase hexadecimal). // 'd' (decimal), 'x' (lowercase hexadecimal), and 'X' (uppercase hexadecimal).
func (z *Int) Scan(s fmt.ScanState, ch int) os.Error { func (z *Int) Scan(s fmt.ScanState, ch rune) os.Error {
s.SkipSpace() // skip leading space characters s.SkipSpace() // skip leading space characters
base := 0 base := 0
switch ch { switch ch {

8
src/pkg/big/nat.go
View File

@ -589,15 +589,15 @@ func (x nat) bitLen() int {
// MaxBase is the largest number base accepted for string conversions. // MaxBase is the largest number base accepted for string conversions.
const MaxBase = 'z' - 'a' + 10 + 1 // = hexValue('z') + 1 const MaxBase = 'z' - 'a' + 10 + 1 // = hexValue('z') + 1
func hexValue(ch int) Word { func hexValue(ch rune) Word {
d := MaxBase + 1 // illegal base d := MaxBase + 1 // illegal base
switch { switch {
case '0' <= ch && ch <= '9': case '0' <= ch && ch <= '9':
d = ch - '0' d = int(ch - '0')
case 'a' <= ch && ch <= 'z': case 'a' <= ch && ch <= 'z':
d = ch - 'a' + 10 d = int(ch - 'a' + 10)
case 'A' <= ch && ch <= 'Z': case 'A' <= ch && ch <= 'Z':
d = ch - 'A' + 10 d = int(ch - 'A' + 10)
} }
return Word(d) return Word(d)
} }

2
src/pkg/big/nat_test.go
View File

@ -231,7 +231,7 @@ var natScanTests = []struct {
x nat // expected nat x nat // expected nat
b int // expected base b int // expected base
ok bool // expected success ok bool // expected success
next int // next character (or 0, if at EOF) next rune // next character (or 0, if at EOF)
}{ }{
// error: illegal base // error: illegal base
{base: -1}, {base: -1},

4
src/pkg/big/rat.go
View File

@ -249,13 +249,13 @@ func (z *Rat) Quo(x, y *Rat) *Rat {
return z.norm() return z.norm()
} }
func ratTok(ch int) bool { func ratTok(ch rune) bool {
return strings.IndexRune("+-/0123456789.eE", ch) >= 0 return strings.IndexRune("+-/0123456789.eE", ch) >= 0
} }
// Scan is a support routine for fmt.Scanner. It accepts the formats // Scan is a support routine for fmt.Scanner. It accepts the formats
// 'e', 'E', 'f', 'F', 'g', 'G', and 'v'. All formats are equivalent. // 'e', 'E', 'f', 'F', 'g', 'G', and 'v'. All formats are equivalent.
func (z *Rat) Scan(s fmt.ScanState, ch int) os.Error { func (z *Rat) Scan(s fmt.ScanState, ch rune) os.Error {
tok, err := s.Token(true, ratTok) tok, err := s.Token(true, ratTok)
if err != nil { if err != nil {
return err return err