summaryrefslogtreecommitdiff
path: root/Userland/Libraries
diff options
context:
space:
mode:
authorMustafa Quraish <mustafaq9@gmail.com>2021-09-17 14:29:48 -0400
committerAndreas Kling <kling@serenityos.org>2021-09-24 14:32:52 +0200
commit35704ba27256d028d9597042e52898934bb738a8 (patch)
tree124d184a109e16baf533943fcccbdc1396ec7632 /Userland/Libraries
parent4173f2ffad7d67f52068a16e1f30348a86725ddf (diff)
downloadserenity-35704ba27256d028d9597042e52898934bb738a8.zip
LibDiff: Perform diffing-algorithm in reverse order
Previously the algorithm was being performed from the start of the string to the end, which was a little more convenient when writing the code, but made it more annoying to be able to properly talk about the "start" of where the changes were happening, since we can only re-construct the changes in reverse order of the initial traversal. Basically, doing the initial pass in reverse lets us reconstruct the hunks in the correct order to begin with, and not have to worry about reversing the hunks / lines within the hunks
Diffstat (limited to 'Userland/Libraries')
-rw-r--r--Userland/Libraries/LibDiff/Generator.cpp47
1 files changed, 23 insertions, 24 deletions
diff --git a/Userland/Libraries/LibDiff/Generator.cpp b/Userland/Libraries/LibDiff/Generator.cpp
index 8537e749be..b8fa289fab 100644
--- a/Userland/Libraries/LibDiff/Generator.cpp
+++ b/Userland/Libraries/LibDiff/Generator.cpp
@@ -20,8 +20,8 @@ Vector<Hunk> from_text(StringView const& old_text, StringView const& new_text)
*/
enum class Direction {
- Up, // Added a new line
- Left, // Removed a line
+ Down, // Added a new line
+ Right, // Removed a line
Diagonal, // Line remained the same
};
@@ -41,47 +41,46 @@ Vector<Hunk> from_text(StringView const& old_text, StringView const& new_text)
// Initialize the first row and column
for (size_t i = 0; i <= old_lines.size(); ++i)
- dp(i, 0) = { 0, Direction::Left };
+ dp(i, new_lines.size()) = { 0, Direction::Right };
for (size_t j = 0; j <= new_lines.size(); ++j)
- dp(0, j) = { 0, Direction::Up };
+ dp(old_lines.size(), 0) = { 0, Direction::Down };
// Fill in the rest of the DP table
- for (size_t i = 1; i <= old_lines.size(); ++i) {
- for (size_t j = 1; j <= new_lines.size(); ++j) {
- if (old_lines[i - 1] == new_lines[j - 1]) {
- dp(i, j) = { dp(i - 1, j - 1).length + 1, Direction::Diagonal };
+ for (int i = old_lines.size() - 1; i >= 0; --i) {
+ for (int j = new_lines.size() - 1; j >= 0; --j) {
+ if (old_lines[i] == new_lines[j]) {
+ dp(i, j) = { dp(i + 1, j + 1).length + 1, Direction::Diagonal };
} else {
- auto up = dp(i, j - 1).length;
- auto left = dp(i - 1, j).length;
- if (up > left)
- dp(i, j) = { up, Direction::Up };
+ auto down = dp(i, j + 1).length;
+ auto right = dp(i + 1, j).length;
+ if (down > right)
+ dp(i, j) = { down, Direction::Down };
else
- dp(i, j) = { left, Direction::Left };
+ dp(i, j) = { right, Direction::Right };
}
}
}
Vector<Hunk> hunks;
- size_t i = old_lines.size();
- size_t j = new_lines.size();
+ size_t i = 0;
+ size_t j = 0;
// FIXME: This creates a hunk per line, very inefficient.
- while (i > 0 && j > 0) {
+ while (i < old_lines.size() && j < new_lines.size()) {
auto& cell = dp(i, j);
- if (cell.direction == Direction::Up) {
- --j;
+ if (cell.direction == Direction::Down) {
hunks.append({ i, j, {}, { new_lines[j] } });
- } else if (cell.direction == Direction::Left) {
- --i;
+ ++j;
+ } else if (cell.direction == Direction::Right) {
hunks.append({ i, j, { old_lines[i] }, {} });
- } else if (cell.direction == Direction::Diagonal) {
- --i;
- --j;
+ ++i;
+ } else {
+ ++i;
+ ++j;
}
}
- hunks.reverse();
return hunks;
}