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

treat "" as empty

Browse Source 
R=r
DELTA=10  (10 added, 0 deleted, 0 changed)
OCL=27479
CL=27481
This commit is contained in:
Russ Cox 2009-04-15 00:26:49 -07:00
parent 816f5b3124
commit 19692beee8
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,6 +308,8 @@ func empty(v reflect.Value, indirect_ok bool) bool {
return true return true
} }
switch v.Type().Kind() { switch v.Type().Kind() {
case reflect.StringKind:
return v.(reflect.StringValue).Get() == "";
case reflect.StructKind: case reflect.StructKind:
return false; return false;
case reflect.ArrayKind: case reflect.ArrayKind:

12
src/lib/template/template_test.go
View File

@ -29,6 +29,7 @@ type S struct {
data []T; data []T;
pdata []*T; pdata []*T;
empty []*T; empty []*T;
emptystring string;
null []*T; null []*T;
} }
@ -162,14 +163,21 @@ var tests = []*Test {
"HEADER=78\n" "HEADER=78\n"
"Header=77\n" "Header=77\n"
}, },
&Test{ &Test{
"{raw}\n" "{raw}\n"
"{raw|html}\n", "{raw|html}\n",
"&<>!@ #$%^\n" "&<>!@ #$%^\n"
"&amp;&lt;&gt;!@ #$%^\n" "&amp;&lt;&gt;!@ #$%^\n"
}, },
&Test{
"{.section emptystring}emptystring{.end}\n"
"{.section header}header{.end}\n",
"\nheader\n"
},
} }
func TestAll(t *testing.T) { func TestAll(t *testing.T) {