enmi-conf.org: comparison wp/wp-includes/Text/Diff.php

equal deleted inserted replaced

-:48c4eec2b7e6
+:8c2e4d02f4ef
 * This is here only for debugging purposes.
 */
 function _check($from_lines, $to_lines)
 {
 if (serialize($from_lines) != serialize($this->getOriginal())) {
-trigger_error("Reconstructed original does not match", E_USER_ERROR);
+throw new Text_Exception("Reconstructed original does not match");
 }
 if (serialize($to_lines) != serialize($this->getFinal())) {
-trigger_error("Reconstructed final does not match", E_USER_ERROR);
+throw new Text_Exception("Reconstructed final does not match");
 }
 $rev = $this->reverse();
 if (serialize($to_lines) != serialize($rev->getOriginal())) {
-trigger_error("Reversed original does not match", E_USER_ERROR);
+throw new Text_Exception("Reversed original does not match");
 }
 if (serialize($from_lines) != serialize($rev->getFinal())) {
-trigger_error("Reversed final does not match", E_USER_ERROR);
+throw new Text_Exception("Reversed final does not match");
 }
 $prevtype = null;
 foreach ($this->_edits as $edit) {
-if ($edit instanceof $prevtype) {
+if ($prevtype !== null && $edit instanceof $prevtype) {
-trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
+throw new Text_Exception("Edit sequence is non-optimal");
 }
 $prevtype = get_class($edit);
 }
 return true;
 * @package Text_Diff
 * @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
 *
 * @access private
 */
-class Text_Diff_Op {
+abstract class Text_Diff_Op {
 var $orig;
 var $final;
-function &reverse()
+abstract function &reverse();
-{
-trigger_error('Abstract method', E_USER_ERROR);
-}
 function norig()
 {
 return $this->orig ? count($this->orig) : 0;
 }

changeset 22	8c2e4d02f4ef
parent 21	48c4eec2b7e6