Complete diff-match-patch port (closes #25) - #26

Open

mnemnion wants to merge 182 commits into

ziglibs:mainfrom

mnemnion:more-port

Commits on Jul 2, 2024

Add build.zig.zon, update build.zig, .gitignore
mnemnion
committed
9c27090
Module name is diffz, not DiffMatchPatch
mnemnion
committed
4792861
More paths, .target, .optimize
mnemnion
committed
10bcba0
Memory-managed halfMatch function
mnemnion
committed
64bc1bf
Managed memory in diffLinesToChars
mnemnion
committed
0c7c4e2
Clean up easy leaks + prep for allocating Diffs
mnemnion
committed
9e638e8
Managed memory in diffCharsToLines
mnemnion
committed
a5c993f
Fix for diffCleanupMerge memory
mnemnion
committed
a2beb6f
One test at a time...
mnemnion
committed
7c5cccc
More tests
mnemnion
committed
dbc3a84
Fix two double-frees
mnemnion
committed
0b2f274
Free two more clobbered diff texts
mnemnion
committed
18b7531
Restore all diffCleanMerge tests
mnemnion
committed
1ebee82
Restore frees to diffCleanupSemanticLossless
mnemnion
committed
350a85e
Tests of diffCleanupSemanticLossless pass
mnemnion
committed
fe21b51
alloc -> allocator
mnemnion
committed
5ff7a76
Tests pass for diffBisect
mnemnion
committed
b56449f

Commits on Jul 3, 2024

Catch a few leaks, lather, rinse, repeat
mnemnion
committed
2388fff
Defer free until slice is taken
mnemnion
committed
7a47bd7
Fait accompli
mnemnion
committed
eecdb47
Polish things up
mnemnion
committed
7032b4b
Remove unused temp diff
mnemnion
committed
87b1b32
Modifies prefix and suffix diffs to not split UTF-8
mnemnion
committed
2019099
Add (failing!) greek test
mnemnion
committed
006d7a1
Add equalForwards and equalBackwards for Myers 1986
mnemnion
committed
3cd7a49
Add some easy two-byte tests
mnemnion
committed
7ebdf12
Back out of overlaps if we clip a character
mnemnion
committed
56104d4

Commits on Jul 4, 2024

Less than zero impossible for usize
mnemnion
committed
2f2e57e
Add coverage step for build system
mnemnion
committed
7b7cd26
Add diffIndex, diffBeforeText, diffAfterText
mnemnion
committed
0dbfb97
Add Levenshtein distance and prettyFormat
mnemnion
committed
5a7ba7c
Add borrowed encodeUri routine
mnemnion
committed
477bd5b
Code-bumming encodeUri
mnemnion
committed
16a05d2
Tests for encodeUri
mnemnion
committed
f647759
No extra allocation for hex formatting
mnemnion
committed
3d0cb77
Factor uriEncode to use writeUriEncoded
mnemnion
committed
7b650f7
Break pretty format into writer and string-er
mnemnion
committed
b36c8bf
Add Patch struct
mnemnion
committed
22c4c84
Port main makePatch function
mnemnion
committed
ef5dda5
Adds patchAddContext
mnemnion
committed
eeaf42f
Add ownership handling to makePatch
mnemnion
committed
5fb7299
Add clone for patches and patch lists
mnemnion
committed
6d477ad
Add match section
mnemnion
committed
9060477
Put fields at top of file/struct
mnemnion
committed
49339a9
Don't clip codepoints in patch context
mnemnion
committed
1dea68a

Commits on Jul 5, 2024

Mid-function putter out
mnemnion
committed
a7cc1b2
Rest of patchApply
mnemnion
committed
630bfe6
Add patch split and patch padding
mnemnion
committed
bf1f95a
Add patch writer
mnemnion
committed
2d2955d

Commits on Jul 6, 2024

Patch parser complete
mnemnion
committed
b703ac6

Commits on Jul 7, 2024

Add uriDecode
mnemnion
committed
3afffcc
Add other makePatch interfaces
mnemnion
committed
f7906a6
Remove conditional free for zero-length text

mnemnion
and
techatrix
authored
0655ece
Use explicit directory names in .gitignore

mnemnion
and
techatrix
authored
f044a8b
Update build.zig to remove empty library

mnemnion
and
techatrix
authored
9bb2819
Free resources when allocation fails
mnemnion
committed
cc640a3
Merge remote-tracking branch 'origin/memory-management' into memory-management
mnemnion
committed
481a182
errdefer freeing slice appends
mnemnion
committed
4b63907
Remove spurious line
mnemnion
committed
83ac54f
Merge branch 'memory-management' into more-port
mnemnion
committed
7cd5391
Merge changes to memory-manage branch
mnemnion
committed
7febe83
Partial transfer of functions to dmp
mnemnion
committed
5c4847e
Patch tests
mnemnion
committed
a7ab35c
Convert to ensuring capacity before append/insert
mnemnion
committed
b35dc24
Restore deleted free
mnemnion
committed
58fbf0f
Consistent use of Diff.init()
mnemnion
committed
39e0af8
Merge branch 'memory-management' into more-port
mnemnion
committed
dcf52f9
use `testing.checkAllAllocationFailures`
techatrix
committed
34d3a7b
Merge pull request #1 from Techatrix/dev
mnemnion
authored
92e3c3e
errdefer halfmatches
mnemnion
committed
8cb7f01
Fixes two leaks
mnemnion
committed
aedb7d6
More memory order bugs
mnemnion
committed
460f047
Last of the skipped tests eliminated
mnemnion
committed
d5dff30
Merge branch 'memory-management' into more-port
mnemnion
committed
cebcafa
Errdefer in rebuildtexts
mnemnion
committed
ddcbe8f

Commits on Jul 8, 2024

Tests for rebuildtexts
mnemnion
committed
593d38f
Last of the leaks
mnemnion
committed
39b99aa
Merge branch 'memory-management' into more-port
mnemnion
committed
161c104
I am once again patching
mnemnion
committed
962b461
diffIndex tests
mnemnion
committed
dec0868
Add DiffMatchPatch to a bunch of things
mnemnion
committed
4bf0e1c
Tests for diffBefore and -AfterText
mnemnion
committed
9e6a7e0
Enhancements
mnemnion
committed
6ee94e5
Tests for diffLevenshtein
mnemnion
committed
d4fc092
Add comments proving bitap can be changed
mnemnion
committed
1309b9d
Merge memory-management branch onto more-port
mnemnion
committed
20b6ba9
Add test for prettyFormat
mnemnion
committed
ef0910b
Move before and after test
mnemnion
committed
57557c3
Add test for matchAlphabet
mnemnion
committed
cc296a8
Preliminary testing for matchBitap
mnemnion
committed
155b72c
Not actually that subtle
mnemnion
committed
13cd973
Bitap incorrect somewhere
mnemnion
committed
236179a
Screwed up operation order, thanks @divTrunc
mnemnion
committed
08fe19b
Add remaining matchBitap tests
mnemnion
committed
4816085
Add tests for matchMain
mnemnion
committed
3931c4a

Commits on Jul 9, 2024

Patch writer test
mnemnion
committed
8f7b83c
First round-trip patch test passes
mnemnion
committed
9975da5
Patch from text tests
mnemnion
committed
f07cd60
Pass first round of patchAddContext
mnemnion
committed
689f46f
Test coverage for patchAddContext
mnemnion
committed
7a51025
Test for makePatch accepts null case
mnemnion
committed
32fa770
Memory leaks inside of diff engine
mnemnion
committed
f2a4adb
Manually port memory-management branch changes
mnemnion
committed
8a8e49b
First allocating makePatch test passes
mnemnion
committed
9a460ec
Precalculate maximum space needed for makePatchInternal
mnemnion
committed
0e1377c
More makePatch
mnemnion
committed
6b7a0f8
Rename to diffAndMakePatch
mnemnion
committed
08fae61
Another subscript bug
mnemnion
committed
6e414d7
patchSplitMax compiles (with segfault)
mnemnion
committed
eac61d9
Less segfaulting
mnemnion
committed
1a47673
Obvious segfault is obvious
mnemnion
committed
cbb421a
Correct answer for first splitMaxPatch test
mnemnion
committed
3ae4f98
Remove spurious files
mnemnion
committed
fa906fa

Commits on Jul 10, 2024

This algorithm sucks
mnemnion
committed
f97e299
No allocation failures for first splitMax tests
mnemnion
committed
be26421
Last patchSplitMax test
mnemnion
committed
d18e743
patchAddPadding compiles
mnemnion
committed
30d203a
Take slices by pointer
mnemnion
committed
d1e1b58
Padding tests pass
mnemnion
committed
385c846
Null patch 'application' test passes
mnemnion
committed
a4d8dfd
Use padded text for comparisons
mnemnion
committed
0c7ff1d
errdefer patch clones
mnemnion
committed
ad5339c
patchApply passes next test
mnemnion
committed
b1e2571
Fix some bugs in patchApply
mnemnion
committed
67723ad
Use the patch, not the destination diff, to apply
mnemnion
committed
5fe28af
Add postcontext guard to patchSplitMax
mnemnion
committed
7cf64b0
Two more tests pass
mnemnion
committed
dc0e31d
Last of the serious tests for patchApply
mnemnion
committed
07396dd
Last two tests pass.
mnemnion
committed
c6c9c04
Updates roadmap
mnemnion
committed
8e18456

Commits on Jul 11, 2024

Add Unicode diff tests
mnemnion
committed
23078dd
Test succeeds only with breakpoint on
mnemnion
committed
5c92af0
Add fixup at point of bisection
mnemnion
committed
d7abe3d
Remove the safety dance from Myers
mnemnion
committed
debe5a6
Possibly irrelevant tweak
mnemnion
committed
1de49ac
Restore previous common suffix routine
mnemnion
committed
bb91050
Found a failing test
mnemnion
committed
ff4e387
Check for lead byte in common suffix
mnemnion
committed
3f48fd8
All three-byte one-character edits pass
mnemnion
committed
27da8d4
A common-middle test with one permutation
mnemnion
committed
d73e3ed
Add basic four-byte tests
mnemnion
committed
306f1b5
Doc comment for diffRoundTrip
mnemnion
committed
4053973
Port streamlined boolInt from other branch
mnemnion
committed
53167e1
Simplify and correct patch adjustment
mnemnion
committed
fe5e9a7
Simplify split-fix logic for diffBisectSplit
mnemnion
committed
b4e8913
Simplify common prefix logic with fixSplitBackward
mnemnion
committed
7b18220
Get rid of was_follow check in commonSuffix
mnemnion
committed
7e7e5e9
Replace code in commonSuffix with fixSplitForward
mnemnion
committed
6fc6c89
Use fixSplits in patchAddContext
mnemnion
committed
de4ef8d

Commits on Jul 12, 2024

Adds revamp of diffLine mode
mnemnion
committed
85bd896
Remove unneeded conditional in diffCommonSuffix
mnemnion
committed
ba2840f
Avoid extra allocation for halfMatch
mnemnion
committed
583618b
Finish adding 2.0 of line mode
mnemnion
committed
a785737
First tests pass.
mnemnion
committed
c1d9b53
Track codepoint count between calls
mnemnion
committed
e043eab
Ports basic diffLinesToChars tests
mnemnion
committed
780d3e9
Comment justifying munge assertion
mnemnion
committed
25d87ee
Ports charsToLines
mnemnion
committed
9bab41e
Delete old version, rename new ones
mnemnion
committed
6e721cb
Replace 'magic number' 32 with a constant
mnemnion
committed
6b237e4
Updates roadmap
mnemnion
committed
09c7e01
Catch infinite loop bug in decodeUri
mnemnion
committed
9191e63
Line coverage of early stoppage
mnemnion
committed
39012aa

Commits on Jul 13, 2024

Remove unused Bitap 2.0 functions
mnemnion
committed
6787aa6
Restore necessary const
mnemnion
committed
663ae11
Move utility functions to own section
mnemnion
committed
2d373c7
Use boolean to eliminate 19 @intCasts
mnemnion
committed
ea3e231
diffLevenshtein returns f64
mnemnion
committed
4ca65aa
Fix: logic and memory bugs in patchFromHeader
mnemnion
committed
1d0c79f
Check memory failure within testBadPatchString
mnemnion
committed
42f36f4
Add post-first-patch failing case
mnemnion
committed
e01668b
Tracking down line-mode fails
mnemnion
committed
ba58e7e

Commits on Jul 14, 2024

Port fix for line mode from memory branch
mnemnion
committed
f22ccb4
Add configurable line threshold
mnemnion
committed
85a84b7
Add check-lines limit to DiffMatchPatch struct
mnemnion
committed
5d3a83f
Roadmap updates
mnemnion
committed
1fd9187
Make diffCleanupSemantic public
mnemnion
committed
bf22ea4

Commits on Jul 21, 2024

Remove if (false) branches and XXX bool
mnemnion
committed
bb9a1ae

Commits on Jul 22, 2024

Change most error sets to error{OutOfMemory}
mnemnion
committed
3a1b7ef

Commits on Aug 5, 2024

Panic? At the backout!
mnemnion
committed
b8d5661
Fix stack overflow in diffBisectSplit
mnemnion
committed
c87a288

Commits on Aug 6, 2024

Bugfix for the bugfix
mnemnion
committed
0249d68