Merge pull request #89 from dtolnay/floatdot

dtolnay · web-flow · commit 0ddbeab0e30d · 2025-01-05T13:58:22.000-08:00
Avoid trailing '.' on non-macro float literals
diff --git a/src/lit.rs b/src/lit.rs
@@ -44,7 +44,12 @@ impl Printer {
     }
 
     fn lit_float(&mut self, lit: &LitFloat) {
-        self.word(lit.token().to_string());
+        let repr = lit.token().to_string();
+        let dot = repr.ends_with('.');
+        self.word(repr);
+        if dot {
+            self.word("0");
+        }
     }
 
     fn lit_bool(&mut self, lit: &LitBool) {
diff --git a/src/mac.rs b/src/mac.rs
@@ -179,6 +179,7 @@ impl Printer {
                 (_, Token::Ident(ident)) if !is_keyword(ident) => {
                     (state != Dot && state != Colon2, Ident)
                 }
+                (_, Token::Literal(lit)) if lit.to_string().ends_with('.') => (state != Dot, Other),
                 (_, Token::Literal(_)) => (state != Dot, Ident),
                 (_, Token::Punct(',' | ';', _)) => (false, Other),
                 (_, Token::Punct('.', _)) if !matcher => (state != Ident && state != Delim, Dot),

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,12 @@ impl Printer {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`fn lit_float(&mut self, lit: &LitFloat) {`
`47`		`- self.word(lit.token().to_string());`
	`47`	`+ let repr = lit.token().to_string();`
	`48`	`+ let dot = repr.ends_with('.');`
	`49`	`+ self.word(repr);`
	`50`	`+ if dot {`
	`51`	`+ self.word("0");`
	`52`	`+ }`
`48`	`53`	`}`
`49`	`54`
`50`	`55`	`fn lit_bool(&mut self, lit: &LitBool) {`
Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@ impl Printer {`
`179`	`179`	`(_, Token::Ident(ident)) if !is_keyword(ident) => {`
`180`	`180`	`(state != Dot && state != Colon2, Ident)`
`181`	`181`	`}`
	`182`	`+ (_, Token::Literal(lit)) if lit.to_string().ends_with('.') => (state != Dot, Other),`
`182`	`183`	`(_, Token::Literal(_)) => (state != Dot, Ident),`
`183`	`184`	`(_, Token::Punct(',' \| ';', _)) => (false, Other),`
`184`	`185`	`(_, Token::Punct('.', _)) if !matcher => (state != Ident && state != Delim, Dot),`