caddyfile: Support for raw token values, improve map, expression
#4643
Conversation
francislavoie
force-pushed
the
better-caddyfile-quotes
branch
2 times, most recently
from
7a548b8
to
41d1f56
Compare
francislavoie
force-pushed
the
better-caddyfile-quotes
branch
from
41d1f56
to
bccb317
Compare
|
No way, Francis, you are a WIZARD. I look forward to reviewing this, hopefully tomorrow |
|
|
||
| // ScalarVal gets value of the current token, converted to the | ||
| // appropriate scalar type. If there is no token loaded, it returns nil. | ||
| func (d *Dispenser) ScalarVal() interface{} { |
There was a problem hiding this comment.
Good name choice, but TypedVal() also came to mind. Not sure which is better. I'm fine with this, but wanted to ask anyway to see what you thought.
There was a problem hiding this comment.
I think Typed would be better if we supported returning somekind of struct, but I think Scalar is clearer that only scalars will be returned (for now)
There was a problem hiding this comment.
Yeah, and that's what I was wondering too, if in the future we'd ever deserialize a string as a structured data type. But I can't see that happening in the near future nor do I have any idea why or what that would look like. So Scalar is fine... hopefully we don't have to change it.
Followup to 93c99f6 as pointed out in caddyserver/website#221, and fixing the issue mentioned in caddyserver/website#220
See the adapt tests, which cover how it behaves.
Note: This is a breaking change, because people using
mapwith numbers used to get strings, and will now get numbers.