go-sylixos/elvish
3
0
Fork 0
mirror of https://github.com/go-sylixos/elvish.git synced 2024-12-13 18:07:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

eval: No Traceback header for one-level Exception.

Browse Source
This commit is contained in:
Qi Xiao 2017-12-18 23:13:41 +00:00
parent 833224eb7d
commit 8ce43fcfa8
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
eval/exception.go
View File

@ -31,19 +31,23 @@ func (exc *Exception) Error() string {
func (exc *Exception) Pprint(indent string) string { func (exc *Exception) Pprint(indent string) string {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
// Error message
var msg string
if pprinter, ok := exc.Cause.(util.Pprinter); ok {
msg = pprinter.Pprint(indent)
} else {
msg = "\033[31;1m" + exc.Cause.Error() + "\033[m"
}
fmt.Fprintf(buf, "Exception: %s\n", msg)
buf.WriteString(indent + "Traceback:")
for tb := exc.Traceback; tb != nil; tb = tb.Next { var causeDescription string
buf.WriteString("\n" + indent + " ") if pprinter, ok := exc.Cause.(util.Pprinter); ok {
tb.Pprint(buf, indent+" ") causeDescription = pprinter.Pprint(indent)
} else {
causeDescription = "\033[31;1m" + exc.Cause.Error() + "\033[m"
}
fmt.Fprintf(buf, "Exception: %s\n", causeDescription)
if exc.Traceback.Next == nil {
exc.Traceback.Pprint(buf, indent+" ")
} else {
buf.WriteString(indent + "Traceback:")
for tb := exc.Traceback; tb != nil; tb = tb.Next {
buf.WriteString("\n" + indent + " ")
tb.Pprint(buf, indent+" ")
}
} }
if pipeExcs, ok := exc.Cause.(PipelineError); ok { if pipeExcs, ok := exc.Cause.(PipelineError); ok {
@ -210,18 +214,18 @@ func (exit ExternalCmdExit) Error() string {
case ws.Exited(): case ws.Exited():
return quotedName + " exited with " + strconv.Itoa(ws.ExitStatus()) return quotedName + " exited with " + strconv.Itoa(ws.ExitStatus())
case ws.Signaled(): case ws.Signaled():
msg := quotedName + " killed by signal " + ws.Signal().String() causeDescription := quotedName + " killed by signal " + ws.Signal().String()
if ws.CoreDump() { if ws.CoreDump() {
msg += " (core dumped)" causeDescription += " (core dumped)"
} }
return msg return causeDescription
case ws.Stopped(): case ws.Stopped():
msg := quotedName + " stopped by signal " + fmt.Sprintf("%s (pid=%d)", ws.StopSignal(), exit.Pid) causeDescription := quotedName + " stopped by signal " + fmt.Sprintf("%s (pid=%d)", ws.StopSignal(), exit.Pid)
trap := ws.TrapCause() trap := ws.TrapCause()
if trap != -1 { if trap != -1 {
msg += fmt.Sprintf(" (trapped %v)", trap) causeDescription += fmt.Sprintf(" (trapped %v)", trap)
} }
return msg return causeDescription
default: default:
return fmt.Sprint(quotedName, " has unknown WaitStatus ", ws) return fmt.Sprint(quotedName, " has unknown WaitStatus ", ws)
} }