srctree

Gregory Mullen parent 489f6b4b 58b3b446
update to zig v0.14-dev

build.zig added: 37, removed: 29, total 8
@@ -76,6 +76,8 @@ pub fn build(b: *std.Build) !void {
}
}
 
const ThisBuild = @This();
 
pub const Compiler = struct {
b: *std.Build,
dirs: std.ArrayList([]const u8),
@@ -103,6 +105,13 @@ pub const Compiler = struct {
self.collected.deinit();
}
 
pub fn depPath(self: *Compiler, path: []const u8) std.Build.LazyPath {
return if (self.b.available_deps.len > 0)
self.b.dependencyFromBuildZig(ThisBuild, .{}).path(path)
else
self.b.path(path);
}
 
pub fn addDir(self: *Compiler, dir: []const u8) void {
const copy = self.b.allocator.dupe(u8, dir) catch @panic("OOM");
self.dirs.append(copy) catch @panic("OOM");
@@ -121,12 +130,8 @@ pub const Compiler = struct {
if (self.templates) |t| return t;
 
//std.debug.print("building for {}\n", .{self.collected.items.len});
 
const local_dir = std.fs.path.dirname(@src().file) orelse ".";
const compiled = self.b.createModule(.{
.root_source_file = .{
.cwd_relative = self.b.pathJoin(&.{ local_dir, "src/template/comptime.zig" }),
},
.root_source_file = self.depPath("src/template/comptime.zig"),
});
 
const found = self.b.addOptions();
@@ -147,13 +152,12 @@ pub const Compiler = struct {
if (self.structs) |s| return s;
 
if (self.debugging) std.debug.print("building structs for {}\n", .{self.collected.items.len});
const local_dir = std.fs.path.dirname(@src().file) orelse ".";
const t_compiler = self.b.addExecutable(.{
.name = "template-compiler",
.root_source_file = .{
.cwd_relative = self.b.pathJoin(&.{ local_dir, "src/template/struct-emit.zig" }),
},
.target = self.b.graph.host,
.root_module = self.b.createModule(.{
.root_source_file = self.depPath("src/template/struct-emit.zig"),
.target = self.b.graph.host,
}),
});
 
const comptime_templates = try self.buildTemplates();
 
src/frame.zig added: 37, removed: 29, total 8
@@ -82,7 +82,7 @@ pub fn sendPage(vrs: *Frame, page: anytype) NetworkError!void {
return;
};
stream.writevAll(vec) catch |err| switch (err) {
else => log.err("iovec write error Error {}", .{err}),
else => log.err("iovec write error Error {} len {}", .{ err, vec.len }),
};
if (required > 2048) vrs.alloc.free(vecs);
},
 
src/request-data.zig added: 37, removed: 29, total 8
@@ -228,7 +228,8 @@ pub fn RequestData(comptime T: type) type {
var valid = query.validator();
var req: T = undefined;
inline for (std.meta.fields(T)) |field| {
@field(req, field.name) = try get(field.type, field.name, &valid, field.default_value);
// TODO this has no test
@field(req, field.name) = try get(field.type, field.name, &valid, field.defaultValue());
}
return req;
}
 
src/response-data.zig added: 37, removed: 29, total 8
@@ -17,9 +17,9 @@ pub fn init(a: Allocator) ResponseData {
 
fn name(comptime T: type) []const u8 {
return comptime switch (@typeInfo(T)) {
.Array => |a| @typeName(a.child),
.Pointer => |p| @typeName(p.child),
.Struct => @typeName(T),
.array => |a| @typeName(a.child),
.pointer => |p| @typeName(p.child),
.@"struct" => @typeName(T),
else => unreachable,
};
}
 
src/template/html.zig added: 37, removed: 29, total 8
@@ -91,9 +91,9 @@ pub fn element(comptime name: []const u8, children: anytype, attrs: ?[]const Att
if (ChildrenType == @TypeOf(null)) return .{ .name = name, .attrs = attrs };
const child_type_info = @typeInfo(ChildrenType);
switch (child_type_info) {
.Pointer => |ptr| switch (ptr.size) {
.One => switch (@typeInfo(ptr.child)) {
.Array => |arr| switch (arr.child) {
.pointer => |ptr| switch (ptr.size) {
.one => switch (@typeInfo(ptr.child)) {
.array => |arr| switch (arr.child) {
u8 => return .{
.name = name,
.text = children,
@@ -108,7 +108,7 @@ pub fn element(comptime name: []const u8, children: anytype, attrs: ?[]const Att
},
else => @compileError("Unknown type given to element"),
},
.Pointer => @compileError("Pointer to a pointer, (perhaps &[]u8) did you mistakenly add a &?"),
.pointer => @compileError("Pointer to a pointer, (perhaps &[]u8) did you mistakenly add a &?"),
else => {
@compileLog(ptr);
@compileLog(ptr.child);
@@ -116,7 +116,7 @@ pub fn element(comptime name: []const u8, children: anytype, attrs: ?[]const Att
@compileLog(ChildrenType);
},
},
.Slice => switch (ptr.child) {
.slice => switch (ptr.child) {
u8 => return .{
.name = name,
.text = children,
@@ -141,8 +141,8 @@ pub fn element(comptime name: []const u8, children: anytype, attrs: ?[]const Att
@compileLog(ChildrenType);
},
},
.Struct => @compileError("Raw structs aren't allowed, element must be a slice"),
.Array => |arr| switch (arr.child) {
.@"struct" => @compileError("Raw structs aren't allowed, element must be a slice"),
.array => |arr| switch (arr.child) {
// TODO, this is probably a compiler error, prefix with &
Element => return .{
.name = name,
 
src/template/page.zig added: 37, removed: 29, total 8
@@ -264,7 +264,7 @@ fn validateDirective(
pblob: []const u8,
base_offset: usize,
) []const Offset {
@setEvalBranchQuota(15000);
@setEvalBranchQuota(20000);
const data_offset = getOffset(BlockType, drct.noun, base_offset);
const end = drct.tag_block.len;
switch (drct.verb) {
@@ -585,6 +585,9 @@ pub fn Page(comptime template: Template, comptime PageDataType: type) type {
vec[0] = .{ .base = d.ptr, .len = d.len };
} else if (drct.otherwise == .default) {
vec[0] = .{ .base = drct.otherwise.default.ptr, .len = drct.otherwise.default.len };
} else {
vec[0] = .{ .base = "".ptr, .len = 0 };
return 0;
},
usize, isize => {
const int = try allocPrint(a, "{}", .{data});