Merge pull request #8 from goinsane/develop

v1.1.1

Author: orkunkaraduman

erf.go

@@ -76,21 +76,9 @@ func (e *Erf) Format(f fmt.State, verb rune) {
 				format += string(r)
 			}
 		}
-		pad, wid, prec := byte('\t'), 0, 1
-		if f.Flag(' ') {
-			pad = ' '
-			prec = 2
-		}
-		if w, ok := f.Width(); ok {
-			wid = w
-		}
-		if p, ok := f.Precision(); ok {
-			prec = p
-		}
-		format += fmt.Sprintf("%d.%d", wid, prec)
-		format += "s"
-		padding := bytes.Repeat([]byte{pad}, wid)
-		indent := bytes.Repeat([]byte{pad}, prec)
+		pad, wid, prec := getPadWidPrec(f)
+		format += fmt.Sprintf("%d.%ds", wid, prec)
+		padding, indent := bytes.Repeat([]byte{pad}, wid), bytes.Repeat([]byte{pad}, prec)
 		count := 0
 		for err := error(e); err != nil; {
 			if e2, ok := err.(*Erf); ok {
@@ -108,6 +96,7 @@ func (e *Erf) Format(f fmt.State, verb rune) {
 				}
 				buf.WriteString(fmt.Sprintf(format, e2.StackTrace()))
 				buf.WriteRune('\n')
+				buf.Write(padding)
 				if verb == 'X' {
 					break
 				}

examples/example1.go

@@ -65,7 +65,7 @@ func main() {
 		fmt.Printf("%#x\n", err)
 	}
 
-	fmt.Println("#### Foo: show with stack trace with 2 whitespace chars of padding and 1 whitespace char of indent")
+	fmt.Println("#### Foo: show with stack trace (padding 2, indent 1)")
 	if err := Foo(-6); err != nil {
 		fmt.Printf("%2.1x\n", err)
 	}
@@ -75,18 +75,24 @@ func main() {
 		fmt.Printf("%x\n", err)
 	}
 
+	fmt.Println("#### Bar: show wrapped error with stack trace (padding 2, indent 1)")
+	if err := Foo(-8); err != nil {
+		err = erf.Wrap(err)
+		fmt.Printf("%2.1x\n", err)
+	}
+
 	fmt.Println("#### Baz: show with stack trace")
-	if err := Baz(-8); err != nil {
+	if err := Baz(-9); err != nil {
 		fmt.Printf("%x\n", err)
 	}
 
 	fmt.Println("#### Baz: just show all of stack traces of errors")
-	if err := Baz(-9); err != nil {
+	if err := Baz(-10); err != nil {
 		fmt.Printf("%-x\n", err)
 	}
 
 	fmt.Println("#### Baz: just show the stack trace of the first error")
-	if err := Baz(-10); err != nil {
+	if err := Baz(-11); err != nil {
 		fmt.Printf("%-X\n", err)
 	}
 }

stack.go

@@ -50,19 +50,8 @@ func (c StackCaller) Format(f fmt.State, verb rune) {
 			buf.WriteString(fmt.Sprintf("%s(%#x)", fn, c.Entry))
 			break
 		}
-		pad, wid, prec := byte('\t'), 0, 1
-		if f.Flag(' ') {
-			pad = ' '
-			prec = 2
-		}
-		if w, ok := f.Width(); ok {
-			wid = w
-		}
-		if p, ok := f.Precision(); ok {
-			prec = p
-		}
-		padding := bytes.Repeat([]byte{pad}, wid)
-		indent := bytes.Repeat([]byte{pad}, prec)
+		pad, wid, prec := getPadWidPrec(f)
+		padding, indent := bytes.Repeat([]byte{pad}, wid), bytes.Repeat([]byte{pad}, prec)
 		buf.Write(padding)
 		buf.WriteString(fmt.Sprintf("%s(%#x)", fn, c.Entry))
 		buf.WriteRune('\n')
@@ -146,13 +135,8 @@ func (t *StackTrace) Format(f fmt.State, verb rune) {
 				format += string(r)
 			}
 		}
-		if w, ok := f.Width(); ok {
-			format += fmt.Sprintf("%d", w)
-		}
-		if p, ok := f.Precision(); ok {
-			format += fmt.Sprintf(".%d", p)
-		}
-		format += "s"
+		_, wid, prec := getPadWidPrec(f)
+		format += fmt.Sprintf("%d.%ds", wid, prec)
 		for i, c := range t.callers {
 			if i > 0 {
 				buf.WriteRune('\n')

utils.go

@@ -1,6 +1,7 @@
 package erf
 
 import (
+	"fmt"
 	"go/build"
 	"os"
 	"strings"
@@ -27,3 +28,18 @@ func trimDirs(s string) string {
 	}
 	return s
 }
+
+func getPadWidPrec(f fmt.State) (pad byte, wid, prec int) {
+	pad, wid, prec = byte('\t'), 0, 1
+	if f.Flag(' ') {
+		pad = ' '
+		prec = 2
+	}
+	if w, ok := f.Width(); ok {
+		wid = w
+	}
+	if p, ok := f.Precision(); ok {
+		prec = p
+	}
+	return
+}