Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog.d/+toml-integer-underscores.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
A site file may write a decimal integer with a single "_" between two
digits, so `1_000` is one thousand. A leading zero, a doubled "_" or a
"_" at either end of the digits stays invalid.
33 changes: 30 additions & 3 deletions src/toml.zig
Original file line number Diff line number Diff line change
Expand Up @@ -341,13 +341,28 @@ const Parser = struct {
return p.fail("{s} is not a value (strings are quoted)", .{word});
}

/// A TOML decimal integer: an optional sign, then one digit, or a
/// non-zero digit followed by digits and single underscores. `1_000`
/// is 1000. `_1`, `1_`, `1__0`, `01` and `0_1` are not integers.
/// Hexadecimal, octal and binary forms stay unsupported.
fn isInteger(word: []const u8) bool {
var digits = word;
if (digits.len > 0 and (digits[0] == '+' or digits[0] == '-')) digits = digits[1..];
if (digits.len == 0) return false;
for (digits) |d| if (!std.ascii.isDigit(d)) return false;
// No leading zeros, as TOML says.
return !(digits.len > 1 and digits[0] == '0');
if (digits.len == 1) return std.ascii.isDigit(digits[0]);
// No leading zero, and an underscore sits between two digits.
if (digits[0] == '0' or digits[0] == '_' or digits[digits.len - 1] == '_') return false;
var underscore = false;
for (digits) |d| {
if (d == '_') {
if (underscore) return false;
underscore = true;
continue;
}
if (!std.ascii.isDigit(d)) return false;
underscore = false;
}
return true;
}

fn array(p: *Parser) Error!Value {
Expand Down Expand Up @@ -560,6 +575,13 @@ test "tables, dotted keys, strings, integers, booleans and arrays" {
const gpu = t.get("profile").?.value.table.get("gpu").?.value.table;
try std.testing.expectEqualStrings("CUDA/13.3.0", gpu.get("dev").?.value.table.get("modules").?.value.array[0].string);
try std.testing.expectEqual(@as(i64, 7), gpu.get("clean").?.value.table.get("logs_older_than_days").?.value.int);
const grouped = try parseOk(arena.allocator(), "a = 1_000\nb = +1_2_3\nc = -1_000\nd = 0\ne = +0\nf = -0\n");
try std.testing.expectEqual(@as(i64, 1000), grouped.get("a").?.value.int);
try std.testing.expectEqual(@as(i64, 123), grouped.get("b").?.value.int);
try std.testing.expectEqual(@as(i64, -1000), grouped.get("c").?.value.int);
try std.testing.expectEqual(@as(i64, 0), grouped.get("d").?.value.int);
try std.testing.expectEqual(@as(i64, 0), grouped.get("e").?.value.int);
try std.testing.expectEqual(@as(i64, 0), grouped.get("f").?.value.int);
try std.testing.expect(gpu.get("keep").?.value.boolean);
try std.testing.expectEqualStrings("tab\there \u{e9}", gpu.get("quoted key").?.value.string);
try std.testing.expectEqual(@as(usize, 10), gpu.get("dev").?.line);
Expand All @@ -582,6 +604,11 @@ test "every refusal names its line" {
try expectInvalid("x = 1 2\n", 1, "after the value");
try expectInvalid("ok = 1\nx = [1 2]\n", 2, "commas");
try expectInvalid("x = 012\n", 1, "not a value");
try expectInvalid("x = 1_\n", 1, "not a value");
try expectInvalid("x = _1\n", 1, "not a value");
try expectInvalid("x = 1__0\n", 1, "not a value");
try expectInvalid("x = 0_1\n", 1, "not a value");
try expectInvalid("x = +\n", 1, "not a value");
try expectInvalid("x = 99999999999999999999\n", 1, "out of range");
try expectInvalid("= 1\n", 1, "cannot start a key");
try expectInvalid("x = '''a'''\n", 1, "multi-line");
Expand Down
34 changes: 34 additions & 0 deletions tests/test_toml_integer_cli.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env python3
"""TOML decimal integers may group digits with a single underscore."""
import unittest

import binary
from test_storage import StorageFixture


@unittest.skipUnless(binary.BIN, "TOML configuration is a feature of the Zig build")
class TomlInteger(StorageFixture):
def setUp(self):
super().setUp()
self.env["LC_ALL"] = "C.UTF-8"
self.env["LANG"] = "C.UTF-8"

def read_days(self, text):
path = self.root / "days.toml"
path.write_text(text)
path.chmod(0o644)
return self.run_wrapper(["config", "--config", str(path), "--get", "clean.logs_older_than_days"])

def test_a_toml_integer_groups_digits_with_underscores(self):
run = self.read_days("[clean]\nlogs_older_than_days = 1_000\n")
self.assertEqual(run.returncode, 0, run.stdout + run.stderr)
self.assertEqual(run.stdout, "1000\n")

def test_a_doubled_underscore_is_not_a_toml_integer(self):
run = self.read_days("[clean]\nlogs_older_than_days = 1__000\n")
self.assertNotEqual(run.returncode, 0, run.stdout)
self.assertIn("is not a value", run.stderr)


if __name__ == "__main__":
unittest.main()
Loading