Vergleich inc/3rdparty/diff/Diff/Engine/Native.php - 1.8.10 - 1.8.20

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 18Zeile 18
 * Geoffrey T. Dairiki <dairiki@dairiki.org>. The original PHP version of this
* code was written by him, and is used/adapted with his permission.
*

 * Geoffrey T. Dairiki <dairiki@dairiki.org>. The original PHP version of this
* code was written by him, and is used/adapted with his permission.
*

 * Copyright 2004-2011 Horde LLC (http://www.horde.org/)

 * Copyright 2004-2017 Horde LLC (http://www.horde.org/)

 *

 *

 * See the enclosed file COPYING for license information (LGPL). If you did

 * See the enclosed file LICENSE for license information (LGPL). If you did

 * not receive this file, see http://www.horde.org/licenses/lgpl21.
*
* @author Geoffrey T. Dairiki <dairiki@dairiki.org>

 * not receive this file, see http://www.horde.org/licenses/lgpl21.
*
* @author Geoffrey T. Dairiki <dairiki@dairiki.org>

Zeile 197Zeile 197
                }
$matches = $ymatches[$line];
reset($matches);

                }
$matches = $ymatches[$line];
reset($matches);

                while (list(, $y) = each($matches)) {

                while (($y = current($matches)) !== false) {

                    if (empty($this->in_seq[$y])) {
$k = $this->_lcsPos($y);
assert($k > 0);
$ymids[$k] = $ymids[$k - 1];
break;
}

                    if (empty($this->in_seq[$y])) {
$k = $this->_lcsPos($y);
assert($k > 0);
$ymids[$k] = $ymids[$k - 1];
break;
}

 
                    next($matches);

                }

                }

                while (list(, $y) = each($matches)) {

                while (($y = current($matches)) !== false) {

                    if ($y > $this->seq[$k - 1]) {
assert($y <= $this->seq[$k]);
/* Optimization: this is a common case: next match is

                    if ($y > $this->seq[$k - 1]) {
assert($y <= $this->seq[$k]);
/* Optimization: this is a common case: next match is

Zeile 218Zeile 219
                        assert($k > 0);
$ymids[$k] = $ymids[$k - 1];
}

                        assert($k > 0);
$ymids[$k] = $ymids[$k - 1];
}

 
                    next($matches);

                }
}
}

                }
}
}

Zeile 337Zeile 339
        $i = 0;
$j = 0;


        $i = 0;
$j = 0;


        assert('count($lines) == count($changed)');

        assert(count($lines) == count($changed));

        $len = count($lines);
$other_len = count($other_changed);


        $len = count($lines);
$other_len = count($other_changed);


Zeile 358Zeile 360
            }

while ($i < $len && ! $changed[$i]) {

            }

while ($i < $len && ! $changed[$i]) {

                assert('$j < $other_len && ! $other_changed[$j]');

                assert($j < $other_len && ! $other_changed[$j]);

                $i++; $j++;
while ($j < $other_len && $other_changed[$j]) {
$j++;

                $i++; $j++;
while ($j < $other_len && $other_changed[$j]) {
$j++;

Zeile 390Zeile 392
                    while ($start > 0 && $changed[$start - 1]) {
$start--;
}

                    while ($start > 0 && $changed[$start - 1]) {
$start--;
}

                    assert('$j > 0');

                    assert($j > 0);

                    while ($other_changed[--$j]) {
continue;
}

                    while ($other_changed[--$j]) {
continue;
}

                    assert('$j >= 0 && !$other_changed[$j]');

                    assert($j >= 0 && !$other_changed[$j]);

                }

/* Set CORRESPONDING to the end of the changed run, at the

                }

/* Set CORRESPONDING to the end of the changed run, at the

Zeile 415Zeile 417
                        $i++;
}


                        $i++;
}


                    assert('$j < $other_len && ! $other_changed[$j]');

                    assert($j < $other_len && ! $other_changed[$j]);

                    $j++;
if ($j < $other_len && $other_changed[$j]) {
$corresponding = $i;

                    $j++;
if ($j < $other_len && $other_changed[$j]) {
$corresponding = $i;

Zeile 431Zeile 433
            while ($corresponding < $i) {
$changed[--$start] = 1;
$changed[--$i] = 0;

            while ($corresponding < $i) {
$changed[--$start] = 1;
$changed[--$i] = 0;

                assert('$j > 0');

                assert($j > 0);

                while ($other_changed[--$j]) {
continue;
}

                while ($other_changed[--$j]) {
continue;
}

                assert('$j >= 0 && !$other_changed[$j]');

                assert($j >= 0 && !$other_changed[$j]);

            }
}
}

            }
}
}