Fix statement strings #4878
Fix statement strings #4878
Conversation
| @@ -510,7 +510,7 @@ func (p *Parser) parseUInt64() (uint64, error) { | |||
| // This function assumes the DURATION token has already been consumed. | |||
| func (p *Parser) parseDuration() (time.Duration, error) { | |||
| tok, pos, lit := p.scanIgnoreWhitespace() | |||
| if tok != DURATION_VAL && tok != INF { | |||
| if tok != DURATION_VAL && tok != INF && tok != NUMBER { | |||
There was a problem hiding this comment.
FormatDuration does not print units if it has to print the duration in microseconds.
When that happens, if we parse the statement again, the token parses as a NUMBER instead of a DURATION_VAL.
Now that you've pointed it out and now that I've read the EBNF closer, I see that I should not have changed parseDuration but I should have changed FormatDuration to include units because a duration_lit must have units. Not sure why I thought the unit was optional on a duration_lit – good catch. I'll remove the commit that includes this line, and I'll add a new commit that ensures FormatDuration prints units in the case of microseconds.
There was a problem hiding this comment.
Actually, as I'm digging into this one, I'm seeing conflicting information between the EBNF and what the code does and what the comments say the code should do.
I'm going to remove the commit from this PR and open a separate issue.
mark-rushakoff
force-pushed
the
fix-statement-strings
branch
from
5a62a96
to
94e4709
Compare
|
+1 from me, but this really needs @dgnorton too. |
|
+1 |
This PR mostly adds a lot of missing
QuoteIdentcalls, but there were some other small changes to ensure that a statement can be converted to a string and re-parsed without differing from the original parse result.