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

Rename ParseError to Error

Browse Source 
R=rsc
DELTA=13  (6 added, 1 deleted, 6 changed)
OCL=28743
CL=28746
This commit is contained in:
Rob Pike 2009-05-13 10:01:55 -07:00
parent 98b4f6ac38
commit 52f071ed43
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/template/template.go
View File

@ -57,6 +57,7 @@
package template
import (
"container/vector";
"fmt";
"io";
"os";
@ -64,13 +65,17 @@ import (
"runtime";
"strings";
"template";
"container/vector";
)
// Errors returned during parsing. TODO: different error model for execution?
// Errors returned during parsing and execution. Users may extract the information and reformat
// if they desire.
type Error struct {
Line int;
Msg string;
}
type ParseError struct {
os.ErrorString
func (e *Error) String() string {
return fmt.Sprintf("line %d: %s", e.Line, e.Msg)
}
// Most of the literals are aces.
@ -181,7 +186,7 @@ func New(fmap FormatterMap) *Template {
// Generic error handler, called only from execError or parseError.
func error(errors chan os.Error, line int, err string, args ...) {
errors <- ParseError{os.ErrorString(fmt.Sprintf("line %d: %s", line, fmt.Sprintf(err, args)))};
errors <- &Error{line, fmt.Sprintf(err, args)};
runtime.Goexit();
}
@ -756,7 +761,7 @@ func validDelim(d []byte) bool {
// the error.
func (t *Template) Parse(s string) os.Error {
if !validDelim(t.ldelim) || !validDelim(t.rdelim) {
return ParseError{os.ErrorString(fmt.Sprintf("bad delimiter strings %q %q", t.ldelim, t.rdelim))}
return &Error{1, fmt.Sprintf("bad delimiter strings %q %q", t.ldelim, t.rdelim)}
}
t.buf = io.StringBytes(s);
t.p = 0;