Merge pull request #48 from nix-community/float-starting-with-dot

Floats without trailing zeros (e.g. `.5`) are valid Nix code
nix-community · Nov 10, 2021 · fa6ddde · fa6ddde
2 parents c917751 + a168ecb
commit fa6ddde
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/src/tokenizer.rs b/src/tokenizer.rs
@@ -309,7 +309,14 @@ impl<'a> Iterator for Tokenizer<'a> {
             '@' => Some((TOKEN_AT, self.string_since(start))),
             ':' => Some((TOKEN_COLON, self.string_since(start))),
             ',' => Some((TOKEN_COMMA, self.string_since(start))),
-            '.' => Some((TOKEN_DOT, self.string_since(start))),
+            '.' => {
+                if self.peek().map(|x| x >= '0' && x <= '9').unwrap_or(false) {
+                    self.consume(|c| c >= '0' && c <= '9');
+                    Some((TOKEN_FLOAT, self.string_since(start)))
+                } else {
+                    Some((TOKEN_DOT, self.string_since(start)))
+                }
+            },
             '=' => Some((TOKEN_ASSIGN, self.string_since(start))),
             '?' => Some((TOKEN_QUESTION, self.string_since(start))),
             ';' => Some((TOKEN_SEMICOLON, self.string_since(start))),
@@ -486,6 +493,16 @@ mod tests {
                 (TOKEN_CURLY_B_CLOSE, "}"),
             ],
         );
+        assert_eq!(
+            tokenize(".5 + 0.5"),
+            tokens![
+                (TOKEN_FLOAT, ".5"),
+                (TOKEN_WHITESPACE, " "),
+                (TOKEN_ADD, "+"),
+                (TOKEN_WHITESPACE, " "),
+                (TOKEN_FLOAT, "0.5"),
+            ],
+        );
         assert_eq!(
             tokenize("{ scientific = 1.1e4; uppercase = 123.4E-2; }"),
             tokens![