-static void diff_easy_suffix(xbt_dynar_t res, xbt_dynar_t da, xbt_dynar_t db)
-{
- while (xbt_dynar_length(da) > 0 && xbt_dynar_length(db) > 0) {
- char *sa = xbt_dynar_getlast_as(da, char *);
- char *sb = xbt_dynar_getlast_as(db, char *);
-
- if (!strcmp(sa, sb)) {
- /* sa == sb */
- diff_push(res, ' ', sa);
- xbt_dynar_pop(da, NULL);
- xbt_dynar_pop(db, NULL);
- } else if (!diff_member(sb, da, 0, xbt_dynar_length(da) - 1)) {
- /* sb not in da */
- diff_push(res, '+', sb);
- xbt_dynar_pop(db, NULL);
- } else if (!diff_member(sa, db, 0, xbt_dynar_length(db) - 1)) {
- /* sa not in db */
- diff_push(res, '-', sa);
- xbt_dynar_pop(da, NULL);
- } else {
- /* sa in db, and sb in da: cannot go further */
- return;
- }
- }
-}
-
-static XBT_INLINE int diff_get(xbt_matrix_t C, int i, int j)
-{
- return (i == -1 || j == -1) ? 0 : xbt_matrix_get_as(C, i, j, int);
-}
-
-static xbt_matrix_t diff_build_LCS(xbt_dynar_t da, xbt_dynar_t db)
-{
- unsigned len_a = xbt_dynar_length(da);
- unsigned len_b = xbt_dynar_length(db);
- xbt_matrix_t C = xbt_matrix_new(len_a, len_b, sizeof(int), NULL);
- int i, j;
-
- /* Compute the LCS */
- /*
- function LCSLength(X[1..m], Y[1..n])
- C = array(0..m, 0..n)
- for i := 0..m
- C[i,0] = 0
- for j := 1..n
- C[0,j] = 0
- for i := 1..m
- for j := 1..n
- if X[i] = Y[j]
- C[i,j] := C[i-1,j-1] + 1
- else:
- C[i,j] := max(C[i,j-1], C[i-1,j])
- return C[m,n]
- */
- for (i = 0; i < len_a; i++)
- for (j = 0; j < len_b; j++) {
-
- if (!strcmp(xbt_dynar_get_as(da, i, char *),
- xbt_dynar_get_as(db, j, char *)))
- xbt_matrix_get_as(C, i, j, int) = diff_get(C, i - 1, j - 1) + 1;
- else
- xbt_matrix_get_as(C, i, j, int) = max(diff_get(C, i, j - 1),
- diff_get(C, i - 1, j));
- }
- return C;
-}
-
-static void diff_build_diff(xbt_dynar_t res,
- xbt_matrix_t C,
- xbt_dynar_t da, xbt_dynar_t db, int i, int j)
-{
- /* Construct the diff
- function printDiff(C[0..m,0..n], X[1..m], Y[1..n], i, j)
- if i > 0 and j > 0 and X[i] = Y[j]
- printDiff(C, X, Y, i-1, j-1)
- print " " + X[i]
- else
- if j > 0 and (i = 0 or C[i,j-1] >= C[i-1,j])
- printDiff(C, X, Y, i, j-1)
- print "+ " + Y[j]
- else if i > 0 and (j = 0 or C[i,j-1] < C[i-1,j])
- printDiff(C, X, Y, i-1, j)
- print "- " + X[i]
- */
-
- if (i >= 0 && j >= 0 && !strcmp(xbt_dynar_get_as(da, i, char *),
- xbt_dynar_get_as(db, j, char *))) {
- diff_build_diff(res, C, da, db, i - 1, j - 1);
- diff_push(res, ' ', xbt_dynar_get_as(da, i, char *));
- } else if (j >= 0 &&
- (i == -1 || diff_get(C, i, j - 1) >= diff_get(C, i - 1, j))) {
- diff_build_diff(res, C, da, db, i, j - 1);
- diff_push(res, '+', xbt_dynar_get_as(db, j, char *));
- } else if (i >= 0 &&
- (j == -1 || diff_get(C, i, j - 1) < diff_get(C, i - 1, j))) {
- diff_build_diff(res, C, da, db, i - 1, j);
- diff_push(res, '-', xbt_dynar_get_as(da, i, char *));
- }
-}
-
-/** @brief Compute the unified diff of two strings */
-char *xbt_str_diff(const char *a, const char *b)
-{
- xbt_dynar_t da = xbt_str_split(a, "\n");
- xbt_dynar_t db = xbt_str_split(b, "\n");
- xbt_matrix_t C;
- xbt_dynar_t diff;
- xbt_dynar_t diff2;
- char *res;
- size_t len;
-
- diff = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
- diff2 = xbt_dynar_new(sizeof(char *), NULL);
-
- /* Clean empty lines at the end of da and db */
- len = strlen(a);
- if (len > 0 && a[len - 1] == '\n')
- xbt_dynar_pop(da, NULL);
- len = strlen(b);
- if (len > 0 && b[len - 1] == '\n')
- xbt_dynar_pop(db, NULL);
-
- /* Extract the easy suffix, do it before extracting the prefix,
- * as xbt_dynar_pop costs less than xbt_dynar_shift */
- diff_easy_suffix(diff2, da, db);
-
- /* Extract the easy prefix */
- diff_easy_prefix(diff, da, db);
-
- /* Compute the diff for the remaining */
- C = diff_build_LCS(da, db);
- diff_build_diff(diff, C, da, db,
- xbt_dynar_length(da) - 1, xbt_dynar_length(db) - 1);
- xbt_matrix_free(C);
- xbt_dynar_free(&db);
- xbt_dynar_free(&da);
-
- /* Add the easy suffix, in reverse order */
- while (!xbt_dynar_is_empty(diff2)) {
- char *topush = xbt_dynar_pop_as(diff2, char *);
- xbt_dynar_push(diff, &topush);
- }
- xbt_dynar_free(&diff2);
-
- /* Build the final result */
- res = xbt_str_join(diff, "\n");
- xbt_dynar_free(&diff);