format::desktop_entry: Test integer parsing functions

format/desktop_entry/error.ha

@@ -12,6 +12,7 @@ export type syntaxerr = !(
 	invalid_escape       |
 	invalid_boolean      |
 	invalid_numeric      |
+	invalid_integer      |
 	expected_single);
 
 // Returned when a malformed group header is encountered while parsing.
@@ -35,6 +36,10 @@ export type invalid_boolean = !void;
 // was given.
 export type invalid_numeric = !void;
 
+// Returned when a numeric value was expected while parsing, but something else
+// was given.
+export type invalid_integer = !void;
+
 // Returned when a singular value was expected while parsing, but multiple
 // values were given.
 export type expected_single = !void;
@@ -48,6 +53,7 @@ case invalid_ascii          => yield "invalid ascii";
 case invalid_escape         => yield "invalid escape";
 case invalid_boolean        => yield "invalid boolean";
 case invalid_numeric        => yield "invalid numeric";
+case invalid_integer        => yield "invalid integer";
 case expected_single        => yield "expected single";
 case let err: io::error     => yield io::strerror(err);
 case let err: utf8::invalid => yield utf8::strerror(err);

format/desktop_entry/value.ha

@@ -2,7 +2,7 @@ use ascii;
 use strconv;
 use strings;
 
-// TODO icon_theme references an "integer" data type. support that here.
+// TODO numeric should really be f32
 
 // Parses a string value. It may contain all ASCII characters except for control
 // characters. The memory must be freed by the caller.
@@ -56,6 +56,15 @@ case =>
 	yield invalid_numeric;
 };
 
+// Parses an integer value. While there is no documentation on this data type,
+// it is referred to by the Icon Theme Specification, §4, tables 2-3.
+export fn parse_integer(in: str) (int | error) = match(strconv::stoi(in)) {
+case let integer: int => yield integer;
+case =>
+	if (strings::contains(in, ";")) return expected_single;
+	yield invalid_integer;
+};
+
 // Parses multiple string values. See [[parse_string]] for more information. The
 // memory must be freed by the caller.
 // Specification: §4
@@ -125,6 +134,23 @@ export fn parse_numerics(in: str) ([]f64 | error) = {
 	return result;
 };
 
+// Parses multiple integer values. See [[parse_integer]] for more information.
+// The memory must be freed by the caller.
+export fn parse_integers(in: str) ([]int | error) = {
+	let splitte = split(in);
+	let result: []int = alloc([], 0);
+	for (let in => splitter_next(&splitte)) {
+		match (parse_integer(in)) {
+		case let number: int =>
+			append(result, number);
+		case let err: error =>
+			free(result);
+			return err;
+		};
+	};
+	return result;
+};
+
 type string_escaper = []u8;
 
 fn escape_string(in: str) string_escaper = strings::toutf8(in): string_escaper;

format/desktop_entry/value_test.ha

@@ -51,6 +51,14 @@ use strings;
 	assert(parse_numeric("234;7.4") is expected_single);
 };
 
+@test fn parse_integer() void = {
+	assert(parse_integer("9")! == 9);
+	assert(parse_integer("2348")! == 2348);
+	assert(parse_integer("-324")! == -324);
+	assert(parse_integer("324.9") is invalid_integer);
+	assert(parse_integer("324.0") is invalid_integer);
+};
+
 @test fn parse_strings() void = {
 	let correct: []str = [
 		"b\r\tird",
@@ -134,6 +142,28 @@ use strings;
 	assert(parse_numerics(";5;") is invalid_numeric);
 };
 
+@test fn parse_integers() void = {
+	let correct: []int = [
+		5,
+		34,
+		-29,
+		32498,
+	];
+	let got = parse_integers("5;34;-29;32498")!;
+	defer free(got);
+	for (let index = 0z; index < len(correct); index += 1) {
+		assert(index < len(got), "ran out");
+		let correct = correct[index];
+		let got     = got[index];
+		fmt::printf("[{}]\t[{}]\n", correct, got)!;
+		assert(correct == got);
+	};
+	assert(len(got) == len(correct), "not done");
+	assert(parse_integers("hello;world") is invalid_integer);
+	assert(parse_integers("5;;") is invalid_integer);
+	assert(parse_integers(";5;") is invalid_integer);
+};
+
 @test fn string_escaper_next_a() void = {
 	let escaper = escape_string("bird;water;;river;");
 	let correct: []str = [