Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-25 05:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Gets strings working again

Browse Source
This commit is contained in:
Mason Remaley 2024-11-04 19:18:42 -08:00
parent 3bff320d08
commit e99d07a9ad
2 changed files with 57 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/zon.zig
View File

@ -335,37 +335,28 @@ fn expr(self: LowerZon, node: Ast.Node.Index, res_ty: ?Type) !InternPool.Index {
);
},
}
const array_ty = try self.sema.pt.arrayType(.{
const string = try ip.getOrPutString(gpa, self.sema.pt.tid, bytes.items, .maybe_embedded_nulls);
const array_ty = try self.sema.pt.intern(.{ .array_type = .{
.len = bytes.items.len,
.sentinel = .zero_u8,
.child = .u8_type,
});
const array_val = try self.sema.pt.intern(.{ .aggregate = .{
.ty = array_ty.toIntern(),
.storage = .{
.bytes = try ip.getOrPutString(gpa, self.sema.pt.tid, bytes.items, .maybe_embedded_nulls),
},
} });
const ptr_ty = try self.sema.pt.ptrTypeSema(.{
.child = array_ty.toIntern(),
.flags = .{
.alignment = .none,
.is_const = true,
.address_space = .generic,
},
});
_ = array_val;
_ = ptr_ty;
@panic("unimplemented");
// return self.sema.pt.intern(.{ .ptr = .{
// .ty = ptr_ty.toIntern(),
// .base_addr = .{ .anon_decl = .{
// .val = array_val,
// .orig_ty = ptr_ty.toIntern(),
// } },
// .byte_offset = 0,
// } });
const array_val = try self.sema.pt.intern(.{ .aggregate = .{
.ty = array_ty,
.storage = .{ .bytes = string },
} });
return self.sema.pt.intern(.{ .slice = .{
.ty = .slice_const_u8_sentinel_0_type,
.ptr = try self.sema.pt.intern(.{ .ptr = .{
.ty = .manyptr_const_u8_sentinel_0_type,
.base_addr = .{ .uav = .{
.orig_ty = .slice_const_u8_sentinel_0_type,
.val = array_val,
} },
.byte_offset = 0,
} }),
.len = (try self.sema.pt.intValue(Type.usize, bytes.items.len)).toIntern(),
} });
},
.multiline_string_literal => {
var bytes = std.ArrayListUnmanaged(u8){};
@ -377,32 +368,28 @@ fn expr(self: LowerZon, node: Ast.Node.Index, res_ty: ?Type) !InternPool.Index {
try parser.line(self.file.tree.tokenSlice(tok_i));
}
const array_ty = try self.sema.pt.arrayType(.{ .len = bytes.items.len, .sentinel = .zero_u8, .child = .u8_type });
const array_val = try self.sema.pt.intern(.{ .aggregate = .{
.ty = array_ty.toIntern(),
.storage = .{
.bytes = (try ip.getOrPutString(gpa, self.sema.pt.tid, bytes.items, .no_embedded_nulls)).toString(),
},
const string = try ip.getOrPutString(gpa, self.sema.pt.tid, bytes.items, .maybe_embedded_nulls);
const array_ty = try self.sema.pt.intern(.{ .array_type = .{
.len = bytes.items.len,
.sentinel = .zero_u8,
.child = .u8_type,
} });
const array_val = try self.sema.pt.intern(.{ .aggregate = .{
.ty = array_ty,
.storage = .{ .bytes = string },
} });
return self.sema.pt.intern(.{ .slice = .{
.ty = .slice_const_u8_sentinel_0_type,
.ptr = try self.sema.pt.intern(.{ .ptr = .{
.ty = .manyptr_const_u8_sentinel_0_type,
.base_addr = .{ .uav = .{
.orig_ty = .slice_const_u8_sentinel_0_type,
.val = array_val,
} },
.byte_offset = 0,
} }),
.len = (try self.sema.pt.intValue(Type.usize, bytes.items.len)).toIntern(),
} });
const ptr_ty = try self.sema.pt.ptrTypeSema(.{
.child = array_ty.toIntern(),
.flags = .{
.alignment = .none,
.is_const = true,
.address_space = .generic,
},
});
_ = array_val;
_ = ptr_ty;
@panic("unimplemented");
// return self.sema.pt.intern(.{ .ptr = .{
// .ty = ptr_ty.toIntern(),
// .base_addr = .{ .anon_decl = .{
// .val = array_val,
// .orig_ty = ptr_ty.toIntern(),
// } },
// .byte_offset = 0,
// } });
},
.struct_init_one,
.struct_init_one_comma,

40
test/behavior/zon.zig
View File

@ -139,31 +139,27 @@ test "slices, arrays, tuples" {
}
test "string literals" {
return error.SkipZigTest;
// // const foo: [3]u8 = "foo".*;
// // const bar: []const u8 = &foo;
// try expectEqualSlices(u8, "abc", @import("zon/abc.zon"));
// try expectEqualSlices(u8, "ab\\c", @import("zon/abc-escaped.zon"));
// const zero_terminated: [:0]const u8 = @import("zon/abc.zon");
// try expectEqualDeep(zero_terminated, "abc");
// try expectEqualStrings(
// \\Hello, world!
// \\This is a multiline string!
// \\ There are no escapes, we can, for example, include \n in the string
// , @import("zon/multiline_string.zon"));
// try expectEqualStrings("a\nb\x00c", @import("zon/string_embedded_null.zon"));
try expectEqualSlices(u8, "abc", @import("zon/abc.zon"));
try expectEqualSlices(u8, "ab\\c", @import("zon/abc-escaped.zon"));
const zero_terminated: [:0]const u8 = @import("zon/abc.zon");
try expectEqualDeep(zero_terminated, "abc");
try expectEqualStrings(
\\Hello, world!
\\This is a multiline string!
\\ There are no escapes, we can, for example, include \n in the string
, @import("zon/multiline_string.zon"));
try expectEqualStrings("a\nb\x00c", @import("zon/string_embedded_null.zon"));
}
test "enum literals" {
return error.SkipZigTest;
// const Enum = enum {
// foo,
// bar,
// baz,
// @"0\na",
// };
// try expectEqual(Enum.foo, @import("zon/foo.zon"));
// try expectEqual(Enum.@"0\na", @import("zon/escaped_enum.zon"));
const Enum = enum {
foo,
bar,
baz,
@"0\na",
};
try expectEqual(Enum.foo, @import("zon/foo.zon"));
try expectEqual(Enum.@"0\na", @import("zon/escaped_enum.zon"));
}
test "int" {