diff options
author | 2023-06-13 09:15:05 -0700 | |
---|---|---|
committer | 2023-06-13 09:15:05 -0700 | |
commit | bdb1b7124aec3ca42a13dd13309df4c8e4e3cc64 (patch) | |
tree | 57a7a278699999521f561959204a533ea9906f8e /src/deps/diffz/DiffMatchPatch.zig | |
parent | b93bdbb124fc7b1b4a09d414158e0107e8d66b92 (diff) | |
download | bun-bdb1b7124aec3ca42a13dd13309df4c8e4e3cc64.tar.gz bun-bdb1b7124aec3ca42a13dd13309df4c8e4e3cc64.tar.zst bun-bdb1b7124aec3ca42a13dd13309df4c8e4e3cc64.zip |
Fix crash in CJS (#3294)bun-v0.6.9
* Fix crash in CJS
* Add std.heap.ArenaAllocator
* Use our arena allocator
* Reduce JS parser memory usage and make HMR faster
* Write some comments
* fix test failure & clean up this code
* Update javascript.zig
* make arena usage safer
---------
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Diffstat (limited to 'src/deps/diffz/DiffMatchPatch.zig')
-rw-r--r-- | src/deps/diffz/DiffMatchPatch.zig | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/deps/diffz/DiffMatchPatch.zig b/src/deps/diffz/DiffMatchPatch.zig index f46d88cd5..7e545f364 100644 --- a/src/deps/diffz/DiffMatchPatch.zig +++ b/src/deps/diffz/DiffMatchPatch.zig @@ -1398,7 +1398,7 @@ fn diffCommonOverlap(text1_in: []const u8, text2_in: []const u8) usize { } // pub fn main() void { -// var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); +// var arena = @import("root").bun.ArenaAllocator.init(std.heap.page_allocator); // defer arena.deinit(); // var bruh = default.diff(arena.allocator(), "Hello World.", "Goodbye World.", true); @@ -1406,7 +1406,7 @@ fn diffCommonOverlap(text1_in: []const u8, text2_in: []const u8) usize { // } // test { -// var arena = std.heap.ArenaAllocator.init(testing.allocator); +// var arena = @import("root").bun.ArenaAllocator.init(testing.allocator); // defer arena.deinit(); // var bruh = try default.diff(arena.allocator(), "Hello World.", "Goodbye World.", true); @@ -1455,7 +1455,7 @@ test diffCommonOverlap { } test diffHalfMatch { - var arena = std.heap.ArenaAllocator.init(testing.allocator); + var arena = @import("root").bun.ArenaAllocator.init(testing.allocator); defer arena.deinit(); var one_timeout = DiffMatchPatch{}; @@ -1549,7 +1549,7 @@ test diffHalfMatch { } test diffLinesToChars { - var arena = std.heap.ArenaAllocator.init(testing.allocator); + var arena = @import("root").bun.ArenaAllocator.init(testing.allocator); defer arena.deinit(); // Convert lines down to characters. @@ -1611,7 +1611,7 @@ test diffLinesToChars { } test diffCharsToLines { - var arena = std.heap.ArenaAllocator.init(testing.allocator); + var arena = @import("root").bun.ArenaAllocator.init(testing.allocator); defer arena.deinit(); try testing.expect((Diff.init(.equal, "a")).eql(Diff.init(.equal, "a"))); @@ -1640,7 +1640,7 @@ test diffCharsToLines { } test diffCleanupMerge { - var arena = std.heap.ArenaAllocator.init(testing.allocator); + var arena = @import("root").bun.ArenaAllocator.init(testing.allocator); defer arena.deinit(); // Cleanup a messy diff. @@ -1828,7 +1828,7 @@ test diffCleanupMerge { } test diffCleanupSemanticLossless { - var arena = std.heap.ArenaAllocator.init(testing.allocator); + var arena = @import("root").bun.ArenaAllocator.init(testing.allocator); defer arena.deinit(); var diffs = DiffList{}; @@ -1953,7 +1953,7 @@ fn rebuildtexts(allocator: std.mem.Allocator, diffs: DiffList) ![2][]const u8 { } test diffBisect { - var arena = std.heap.ArenaAllocator.init(talloc); + var arena = @import("root").bun.ArenaAllocator.init(talloc); defer arena.deinit(); // Normal. @@ -1987,7 +1987,7 @@ test diffBisect { const talloc = testing.allocator; test diff { - var arena = std.heap.ArenaAllocator.init(talloc); + var arena = @import("root").bun.ArenaAllocator.init(talloc); defer arena.deinit(); // Perform a trivial diff. @@ -2094,7 +2094,7 @@ test diff { } test diffCleanupSemantic { - var arena = std.heap.ArenaAllocator.init(talloc); + var arena = @import("root").bun.ArenaAllocator.init(talloc); defer arena.deinit(); // Cleanup semantically trivial equalities. |