zig/ink
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: loading stories from source files

Browse source
This commit is contained in:
Brett Broadhurst 2026-03-31 16:42:02 -06:00
parent 01cc996183
commit d9f0a04417
Failed to generate hash of commit
4 changed files with 68 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/main.zig
View file

@ -7,7 +7,6 @@ var stdin_buffer: [4096]u8 align(std.heap.page_size_min) = undefined;
var stdout_buffer: [4096]u8 align(std.heap.page_size_min) = undefined;
var stderr_buffer: [4096]u8 align(std.heap.page_size_min) = undefined;
var debug_allocator: std.heap.DebugAllocator(.{}) = .init;
const max_src_size = std.math.maxInt(u32);
pub fn main() !void {
const gpa = debug_allocator.allocator();
@ -78,7 +77,7 @@ fn mainArgs(
defer if (source_path != null) f.close();
var file_reader: std.fs.File.Reader = f.reader(&stdin_buffer);
break :s readSourceFile(arena, &file_reader) catch |err| {
break :s ink.readSourceFileToEndAlloc(arena, &file_reader) catch |err| {
fatal("unable to load file '{s}': {s}", .{ filename, @errorName(err) });
};
};
@ -89,21 +88,24 @@ fn mainArgs(
const stderr = std.fs.File.stderr();
var stderr_writer = stderr.writer(&stderr_buffer);
var story = Story.loadFromString(gpa, source_bytes, .{
var story = Story.fromSourceBytes(gpa, source_bytes, .{
.filename = filename,
.error_writer = &stderr_writer.interface,
.dump_writer = &stdout_writer.interface,
.use_color = use_color,
.dump_use_color = use_color,
.dump_ast = dump_ast,
.dump_ir = dump_ir,
.dump_trace = dump_trace,
}) catch |err| switch (err) {
//error.LoadFailed => std.process.exit(1),
else => |e| return e,
};
defer story.deinit();
if (dump_trace) {
story.dump_writer = &stderr_writer.interface;
}
if (dump_story) {
try story.dump(&stderr_writer.interface);
try story.dump(&stdout_writer.interface);
}
return if (!compile_only) run(gpa, &story);
}
@ -135,38 +137,3 @@ fn run(_: std.mem.Allocator, story: *Story) !void {
}
}
}
fn readSourceFile(gpa: std.mem.Allocator, file_reader: *std.fs.File.Reader) ![:0]u8 {
var buffer: std.ArrayListUnmanaged(u8) = .empty;
defer buffer.deinit(gpa);
if (file_reader.getSize()) |size| {
const casted_size = std.math.cast(u32, size) orelse return error.StreamTooLong;
try buffer.ensureTotalCapacityPrecise(gpa, casted_size + 1);
} else |_| {}
try file_reader.interface.appendRemaining(gpa, &buffer, .limited(max_src_size));
const unsupported_boms = [_][]const u8{
"\xff\xfe\x00\x00", // UTF-32 little endian
"\xfe\xff\x00\x00", // UTF-32 big endian
"\xfe\xff", // UTF-16 big endian
};
for (unsupported_boms) |bom| {
if (std.mem.startsWith(u8, buffer.items, bom)) {
return error.UnsupportedEncoding;
}
}
if (std.mem.startsWith(u8, buffer.items, "\xff\xfe")) {
if (buffer.items.len % 2 != 0) {
return error.InvalidEncoding;
}
return std.unicode.utf16LeToUtf8AllocZ(gpa, @ptrCast(@alignCast(buffer.items))) catch |err| switch (err) {
error.DanglingSurrogateHalf => error.UnsupportedEncoding,
error.ExpectedSecondSurrogateHalf => error.UnsupportedEncoding,
error.UnexpectedSecondSurrogateHalf => error.UnsupportedEncoding,
else => |e| return e,
};
}
return buffer.toOwnedSliceSentinel(gpa, 0);
}