mirror of
https://github.com/golang/go
synced 2024-09-30 16:18:35 -06:00
allow nil user map
R=r DELTA=5 (3 added, 0 deleted, 2 changed) OCL=27371 CL=27389
This commit is contained in:
parent
a9996d0f89
commit
4011733d3c
@ -48,6 +48,7 @@ const (
|
||||
|
||||
// FormatterMap is the type describing the mapping from formatter
|
||||
// names to the functions that implement them.
|
||||
// TODO(rsc): Maybe func should take interface{} instead?
|
||||
type FormatterMap map[string] func(reflect.Value) string
|
||||
|
||||
// Built-in formatters.
|
||||
@ -446,8 +447,10 @@ func (t *template) evalVariable(name_formatter string) string {
|
||||
}
|
||||
val := t.varValue(name);
|
||||
// is it in user-supplied map?
|
||||
if fn, ok := t.fmap[formatter]; ok {
|
||||
return fn(val)
|
||||
if t.fmap != nil {
|
||||
if fn, ok := t.fmap[formatter]; ok {
|
||||
return fn(val)
|
||||
}
|
||||
}
|
||||
// is it in builtin map?
|
||||
if fn, ok := builtins[formatter]; ok {
|
||||
|
Loading…
Reference in New Issue
Block a user