commit 5c05d98ae750e4df8ddf2771738f278239156314
parent 7145b5826c7eca7b203a663b1cada149f2a44891
Author: gracefu <81774659+gracefuu@users.noreply.github.com>
Date: Thu, 22 May 2025 14:09:38 +0800
Rename AstGen3 to AstGen
Diffstat:
4 files changed, 49 insertions(+), 59 deletions(-)
diff --git a/src/AstGen3.zig b/src/AstGen.zig
diff --git a/src/main.zig b/src/main.zig
@@ -38,30 +38,26 @@ pub fn main() !void {
const args = try std.process.argsAlloc(arena);
- const bench3, //
- const run3, //
- const check3, //
- const render3, //
- const print3, //
+ const bench, //
+ const run, //
+ const render, //
+ const print, //
const iters =
blk: {
- var bench3 = false;
- var run3 = false;
- var check3 = false;
- var render3 = false;
- var print3 = false;
+ var bench = false;
+ var run = false;
+ var render = false;
+ var print = false;
var iters: usize = 8;
for (args) |arg| {
- if (std.mem.eql(u8, arg, "--bench3"))
- bench3 = true;
- if (std.mem.eql(u8, arg, "--run3"))
- run3 = true;
- if (std.mem.eql(u8, arg, "--check3"))
- check3, run3 = .{ true, true };
- if (std.mem.eql(u8, arg, "--render3"))
- render3, run3 = .{ true, true };
- if (std.mem.eql(u8, arg, "--print3"))
- print3, run3 = .{ true, true };
+ if (std.mem.eql(u8, arg, "--bench"))
+ bench = true;
+ if (std.mem.eql(u8, arg, "--run"))
+ run = true;
+ if (std.mem.eql(u8, arg, "--render"))
+ render, run = .{ true, true };
+ if (std.mem.eql(u8, arg, "--print"))
+ print, run = .{ true, true };
if (std.mem.startsWith(u8, arg, "--iters="))
iters = std.fmt.parseInt(
usize,
@@ -78,11 +74,10 @@ pub fn main() !void {
std.Thread.sleep(2e9);
}
break :blk .{
- bench3,
- run3,
- check3,
- render3,
- print3,
+ bench,
+ run,
+ render,
+ print,
iters,
};
};
@@ -92,56 +87,51 @@ pub fn main() !void {
const input = input_arraylist.items;
for (0..iters) |_| {
- if (bench3) {
- const ast3 = blk: {
- const tracy_frame = tracy.namedFrame("parse 3");
+ if (bench) {
+ const ast = blk: {
+ const tracy_frame = tracy.namedFrame("parse");
defer tracy_frame.end();
- break :blk try mymarkdown.parse3(
+ break :blk try mymarkdown.parse(
gpa,
gpa,
input,
);
};
- ast3.deinit(gpa);
+ ast.deinit(gpa);
}
}
- if (!bench3) {
- const ast3: mymarkdown.Ast = if (run3) blk: {
- const tracy_frame = tracy.namedFrame("parse 3");
+ if (!bench) {
+ const ast: mymarkdown.Ast = if (run) blk: {
+ const tracy_frame = tracy.namedFrame("parse");
defer tracy_frame.end();
- break :blk try mymarkdown.parse3(
+ break :blk try mymarkdown.parse(
gpa,
arena,
input,
);
} else .empty;
- var render_arraylist3: std.ArrayList(u8) = .init(gpa);
- defer render_arraylist3.deinit();
- if (check3 or render3 or print3) {
- std.debug.print("Rendering 3\n", .{});
- const tracy_frame = tracy.namedFrame("Render 3");
+ var render_arraylist: std.ArrayList(u8) = .init(gpa);
+ defer render_arraylist.deinit();
+ if (render or print) {
+ std.debug.print("Rendering\n", .{});
+ const tracy_frame = tracy.namedFrame("Render");
defer tracy_frame.end();
- _ = try ast3.renderAst(render_arraylist3.writer(), input);
+ _ = try ast.renderAst(render_arraylist.writer(), input);
}
- // if (check1 and check3) {
- // std.debug.print("check 1 vs 3\n", .{});
- // try std.testing.expectEqualStrings(render_arraylist1.items, render_arraylist3.items);
- // }
-
- for (0..10) |_| {
- if (render3) {
- std.debug.print("Re-rendering 3\n", .{});
- render_arraylist3.clearRetainingCapacity();
- const tracy_frame = tracy.namedFrame("re-render 3");
+ for (0..iters) |_| {
+ if (render) {
+ std.debug.print("Re-rendering\n", .{});
+ render_arraylist.clearRetainingCapacity();
+ const tracy_frame = tracy.namedFrame("re-render");
defer tracy_frame.end();
- _ = try ast3.renderAst(render_arraylist3.writer(), input);
+ _ = try ast.renderAst(render_arraylist.writer(), input);
}
}
- if (print3) try std.io.getStdOut().writeAll(render_arraylist3.items);
+ if (print) try std.io.getStdOut().writeAll(render_arraylist.items);
}
if (tracy.enable) {
diff --git a/src/root.zig b/src/root.zig
@@ -1,8 +1,8 @@
const std = @import("std");
pub const Ast = @import("Ast.zig");
-pub const AstGen3 = @import("AstGen3.zig");
-pub const parse3 = AstGen3.parse;
+pub const AstGen = @import("AstGen.zig");
+pub const parse = AstGen.parse;
pub const PADDING = @import("padded_str.zig").PADDING;
diff --git a/src/test.zig b/src/test.zig
@@ -1,5 +1,5 @@
const std = @import("std");
-const parse3 = @import("AstGen3.zig").parse;
+const parse = @import("AstGen.zig").parse;
const Ast = @import("Ast.zig");
const PADDING = @import("padded_str.zig").PADDING;
@@ -21,7 +21,7 @@ fn testForCrashes(gpa: std.mem.Allocator, input: []const u8) !void {
const padded_input = try std.mem.concat(gpa, u8, &.{ input, "\n" ** (PADDING + 1) });
defer gpa.free(padded_input);
- const ast = try parse3(gpa, null, padded_input);
+ const ast = try parse(gpa, null, padded_input);
defer ast.deinit(gpa);
var output_instance: std.ArrayList(u8) = .init(gpa);
@@ -48,7 +48,7 @@ fn testSnapshotImpl(gpa: std.mem.Allocator, path: []const u8) !void {
defer input_instance.deinit();
try input_instance.appendNTimes('\n', PADDING + 1);
- const ast = try parse3(gpa, null, input_instance.items);
+ const ast = try parse(gpa, null, input_instance.items);
defer ast.deinit(gpa);
// const ast2 = try parse3(gpa, gpa, input_instance.items);
// defer ast2.deinit(gpa);
@@ -158,7 +158,7 @@ test "Super long line" {
@memset(input[(1 << 24) * 4 ..], '\n');
var arena: ArenaAllocator = .init(std.testing.allocator);
defer arena.deinit();
- const ast = try parse3(std.testing.allocator, arena.allocator(), input);
+ const ast = try parse(std.testing.allocator, arena.allocator(), input);
const taggedAst = try ast.toTagged(arena.allocator());
try std.testing.expectEqualDeep(@as(Ast.Tagged, .{
.nodes = &.{
@@ -183,7 +183,7 @@ test "Many short lines" {
var arena: ArenaAllocator = .init(std.testing.allocator);
defer arena.deinit();
- const ast = try parse3(std.testing.allocator, arena.allocator(), input);
+ const ast = try parse(std.testing.allocator, arena.allocator(), input);
try std.testing.expectEqual(1 << 24, ast.nodes.len);
try std.testing.expectEqual(