Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Step 1 of the Big Error Shift: make os.Error an interface and replace *os.Errors with os.Errors.

Browse source 
lib/template updated to use new setup; its clients also updated.

Step 2 will make os's error support internally much cleaner.

R=rsc
OCL=27586
CL=27586
This commit is contained in:
Rob Pike 2009-04-17 00:08:24 -07:00
parent 3ea8d854a3
commit aaf63f8d06
57 changed files with 341 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/lib/xml.go
View file

@ -175,26 +175,26 @@ type Builder interface {
// <name attr.name=attr.value attr1.name=attr1.value ... />
// xmlns and xmlns:foo attributes are handled internally
// and not passed through to StartElement.
StartElement(name Name, attr []Attr) *os.Error;
StartElement(name Name, attr []Attr) os.Error;
// Called when an element ends.
// </name>
// <name ... />
EndElement(name Name) *os.Error;
EndElement(name Name) os.Error;
// Called for non-empty character data string inside element.
// Can be called multiple times between elements.
// text
// <![CDATA[text]]>
Text(text []byte) *os.Error;
Text(text []byte) os.Error;
// Called when a comment is found in the XML.
// <!-- text -->
Comment(text []byte) *os.Error;
Comment(text []byte) os.Error;
// Called for a processing instruction
// <?target text?>
ProcInst(target string, text []byte) *os.Error;
ProcInst(target string, text []byte) os.Error;
}
// Default builder. Implements no-op Builder methods.
@ -203,28 +203,28 @@ type Builder interface {
type BaseBuilder struct {
}
func (b *BaseBuilder) StartElement(name Name, attr []Attr) *os.Error {
func (b *BaseBuilder) StartElement(name Name, attr []Attr) os.Error {
return nil;
}
func (b *BaseBuilder) EndElement(name Name) *os.Error {
func (b *BaseBuilder) EndElement(name Name) os.Error {
return nil;
}
func (b *BaseBuilder) Text(text []byte) *os.Error {
func (b *BaseBuilder) Text(text []byte) os.Error {
return nil;
}
func (b *BaseBuilder) Comment(text []byte) *os.Error {
func (b *BaseBuilder) Comment(text []byte) os.Error {
return nil;
}
func (b *BaseBuilder) ProcInst(target string, text []byte) *os.Error {
func (b *BaseBuilder) ProcInst(target string, text []byte) os.Error {
return nil;
}
// XML Parser. Calls Builder methods as it parses.
func Parse(r io.Read, b Builder) *os.Error {
func Parse(r io.Read, b Builder) os.Error {
return os.NewError("unimplemented");
}
@ -252,12 +252,12 @@ type Token struct {
Attr []Attr; // attributes (TokenStartElement)
Target string; // target (TokenProcessingInstruction)
Text []byte; // text (TokenCharData, TokenComment, etc.)
Err *os.Error; // error (TokenEnd)
Err os.Error; // error (TokenEnd)
}
type ChanBuilder chan Token;
func (c ChanBuilder) StartElement(name Name, attr []Attr) *os.Error {
func (c ChanBuilder) StartElement(name Name, attr []Attr) os.Error {
var t Token;
t.Kind = TokenStartElement;
t.Name = name;
@ -266,7 +266,7 @@ func (c ChanBuilder) StartElement(name Name, attr []Attr) *os.Error {
return nil;
}
func (c ChanBuilder) EndElement(name Name) *os.Error {
func (c ChanBuilder) EndElement(name Name) os.Error {
var t Token;
t.Kind = TokenEndElement;
t.Name = name;
@ -274,7 +274,7 @@ func (c ChanBuilder) EndElement(name Name) *os.Error {
return nil;
}
func (c ChanBuilder) Text(text []byte) *os.Error {
func (c ChanBuilder) Text(text []byte) os.Error {
var t Token;
t.Kind = TokenText;
t.Text = text;
@ -282,7 +282,7 @@ func (c ChanBuilder) Text(text []byte) *os.Error {
return nil;
}
func (c ChanBuilder) Comment(text []byte) *os.Error {
func (c ChanBuilder) Comment(text []byte) os.Error {
var t Token;
t.Kind = TokenComment;
t.Text = text;
@ -290,7 +290,7 @@ func (c ChanBuilder) Comment(text []byte) *os.Error {
return nil;
}
func (c ChanBuilder) ProcInst(target string, text []byte) *os.Error {
func (c ChanBuilder) ProcInst(target string, text []byte) os.Error {
var t Token;
t.Kind = TokenProcInst;
t.Target = target;