Specify error message when trying to lookup value of an unexported field

Author: hoisie

mustache.go

@@ -369,13 +369,13 @@ func call(v reflect.Value, method reflect.Method) reflect.Value {
 
 // Evaluate interfaces and pointers looking for a value that can look up the name, via a
 // struct field, method, or map key, and return the result of the lookup.
-func lookup(contextChain *vector.Vector, name string) (reflect.Value) {
+func lookup(contextChain *vector.Vector, name string) reflect.Value {
     defer func() {
         if r := recover(); r != nil {
-            fmt.Printf("Panic while looking up %s - %s", name, r)
+            fmt.Printf("Panic while looking up %q: %s\n", name, r)
         }
     }()
-    
+
 Outer:
     for i := contextChain.Len() - 1; i >= 0; i-- {
         v := contextChain.At(i).(reflect.Value)
@@ -491,6 +491,12 @@ func renderElement(element interface{}, contextChain *vector.Vector, buf io.Writ
     case *textElement:
         buf.Write(elem.text)
     case *varElement:
+        defer func() {
+            if r := recover(); r != nil {
+                fmt.Printf("Panic while looking up %q: %s\n", elem.name, r)
+            }
+        }()
+
         val := lookup(contextChain, elem.name)
         if val.IsValid() {
             if elem.raw {

mustache_test.go

@@ -15,8 +15,8 @@ type Test struct {
 }
 
 type Data struct {
-    a   bool
-    b   string
+    A   bool
+    B   string
 }
 
 type User struct {
@@ -48,7 +48,6 @@ func (u *User) Func5() (*settings, os.Error) {
     return &settings{true}, nil
 }
 
-
 func (u *User) Func6() (*vector.Vector, os.Error) {
     var v vector.Vector
     v.Push(&settings{true})
@@ -72,6 +71,7 @@ func makeVector(n int) *vector.Vector {
 }
 
 var tests = []Test{
+
     {`hello world`, nil, "hello world"},
     {`hello {{name}}`, map[string]string{"name": "world"}, "hello world"},
     {`{{var}}`, map[string]string{"var": "5 > 2"}, "5 > 2"},
@@ -89,21 +89,21 @@ var tests = []Test{
     {`{{#has}}{{/has}}`, &User{"Mike", 1}, ""},
 
     //section tests
-    {`{{#a}}{{b}}{{/a}}`, Data{true, "hello"}, "hello"},
-    {`{{#a}}{{{b}}}{{/a}}`, Data{true, "5 > 2"}, "5 > 2"},
-    {`{{#a}}{{b}}{{/a}}`, Data{true, "5 > 2"}, "5 > 2"},
-    {`{{#a}}{{b}}{{/a}}`, Data{false, "hello"}, ""},
+    {`{{#A}}{{B}}{{/A}}`, Data{true, "hello"}, "hello"},
+    {`{{#A}}{{{B}}}{{/A}}`, Data{true, "5 > 2"}, "5 > 2"},
+    {`{{#A}}{{B}}{{/A}}`, Data{true, "5 > 2"}, "5 > 2"},
+    {`{{#A}}{{B}}{{/A}}`, Data{false, "hello"}, ""},
     {`{{a}}{{#b}}{{b}}{{/b}}{{c}}`, map[string]string{"a": "a", "b": "b", "c": "c"}, "abc"},
-    {`{{#a}}{{b}}{{/a}}`, struct {
-        a []struct {
-            b string
+    {`{{#A}}{{B}}{{/A}}`, struct {
+        A []struct {
+            B string
         }
     }{[]struct {
-        b string
+        B string
     }{{"a"}, {"b"}, {"c"}}},
         "abc",
     },
-    {`{{#a}}{{b}}{{/a}}`, struct{ a []map[string]string }{[]map[string]string{{"b": "a"}, {"b": "b"}, {"b": "c"}}}, "abc"},
+    {`{{#A}}{{b}}{{/A}}`, struct{ A []map[string]string }{[]map[string]string{{"b": "a"}, {"b": "b"}, {"b": "c"}}}, "abc"},
 
     {`{{#users}}{{Name}}{{/users}}`, map[string]interface{}{"users": []User{{"Mike", 1}}}, "Mike"},
 
@@ -184,14 +184,13 @@ func TestSectionPartial(t *testing.T) {
 }
 
 func TestMultiContext(t *testing.T) {
-    output := Render(`{{hello}} {{world}}`, map[string]string{"hello": "hello"}, struct{ world string }{"world"})
-    output2 := Render(`{{hello}} {{world}}`, struct{ world string }{"world"}, map[string]string{"hello": "hello"})
+    output := Render(`{{hello}} {{World}}`, map[string]string{"hello": "hello"}, struct{ World string }{"world"})
+    output2 := Render(`{{hello}} {{World}}`, struct{ World string }{"world"}, map[string]string{"hello": "hello"})
     if output != "hello world" || output2 != "hello world" {
         t.Fatalf("TestMultiContext expected %q got %q", "hello world", output)
     }
 }
 
-
 var malformed = []Test{
     {`{{#a}}{{}}{{/a}}`, Data{true, "hello"}, "empty tag"},
     {`{{}}`, nil, "empty tag"},