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

a few small cleanups

Browse Source 
R=rsc
DELTA=21  (2 added, 2 deleted, 17 changed)
OCL=24638
CL=24654
This commit is contained in:
Rob Pike 2009-02-08 10:17:23 -08:00
parent 9526f3b841
commit 6506148850
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/go_tutorial.txt
View File

@ -661,7 +661,7 @@ etc., there are also "Fprintf" etc. Unlike in C, "Fprintf"'s first argument is
not a file. Instead, it is a variable of type "io.Write", which is an not a file. Instead, it is a variable of type "io.Write", which is an
interface type defined in the "io" library: interface type defined in the "io" library:
export type Write interface { type Write interface {
Write(p []byte) (n int, err *os.Error); Write(p []byte) (n int, err *os.Error);
} }

4
src/lib/log_test.go
View File

@ -51,6 +51,8 @@ func testLog(t *testing.T, flag int, prefix string, pattern string, useLogf bool
if err1 != nil { if err1 != nil {
t.Fatal("pipe", err1); t.Fatal("pipe", err1);
} }
defer fd0.Close();
defer fd1.Close();
buf := bufio.NewBufRead(fd0); buf := bufio.NewBufRead(fd0);
l := NewLogger(fd1, nil, prefix, flag); l := NewLogger(fd1, nil, prefix, flag);
if useLogf { if useLogf {
@ -70,8 +72,6 @@ func testLog(t *testing.T, flag int, prefix string, pattern string, useLogf bool
if !matched { if !matched {
t.Errorf("log output should match %q is %q", pattern, line); t.Errorf("log output should match %q is %q", pattern, line);
} }
fd0.Close();
fd1.Close();
} }
func TestAllLog(t *testing.T) { func TestAllLog(t *testing.T) {

32
src/lib/regexp/regexp.go
View File

@ -37,15 +37,15 @@ type instr interface {
} }
// Fields and methods common to all instructions // Fields and methods common to all instructions
type _Common struct { type common struct {
next instr; next instr;
index int; index int;
} }
func (c *_Common) Next() instr { return c.next } func (c *common) Next() instr { return c.next }
func (c *_Common) SetNext(i instr) { c.next = i } func (c *common) SetNext(i instr) { c.next = i }
func (c *_Common) Index() int { return c.index } func (c *common) Index() int { return c.index }
func (c *_Common) SetIndex(i int) { c.index = i } func (c *common) SetIndex(i int) { c.index = i }
type _RE struct { type _RE struct {
expr string; // the original expression expr string; // the original expression
@ -73,7 +73,7 @@ const (
// --- START start of program // --- START start of program
type _Start struct { type _Start struct {
_Common common
} }
func (start *_Start) Type() int { return _START } func (start *_Start) Type() int { return _START }
@ -81,7 +81,7 @@ func (start *_Start) Print() { print("start") }
// --- END end of program // --- END end of program
type _End struct { type _End struct {
_Common common
} }
func (end *_End) Type() int { return _END } func (end *_End) Type() int { return _END }
@ -89,7 +89,7 @@ func (end *_End) Print() { print("end") }
// --- BOT beginning of text // --- BOT beginning of text
type _Bot struct { type _Bot struct {
_Common common
} }
func (bot *_Bot) Type() int { return _BOT } func (bot *_Bot) Type() int { return _BOT }
@ -97,7 +97,7 @@ func (bot *_Bot) Print() { print("bot") }
// --- EOT end of text // --- EOT end of text
type _Eot struct { type _Eot struct {
_Common common
} }
func (eot *_Eot) Type() int { return _EOT } func (eot *_Eot) Type() int { return _EOT }
@ -105,7 +105,7 @@ func (eot *_Eot) Print() { print("eot") }
// --- CHAR a regular character // --- CHAR a regular character
type _Char struct { type _Char struct {
_Common; common;
char int; char int;
} }
@ -121,7 +121,7 @@ func newChar(char int) *_Char {
// --- CHARCLASS [a-z] // --- CHARCLASS [a-z]
type _CharClass struct { type _CharClass struct {
_Common; common;
char int; char int;
negate bool; // is character class negated? ([^a-z]) negate bool; // is character class negated? ([^a-z])
// array of int, stored pairwise: [a-z] is (a,z); x is (x,x): // array of int, stored pairwise: [a-z] is (a,z); x is (x,x):
@ -171,7 +171,7 @@ func newCharClass() *_CharClass {
// --- ANY any character // --- ANY any character
type _Any struct { type _Any struct {
_Common common
} }
func (any *_Any) Type() int { return _ANY } func (any *_Any) Type() int { return _ANY }
@ -179,7 +179,7 @@ func (any *_Any) Print() { print("any") }
// --- BRA parenthesized expression // --- BRA parenthesized expression
type _Bra struct { type _Bra struct {
_Common; common;
n int; // subexpression number n int; // subexpression number
} }
@ -188,7 +188,7 @@ func (bra *_Bra) Print() { print("bra", bra.n); }
// --- EBRA end of parenthesized expression // --- EBRA end of parenthesized expression
type _Ebra struct { type _Ebra struct {
_Common; common;
n int; // subexpression number n int; // subexpression number
} }
@ -197,7 +197,7 @@ func (ebra *_Ebra) Print() { print("ebra ", ebra.n); }
// --- ALT alternation // --- ALT alternation
type _Alt struct { type _Alt struct {
_Common; common;
left instr; // other branch left instr; // other branch
} }
@ -206,7 +206,7 @@ func (alt *_Alt) Print() { print("alt(", alt.left.Index(), ")"); }
// --- NOP no operation // --- NOP no operation
type _Nop struct { type _Nop struct {
_Common common
} }
func (nop *_Nop) Type() int { return _NOP } func (nop *_Nop) Type() int { return _NOP }