Improve debugging output

1 files changed, 7 insertions, 8 deletions

diff --git a/debugon.go b/debugon.go
index 60efe60..302b0ec 100644
--- a/debugon.go
+++ b/debugon.go
@@ -44,16 +44,13 @@ func (dp *debugParser) logf(ps *State, result *Result, format string, args ...in
 	buf.WriteString(fmt.Sprintf("%"+strconv.Itoa(longestLocation)+"s | ", dp.Location))
 	buf.WriteString(fmt.Sprintf("%-15s", ps.Preview(15)))
 	buf.WriteString(" | ")
-	output := ""
+	buf.WriteString(strings.Repeat("  ", len(activeParsers)-1))
+	buf.WriteString(fmt.Sprintf(format, args...))
 	if ps.Errored() {
-		output = "fail"
+		buf.WriteString(fmt.Sprintf(" did not find %s", ps.Error.expected))
 	} else if result != nil {
-		output = result.Token
+		buf.WriteString(fmt.Sprintf(" found %s", result.String()))
 	}
-	buf.WriteString(fmt.Sprintf("%-10s | ", output))
-	buf.WriteString(strings.Repeat("  ", len(activeParsers)-1))
-	buf.WriteString(fmt.Sprintf(format, args...))
-	buf.WriteString(fmt.Sprintf(" > %#v", result))
 	buf.WriteRune('\n')
 	return buf.String()
 }
@@ -64,7 +61,7 @@ func (dp *debugParser) logStart(ps *State) {
 			fmt.Fprint(log, pendingOpenLog)
 			pendingOpenLog = ""
 		}
-		pendingOpenLog = dp.logf(ps, nil, dp.Name())
+		pendingOpenLog = dp.logf(ps, nil, dp.Name()+" {")
 	}
 }
 
@@ -73,6 +70,8 @@ func (dp *debugParser) logEnd(ps *State, result *Result) {
 		if pendingOpenLog != "" {
 			fmt.Fprintf(log, dp.logf(ps, result, dp.Name()))
 			pendingOpenLog = ""
+		} else {
+			fmt.Fprintf(log, dp.logf(ps, result, "}"))
 		}
 	}
 }