mirror of
https://github.com/ziglang/zig.git
synced 2025-12-30 18:13:19 +00:00
Part of #19063. Primarily, this moves Aro from deps/ to lib/compiler/ so that it can be lazily compiled from source. src/aro_translate_c.zig is moved to lib/compiler/aro_translate_c.zig and some of Zig CLI logic moved to a main() function there. aro_translate_c.zig becomes the "common" import for clang-based translate-c. Not all of the compiler was able to be detangled from Aro, however, so it still, for now, remains being compiled with the main compiler sources due to the clang-based translate-c depending on it. Once aro-based translate-c achieves feature parity with the clang-based translate-c implementation, the clang-based one can be removed from Zig. Aro made it unnecessarily difficult to depend on with these .def files and all these Zig module requirements. I looked at the .def files and made these observations: - The canonical source is llvm .def files. - Therefore there is an update process to sync with llvm that involves regenerating the .def files in Aro. - Therefore you might as well just regenerate the .zig files directly and check those into Aro. - Also with a small amount of tinkering, the file size on disk of these generated .zig files can be made many times smaller, without compromising type safety in the usage of the data. This would make things much easier on Zig as downstream project, particularly we could remove those pesky stubs when bootstrapping. I have gone ahead with these changes since they unblock me and I will have a chat with Vexu to see what he thinks.
154 lines
4.2 KiB
Zig
Vendored
154 lines
4.2 KiB
Zig
Vendored
//! Sparsely populated list of used indexes.
|
|
//! Used for detecting duplicate initializers.
|
|
const std = @import("std");
|
|
const Allocator = std.mem.Allocator;
|
|
const testing = std.testing;
|
|
const Tree = @import("Tree.zig");
|
|
const Token = Tree.Token;
|
|
const TokenIndex = Tree.TokenIndex;
|
|
const NodeIndex = Tree.NodeIndex;
|
|
const Type = @import("Type.zig");
|
|
const Diagnostics = @import("Diagnostics.zig");
|
|
const NodeList = std.ArrayList(NodeIndex);
|
|
const Parser = @import("Parser.zig");
|
|
|
|
const Item = struct {
|
|
list: InitList = .{},
|
|
index: u64,
|
|
|
|
fn order(_: void, a: Item, b: Item) std.math.Order {
|
|
return std.math.order(a.index, b.index);
|
|
}
|
|
};
|
|
|
|
const InitList = @This();
|
|
|
|
list: std.ArrayListUnmanaged(Item) = .{},
|
|
node: NodeIndex = .none,
|
|
tok: TokenIndex = 0,
|
|
|
|
/// Deinitialize freeing all memory.
|
|
pub fn deinit(il: *InitList, gpa: Allocator) void {
|
|
for (il.list.items) |*item| item.list.deinit(gpa);
|
|
il.list.deinit(gpa);
|
|
il.* = undefined;
|
|
}
|
|
|
|
/// Insert initializer at index, returning previous entry if one exists.
|
|
pub fn put(il: *InitList, gpa: Allocator, index: usize, node: NodeIndex, tok: TokenIndex) !?TokenIndex {
|
|
const items = il.list.items;
|
|
var left: usize = 0;
|
|
var right: usize = items.len;
|
|
|
|
// Append new value to empty list
|
|
if (left == right) {
|
|
const item = try il.list.addOne(gpa);
|
|
item.* = .{
|
|
.list = .{ .node = node, .tok = tok },
|
|
.index = index,
|
|
};
|
|
return null;
|
|
}
|
|
|
|
while (left < right) {
|
|
// Avoid overflowing in the midpoint calculation
|
|
const mid = left + (right - left) / 2;
|
|
// Compare the key with the midpoint element
|
|
switch (std.math.order(index, items[mid].index)) {
|
|
.eq => {
|
|
// Replace previous entry.
|
|
const prev = items[mid].list.tok;
|
|
items[mid].list.deinit(gpa);
|
|
items[mid] = .{
|
|
.list = .{ .node = node, .tok = tok },
|
|
.index = index,
|
|
};
|
|
return prev;
|
|
},
|
|
.gt => left = mid + 1,
|
|
.lt => right = mid,
|
|
}
|
|
}
|
|
|
|
// Insert a new value into a sorted position.
|
|
try il.list.insert(gpa, left, .{
|
|
.list = .{ .node = node, .tok = tok },
|
|
.index = index,
|
|
});
|
|
return null;
|
|
}
|
|
|
|
/// Find item at index, create new if one does not exist.
|
|
pub fn find(il: *InitList, gpa: Allocator, index: u64) !*InitList {
|
|
const items = il.list.items;
|
|
var left: usize = 0;
|
|
var right: usize = items.len;
|
|
|
|
// Append new value to empty list
|
|
if (left == right) {
|
|
const item = try il.list.addOne(gpa);
|
|
item.* = .{
|
|
.list = .{ .node = .none, .tok = 0 },
|
|
.index = index,
|
|
};
|
|
return &item.list;
|
|
}
|
|
|
|
while (left < right) {
|
|
// Avoid overflowing in the midpoint calculation
|
|
const mid = left + (right - left) / 2;
|
|
// Compare the key with the midpoint element
|
|
switch (std.math.order(index, items[mid].index)) {
|
|
.eq => return &items[mid].list,
|
|
.gt => left = mid + 1,
|
|
.lt => right = mid,
|
|
}
|
|
}
|
|
|
|
// Insert a new value into a sorted position.
|
|
try il.list.insert(gpa, left, .{
|
|
.list = .{ .node = .none, .tok = 0 },
|
|
.index = index,
|
|
});
|
|
return &il.list.items[left].list;
|
|
}
|
|
|
|
test "basic usage" {
|
|
const gpa = testing.allocator;
|
|
var il: InitList = .{};
|
|
defer il.deinit(gpa);
|
|
|
|
{
|
|
var i: usize = 0;
|
|
while (i < 5) : (i += 1) {
|
|
const prev = try il.put(gpa, i, .none, 0);
|
|
try testing.expect(prev == null);
|
|
}
|
|
}
|
|
|
|
{
|
|
const failing = testing.failing_allocator;
|
|
var i: usize = 0;
|
|
while (i < 5) : (i += 1) {
|
|
_ = try il.find(failing, i);
|
|
}
|
|
}
|
|
|
|
{
|
|
var item = try il.find(gpa, 0);
|
|
var i: usize = 1;
|
|
while (i < 5) : (i += 1) {
|
|
item = try item.find(gpa, i);
|
|
}
|
|
}
|
|
|
|
{
|
|
const failing = testing.failing_allocator;
|
|
var item = try il.find(failing, 0);
|
|
var i: usize = 1;
|
|
while (i < 5) : (i += 1) {
|
|
item = try item.find(failing, i);
|
|
}
|
|
}
|
|
}
|