{$this->method}
EOD;
- foreach ($this->args as $arg) {
- $this->xml .= '';
- $v = new IXR_Value($arg);
- $this->xml .= $v->getXml();
- $this->xml .= "\n";
- }
- $this->xml .= '';
- }
- function getLength() {
- return strlen($this->xml);
- }
- function getXml() {
- return $this->xml;
- }
+ foreach ($this->args as $arg) {
+ $this->xml .= '';
+ $v = new IXR_Value($arg);
+ $this->xml .= $v->getXml();
+ $this->xml .= "\n";
+ }
+ $this->xml .= '';
+ }
+ function getLength() {
+ return strlen($this->xml);
+ }
+ function getXml() {
+ return $this->xml;
+ }
}
/**
@@ -491,113 +491,113 @@
* @since 1.5
*/
class IXR_Client {
- var $server;
- var $port;
- var $path;
- var $useragent;
- var $response;
- var $message = false;
- var $debug = false;
- var $timeout;
- // Storage place for an error message
- var $error = false;
- function IXR_Client($server, $path = false, $port = 80, $timeout = false) {
- if (!$path) {
- // Assume we have been given a URL instead
- $bits = parse_url($server);
- $this->server = $bits['host'];
- $this->port = isset($bits['port']) ? $bits['port'] : 80;
- $this->path = isset($bits['path']) ? $bits['path'] : '/';
- // Make absolutely sure we have a path
- if (!$this->path) {
- $this->path = '/';
- }
- } else {
- $this->server = $server;
- $this->path = $path;
- $this->port = $port;
- }
- $this->useragent = 'The Incutio XML-RPC PHP Library';
- $this->timeout = $timeout;
- }
- function query() {
- $args = func_get_args();
- $method = array_shift($args);
- $request = new IXR_Request($method, $args);
- $length = $request->getLength();
- $xml = $request->getXml();
- $r = "\r\n";
- $request = "POST {$this->path} HTTP/1.0$r";
- $request .= "Host: {$this->server}$r";
- $request .= "Content-Type: text/xml$r";
- $request .= "User-Agent: {$this->useragent}$r";
- $request .= "Content-length: {$length}$r$r";
- $request .= $xml;
- // Now send the request
- if ($this->debug) {
- echo ''.htmlspecialchars($request)."\n
\n\n";
- }
- if ($this->timeout) {
- $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
- } else {
- $fp = @fsockopen($this->server, $this->port, $errno, $errstr);
- }
- if (!$fp) {
- $this->error = new IXR_Error(-32300, "transport error - could not open socket: $errno $errstr");
- return false;
- }
- fputs($fp, $request);
- $contents = '';
- $gotFirstLine = false;
- $gettingHeaders = true;
- while (!feof($fp)) {
- $line = fgets($fp, 4096);
- if (!$gotFirstLine) {
- // Check line for '200'
- if (strstr($line, '200') === false) {
- $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
- return false;
- }
- $gotFirstLine = true;
- }
- if (trim($line) == '') {
- $gettingHeaders = false;
- }
- if (!$gettingHeaders) {
- $contents .= trim($line);
- }
- }
- if ($this->debug) {
- echo ''.htmlspecialchars($contents)."\n
\n\n";
- }
- // Now parse what we've got back
- $this->message = new IXR_Message($contents);
- if (!$this->message->parse()) {
- // XML error
- $this->error = new IXR_Error(-32700, 'parse error. not well formed');
- return false;
- }
- // Is the message a fault?
- if ($this->message->messageType == 'fault') {
- $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
- return false;
- }
- // Message must be OK
- return true;
- }
- function getResponse() {
- // methodResponses can only have one param - return that
- return $this->message->params[0];
- }
- function isError() {
- return (is_object($this->error));
- }
- function getErrorCode() {
- return $this->error->code;
- }
- function getErrorMessage() {
- return $this->error->message;
- }
+ var $server;
+ var $port;
+ var $path;
+ var $useragent;
+ var $response;
+ var $message = false;
+ var $debug = false;
+ var $timeout;
+ // Storage place for an error message
+ var $error = false;
+ function IXR_Client($server, $path = false, $port = 80, $timeout = false) {
+ if (!$path) {
+ // Assume we have been given a URL instead
+ $bits = parse_url($server);
+ $this->server = $bits['host'];
+ $this->port = isset($bits['port']) ? $bits['port'] : 80;
+ $this->path = isset($bits['path']) ? $bits['path'] : '/';
+ // Make absolutely sure we have a path
+ if (!$this->path) {
+ $this->path = '/';
+ }
+ } else {
+ $this->server = $server;
+ $this->path = $path;
+ $this->port = $port;
+ }
+ $this->useragent = 'The Incutio XML-RPC PHP Library';
+ $this->timeout = $timeout;
+ }
+ function query() {
+ $args = func_get_args();
+ $method = array_shift($args);
+ $request = new IXR_Request($method, $args);
+ $length = $request->getLength();
+ $xml = $request->getXml();
+ $r = "\r\n";
+ $request = "POST {$this->path} HTTP/1.0$r";
+ $request .= "Host: {$this->server}$r";
+ $request .= "Content-Type: text/xml$r";
+ $request .= "User-Agent: {$this->useragent}$r";
+ $request .= "Content-length: {$length}$r$r";
+ $request .= $xml;
+ // Now send the request
+ if ($this->debug) {
+ echo ''.htmlspecialchars($request)."\n
\n\n";
+ }
+ if ($this->timeout) {
+ $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
+ } else {
+ $fp = @fsockopen($this->server, $this->port, $errno, $errstr);
+ }
+ if (!$fp) {
+ $this->error = new IXR_Error(-32300, "transport error - could not open socket: $errno $errstr");
+ return false;
+ }
+ fputs($fp, $request);
+ $contents = '';
+ $gotFirstLine = false;
+ $gettingHeaders = true;
+ while (!feof($fp)) {
+ $line = fgets($fp, 4096);
+ if (!$gotFirstLine) {
+ // Check line for '200'
+ if (strstr($line, '200') === false) {
+ $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
+ return false;
+ }
+ $gotFirstLine = true;
+ }
+ if (trim($line) == '') {
+ $gettingHeaders = false;
+ }
+ if (!$gettingHeaders) {
+ $contents .= trim($line);
+ }
+ }
+ if ($this->debug) {
+ echo ''.htmlspecialchars($contents)."\n
\n\n";
+ }
+ // Now parse what we've got back
+ $this->message = new IXR_Message($contents);
+ if (!$this->message->parse()) {
+ // XML error
+ $this->error = new IXR_Error(-32700, 'parse error. not well formed');
+ return false;
+ }
+ // Is the message a fault?
+ if ($this->message->messageType == 'fault') {
+ $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
+ return false;
+ }
+ // Message must be OK
+ return true;
+ }
+ function getResponse() {
+ // methodResponses can only have one param - return that
+ return $this->message->params[0];
+ }
+ function isError() {
+ return (is_object($this->error));
+ }
+ function getErrorCode() {
+ return $this->error->code;
+ }
+ function getErrorMessage() {
+ return $this->error->message;
+ }
}
/**
@@ -607,35 +607,35 @@
* @since 1.5
*/
class IXR_Error {
- var $code;
- var $message;
- function IXR_Error($code, $message) {
- $this->code = $code;
- // WP adds htmlspecialchars(). See #5666
- $this->message = htmlspecialchars($message);
- }
- function getXml() {
- $xml = <<code = $code;
+ // WP adds htmlspecialchars(). See #5666
+ $this->message = htmlspecialchars($message);
+ }
+ function getXml() {
+ $xml = <<
-
-
-
- faultCode
- {$this->code}
-
-
- faultString
- {$this->message}
-
-
-
+
+
+
+ faultCode
+ {$this->code}
+
+
+ faultString
+ {$this->message}
+
+
+
EOD;
- return $xml;
- }
+ return $xml;
+ }
}
/**
@@ -645,51 +645,51 @@
* @since 1.5
*/
class IXR_Date {
- var $year;
- var $month;
- var $day;
- var $hour;
- var $minute;
- var $second;
- var $timezone;
- function IXR_Date($time) {
- // $time can be a PHP timestamp or an ISO one
- if (is_numeric($time)) {
- $this->parseTimestamp($time);
- } else {
- $this->parseIso($time);
- }
- }
- function parseTimestamp($timestamp) {
- $this->year = date('Y', $timestamp);
- $this->month = date('m', $timestamp);
- $this->day = date('d', $timestamp);
- $this->hour = date('H', $timestamp);
- $this->minute = date('i', $timestamp);
- $this->second = date('s', $timestamp);
- // WP adds timezone. See #2036
- $this->timezone = '';
- }
- function parseIso($iso) {
- $this->year = substr($iso, 0, 4);
- $this->month = substr($iso, 4, 2);
- $this->day = substr($iso, 6, 2);
- $this->hour = substr($iso, 9, 2);
- $this->minute = substr($iso, 12, 2);
- $this->second = substr($iso, 15, 2);
- // WP adds timezone. See #2036
- $this->timezone = substr($iso, 17);
- }
- function getIso() {
- // WP adds timezone. See #2036
- return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
- }
- function getXml() {
- return ''.$this->getIso().'';
- }
- function getTimestamp() {
- return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
- }
+ var $year;
+ var $month;
+ var $day;
+ var $hour;
+ var $minute;
+ var $second;
+ var $timezone;
+ function IXR_Date($time) {
+ // $time can be a PHP timestamp or an ISO one
+ if (is_numeric($time)) {
+ $this->parseTimestamp($time);
+ } else {
+ $this->parseIso($time);
+ }
+ }
+ function parseTimestamp($timestamp) {
+ $this->year = date('Y', $timestamp);
+ $this->month = date('m', $timestamp);
+ $this->day = date('d', $timestamp);
+ $this->hour = date('H', $timestamp);
+ $this->minute = date('i', $timestamp);
+ $this->second = date('s', $timestamp);
+ // WP adds timezone. See #2036
+ $this->timezone = '';
+ }
+ function parseIso($iso) {
+ $this->year = substr($iso, 0, 4);
+ $this->month = substr($iso, 4, 2);
+ $this->day = substr($iso, 6, 2);
+ $this->hour = substr($iso, 9, 2);
+ $this->minute = substr($iso, 12, 2);
+ $this->second = substr($iso, 15, 2);
+ // WP adds timezone. See #2036
+ $this->timezone = substr($iso, 17);
+ }
+ function getIso() {
+ // WP adds timezone. See #2036
+ return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
+ }
+ function getXml() {
+ return ''.$this->getIso().'';
+ }
+ function getTimestamp() {
+ return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
+ }
}
/**
@@ -699,13 +699,13 @@
* @since 1.5
*/
class IXR_Base64 {
- var $data;
- function IXR_Base64($data) {
- $this->data = $data;
- }
- function getXml() {
- return ''.base64_encode($this->data).'';
- }
+ var $data;
+ function IXR_Base64($data) {
+ $this->data = $data;
+ }
+ function getXml() {
+ return ''.base64_encode($this->data).'';
+ }
}
/**
@@ -715,146 +715,146 @@
* @since 1.5
*/
class IXR_IntrospectionServer extends IXR_Server {
- var $signatures;
- var $help;
- function IXR_IntrospectionServer() {
- $this->setCallbacks();
- $this->setCapabilities();
- $this->capabilities['introspection'] = array(
- 'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
- 'specVersion' => 1
- );
- $this->addCallback(
- 'system.methodSignature',
- 'this:methodSignature',
- array('array', 'string'),
- 'Returns an array describing the return type and required parameters of a method'
- );
- $this->addCallback(
- 'system.getCapabilities',
- 'this:getCapabilities',
- array('struct'),
- 'Returns a struct describing the XML-RPC specifications supported by this server'
- );
- $this->addCallback(
- 'system.listMethods',
- 'this:listMethods',
- array('array'),
- 'Returns an array of available methods on this server'
- );
- $this->addCallback(
- 'system.methodHelp',
- 'this:methodHelp',
- array('string', 'string'),
- 'Returns a documentation string for the specified method'
- );
- }
- function addCallback($method, $callback, $args, $help) {
- $this->callbacks[$method] = $callback;
- $this->signatures[$method] = $args;
- $this->help[$method] = $help;
- }
- function call($methodname, $args) {
- // Make sure it's in an array
- if ($args && !is_array($args)) {
- $args = array($args);
- }
- // Over-rides default call method, adds signature check
- if (!$this->hasMethod($methodname)) {
- return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
- }
- $method = $this->callbacks[$methodname];
- $signature = $this->signatures[$methodname];
- $returnType = array_shift($signature);
- // Check the number of arguments
- if (count($args) != count($signature)) {
- return new IXR_Error(-32602, 'server error. wrong number of method parameters');
- }
- // Check the argument types
- $ok = true;
- $argsbackup = $args;
- for ($i = 0, $j = count($args); $i < $j; $i++) {
- $arg = array_shift($args);
- $type = array_shift($signature);
- switch ($type) {
- case 'int':
- case 'i4':
- if (is_array($arg) || !is_int($arg)) {
- $ok = false;
- }
- break;
- case 'base64':
- case 'string':
- if (!is_string($arg)) {
- $ok = false;
- }
- break;
- case 'boolean':
- if ($arg !== false && $arg !== true) {
- $ok = false;
- }
- break;
- case 'float':
- case 'double':
- if (!is_float($arg)) {
- $ok = false;
- }
- break;
- case 'date':
- case 'dateTime.iso8601':
- if (!is_a($arg, 'IXR_Date')) {
- $ok = false;
- }
- break;
- }
- if (!$ok) {
- return new IXR_Error(-32602, 'server error. invalid method parameters');
- }
- }
- // It passed the test - run the "real" method call
- return parent::call($methodname, $argsbackup);
- }
- function methodSignature($method) {
- if (!$this->hasMethod($method)) {
- return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
- }
- // We should be returning an array of types
- $types = $this->signatures[$method];
- $return = array();
- foreach ($types as $type) {
- switch ($type) {
- case 'string':
- $return[] = 'string';
- break;
- case 'int':
- case 'i4':
- $return[] = 42;
- break;
- case 'double':
- $return[] = 3.1415;
- break;
- case 'dateTime.iso8601':
- $return[] = new IXR_Date(time());
- break;
- case 'boolean':
- $return[] = true;
- break;
- case 'base64':
- $return[] = new IXR_Base64('base64');
- break;
- case 'array':
- $return[] = array('array');
- break;
- case 'struct':
- $return[] = array('struct' => 'struct');
- break;
- }
- }
- return $return;
- }
- function methodHelp($method) {
- return $this->help[$method];
- }
+ var $signatures;
+ var $help;
+ function IXR_IntrospectionServer() {
+ $this->setCallbacks();
+ $this->setCapabilities();
+ $this->capabilities['introspection'] = array(
+ 'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
+ 'specVersion' => 1
+ );
+ $this->addCallback(
+ 'system.methodSignature',
+ 'this:methodSignature',
+ array('array', 'string'),
+ 'Returns an array describing the return type and required parameters of a method'
+ );
+ $this->addCallback(
+ 'system.getCapabilities',
+ 'this:getCapabilities',
+ array('struct'),
+ 'Returns a struct describing the XML-RPC specifications supported by this server'
+ );
+ $this->addCallback(
+ 'system.listMethods',
+ 'this:listMethods',
+ array('array'),
+ 'Returns an array of available methods on this server'
+ );
+ $this->addCallback(
+ 'system.methodHelp',
+ 'this:methodHelp',
+ array('string', 'string'),
+ 'Returns a documentation string for the specified method'
+ );
+ }
+ function addCallback($method, $callback, $args, $help) {
+ $this->callbacks[$method] = $callback;
+ $this->signatures[$method] = $args;
+ $this->help[$method] = $help;
+ }
+ function call($methodname, $args) {
+ // Make sure it's in an array
+ if ($args && !is_array($args)) {
+ $args = array($args);
+ }
+ // Over-rides default call method, adds signature check
+ if (!$this->hasMethod($methodname)) {
+ return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
+ }
+ $method = $this->callbacks[$methodname];
+ $signature = $this->signatures[$methodname];
+ $returnType = array_shift($signature);
+ // Check the number of arguments
+ if (count($args) != count($signature)) {
+ return new IXR_Error(-32602, 'server error. wrong number of method parameters');
+ }
+ // Check the argument types
+ $ok = true;
+ $argsbackup = $args;
+ for ($i = 0, $j = count($args); $i < $j; $i++) {
+ $arg = array_shift($args);
+ $type = array_shift($signature);
+ switch ($type) {
+ case 'int':
+ case 'i4':
+ if (is_array($arg) || !is_int($arg)) {
+ $ok = false;
+ }
+ break;
+ case 'base64':
+ case 'string':
+ if (!is_string($arg)) {
+ $ok = false;
+ }
+ break;
+ case 'boolean':
+ if ($arg !== false && $arg !== true) {
+ $ok = false;
+ }
+ break;
+ case 'float':
+ case 'double':
+ if (!is_float($arg)) {
+ $ok = false;
+ }
+ break;
+ case 'date':
+ case 'dateTime.iso8601':
+ if (!is_a($arg, 'IXR_Date')) {
+ $ok = false;
+ }
+ break;
+ }
+ if (!$ok) {
+ return new IXR_Error(-32602, 'server error. invalid method parameters');
+ }
+ }
+ // It passed the test - run the "real" method call
+ return parent::call($methodname, $argsbackup);
+ }
+ function methodSignature($method) {
+ if (!$this->hasMethod($method)) {
+ return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
+ }
+ // We should be returning an array of types
+ $types = $this->signatures[$method];
+ $return = array();
+ foreach ($types as $type) {
+ switch ($type) {
+ case 'string':
+ $return[] = 'string';
+ break;
+ case 'int':
+ case 'i4':
+ $return[] = 42;
+ break;
+ case 'double':
+ $return[] = 3.1415;
+ break;
+ case 'dateTime.iso8601':
+ $return[] = new IXR_Date(time());
+ break;
+ case 'boolean':
+ $return[] = true;
+ break;
+ case 'base64':
+ $return[] = new IXR_Base64('base64');
+ break;
+ case 'array':
+ $return[] = array('array');
+ break;
+ case 'struct':
+ $return[] = array('struct' => 'struct');
+ break;
+ }
+ }
+ return $return;
+ }
+ function methodHelp($method) {
+ return $this->help[$method];
+ }
}
/**
@@ -864,24 +864,24 @@
* @since 1.5
*/
class IXR_ClientMulticall extends IXR_Client {
- var $calls = array();
- function IXR_ClientMulticall($server, $path = false, $port = 80) {
- parent::IXR_Client($server, $path, $port);
- $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
- }
- function addCall() {
- $args = func_get_args();
- $methodName = array_shift($args);
- $struct = array(
- 'methodName' => $methodName,
- 'params' => $args
- );
- $this->calls[] = $struct;
- }
- function query() {
- // Prepare multicall, then call the parent::query() method
- return parent::query('system.multicall', $this->calls);
- }
+ var $calls = array();
+ function IXR_ClientMulticall($server, $path = false, $port = 80) {
+ parent::IXR_Client($server, $path, $port);
+ $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
+ }
+ function addCall() {
+ $args = func_get_args();
+ $methodName = array_shift($args);
+ $struct = array(
+ 'methodName' => $methodName,
+ 'params' => $args
+ );
+ $this->calls[] = $struct;
+ }
+ function query() {
+ // Prepare multicall, then call the parent::query() method
+ return parent::query('system.multicall', $this->calls);
+ }
}
?>
Index: class-phpass.php
===================================================================
--- class-phpass.php (revision 8917)
+++ class-phpass.php (working copy)
@@ -65,9 +65,9 @@
$output = '';
for ($i = 0; $i < $count; $i += 16) {
$this->random_state =
- md5(microtime() . $this->random_state);
+ md5(microtime() . $this->random_state);
$output .=
- pack('H*', md5($this->random_state));
+ pack('H*', md5($this->random_state));
}
$output = substr($output, 0, $count);
}
@@ -217,7 +217,7 @@
if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
$random = $this->get_random_bytes(16);
$hash =
- crypt($password, $this->gensalt_blowfish($random));
+ crypt($password, $this->gensalt_blowfish($random));
if (strlen($hash) == 60)
return $hash;
}
@@ -226,7 +226,7 @@
if (strlen($random) < 3)
$random = $this->get_random_bytes(3);
$hash =
- crypt($password, $this->gensalt_extended($random));
+ crypt($password, $this->gensalt_extended($random));
if (strlen($hash) == 20)
return $hash;
}
@@ -234,8 +234,8 @@
if (strlen($random) < 6)
$random = $this->get_random_bytes(6);
$hash =
- $this->crypt_private($password,
- $this->gensalt_private($random));
+ $this->crypt_private($password,
+ $this->gensalt_private($random));
if (strlen($hash) == 34)
return $hash;
Index: class-snoopy.php
===================================================================
--- class-snoopy.php (revision 8917)
+++ class-snoopy.php (working copy)
@@ -213,8 +213,8 @@
if(!$this->curl_path)
return false;
if(function_exists("is_executable"))
- if (!is_executable($this->curl_path))
- return false;
+ if (!is_executable($this->curl_path))
+ return false;
$this->host = $URI_PARTS["host"];
if(!empty($URI_PARTS["port"]))
$this->port = $URI_PARTS["port"];
@@ -372,8 +372,8 @@
if(!$this->curl_path)
return false;
if(function_exists("is_executable"))
- if (!is_executable($this->curl_path))
- return false;
+ if (!is_executable($this->curl_path))
+ return false;
$this->host = $URI_PARTS["host"];
if(!empty($URI_PARTS["port"]))
$this->port = $URI_PARTS["port"];
@@ -893,10 +893,10 @@
if(preg_match("|^HTTP/|",$currentHeader))
{
- if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
+ if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
{
$this->status= $status[1];
- }
+ }
$this->response_code = $currentHeader;
}
@@ -905,11 +905,11 @@
$results = '';
do {
- $_data = fread($fp, $this->maxlength);
- if (strlen($_data) == 0) {
- break;
- }
- $results .= $_data;
+ $_data = fread($fp, $this->maxlength);
+ if (strlen($_data) == 0) {
+ break;
+ }
+ $results .= $_data;
} while(true);
if ($this->read_timeout > 0 && $this->_check_timeout($fp))
Index: streams.php
===================================================================
--- streams.php (revision 8917)
+++ streams.php (working copy)
@@ -6,23 +6,23 @@
* @subpackage PHP-gettext
*
* @internal
- Copyright (c) 2003, 2005 Danilo Segan .
+ Copyright (c) 2003, 2005 Danilo Segan .
- This file is part of PHP-gettext.
+ This file is part of PHP-gettext.
- PHP-gettext is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ PHP-gettext is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- PHP-gettext is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ PHP-gettext is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with PHP-gettext; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with PHP-gettext; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -30,161 +30,161 @@
// Simple class to wrap file streams, string streams, etc.
// seek is essential, and it should be byte stream
class StreamReader {
- // should return a string [FIXME: perhaps return array of bytes?]
- function read($bytes) {
- return false;
- }
+ // should return a string [FIXME: perhaps return array of bytes?]
+ function read($bytes) {
+ return false;
+ }
- // should return new position
- function seekto($position) {
- return false;
- }
+ // should return new position
+ function seekto($position) {
+ return false;
+ }
- // returns current position
- function currentpos() {
- return false;
- }
+ // returns current position
+ function currentpos() {
+ return false;
+ }
- // returns length of entire stream (limit for seekto()s)
- function length() {
- return false;
- }
+ // returns length of entire stream (limit for seekto()s)
+ function length() {
+ return false;
+ }
}
class StringReader {
- var $_pos;
- var $_str;
+ var $_pos;
+ var $_str;
- function StringReader($str='') {
- $this->_str = $str;
- $this->_pos = 0;
- // If string functions are overloaded, we need to use the mb versions
- $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
- }
+ function StringReader($str='') {
+ $this->_str = $str;
+ $this->_pos = 0;
+ // If string functions are overloaded, we need to use the mb versions
+ $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
+ }
- function _substr($string, $start, $length) {
+ function _substr($string, $start, $length) {
if ($this->is_overloaded) {
return mb_substr($string,$start,$length,'ascii');
} else {
return substr($string,$start,$length);
}
- }
+ }
- function _strlen($string) {
+ function _strlen($string) {
if ($this->is_overloaded) {
return mb_strlen($string,'ascii');
} else {
return strlen($string);
}
- }
+ }
- function read($bytes) {
- $data = $this->_substr($this->_str, $this->_pos, $bytes);
- $this->_pos += $bytes;
- if ($this->_strlen($this->_str)<$this->_pos)
- $this->_pos = $this->_strlen($this->_str);
+ function read($bytes) {
+ $data = $this->_substr($this->_str, $this->_pos, $bytes);
+ $this->_pos += $bytes;
+ if ($this->_strlen($this->_str)<$this->_pos)
+ $this->_pos = $this->_strlen($this->_str);
- return $data;
- }
+ return $data;
+ }
- function seekto($pos) {
- $this->_pos = $pos;
- if ($this->_strlen($this->_str)<$this->_pos)
- $this->_pos = $this->_strlen($this->_str);
- return $this->_pos;
- }
+ function seekto($pos) {
+ $this->_pos = $pos;
+ if ($this->_strlen($this->_str)<$this->_pos)
+ $this->_pos = $this->_strlen($this->_str);
+ return $this->_pos;
+ }
- function currentpos() {
- return $this->_pos;
- }
+ function currentpos() {
+ return $this->_pos;
+ }
- function length() {
- return $this->_strlen($this->_str);
- }
+ function length() {
+ return $this->_strlen($this->_str);
+ }
}
class FileReader {
- var $_pos;
- var $_fd;
- var $_length;
+ var $_pos;
+ var $_fd;
+ var $_length;
- function FileReader($filename) {
- if (file_exists($filename)) {
+ function FileReader($filename) {
+ if (file_exists($filename)) {
- $this->_length=filesize($filename);
- $this->_pos = 0;
- $this->_fd = fopen($filename,'rb');
- if (!$this->_fd) {
+ $this->_length=filesize($filename);
+ $this->_pos = 0;
+ $this->_fd = fopen($filename,'rb');
+ if (!$this->_fd) {
$this->error = 3; // Cannot read file, probably permissions
return false;
- }
- } else {
- $this->error = 2; // File doesn't exist
- return false;
- }
- }
+ }
+ } else {
+ $this->error = 2; // File doesn't exist
+ return false;
+ }
+ }
- function read($bytes) {
- if ($bytes) {
- fseek($this->_fd, $this->_pos);
+ function read($bytes) {
+ if ($bytes) {
+ fseek($this->_fd, $this->_pos);
- // PHP 5.1.1 does not read more than 8192 bytes in one fread()
- // the discussions at PHP Bugs suggest it's the intended behaviour
- while ($bytes > 0) {
- $chunk = fread($this->_fd, $bytes);
- $data .= $chunk;
- $bytes -= strlen($chunk);
- }
- $this->_pos = ftell($this->_fd);
+ // PHP 5.1.1 does not read more than 8192 bytes in one fread()
+ // the discussions at PHP Bugs suggest it's the intended behaviour
+ while ($bytes > 0) {
+ $chunk = fread($this->_fd, $bytes);
+ $data .= $chunk;
+ $bytes -= strlen($chunk);
+ }
+ $this->_pos = ftell($this->_fd);
- return $data;
- } else return '';
- }
+ return $data;
+ } else return '';
+ }
- function seekto($pos) {
- fseek($this->_fd, $pos);
- $this->_pos = ftell($this->_fd);
- return $this->_pos;
- }
+ function seekto($pos) {
+ fseek($this->_fd, $pos);
+ $this->_pos = ftell($this->_fd);
+ return $this->_pos;
+ }
- function currentpos() {
- return $this->_pos;
- }
+ function currentpos() {
+ return $this->_pos;
+ }
- function length() {
- return $this->_length;
- }
+ function length() {
+ return $this->_length;
+ }
- function close() {
- fclose($this->_fd);
- }
+ function close() {
+ fclose($this->_fd);
+ }
}
// Preloads entire file in memory first, then creates a StringReader
// over it (it assumes knowledge of StringReader internals)
class CachedFileReader extends StringReader {
- function CachedFileReader($filename) {
- parent::StringReader();
+ function CachedFileReader($filename) {
+ parent::StringReader();
- if (file_exists($filename)) {
+ if (file_exists($filename)) {
- $length=filesize($filename);
- $fd = fopen($filename,'rb');
+ $length=filesize($filename);
+ $fd = fopen($filename,'rb');
- if (!$fd) {
- $this->error = 3; // Cannot read file, probably permissions
- return false;
- }
- $this->_str = fread($fd, $length);
- fclose($fd);
+ if (!$fd) {
+ $this->error = 3; // Cannot read file, probably permissions
+ return false;
+ }
+ $this->_str = fread($fd, $length);
+ fclose($fd);
- } else {
- $this->error = 2; // File doesn't exist
- return false;
- }
- }
+ } else {
+ $this->error = 2; // File doesn't exist
+ return false;
+ }
+ }
}
Index: Text/Diff.php
===================================================================
--- Text/Diff.php (revision 8917)
+++ Text/Diff.php (working copy)
@@ -19,230 +19,230 @@
*/
class Text_Diff {
- /**
- * Array of changes.
- *
- * @var array
- */
- var $_edits;
+ /**
+ * Array of changes.
+ *
+ * @var array
+ */
+ var $_edits;
- /**
- * Computes diffs between sequences of strings.
- *
- * @param string $engine Name of the diffing engine to use. 'auto'
- * will automatically select the best.
- * @param array $params Parameters to pass to the diffing engine.
- * Normally an array of two arrays, each
- * containing the lines from a file.
- */
- function Text_Diff($engine, $params)
- {
- // Backward compatibility workaround.
- if (!is_string($engine)) {
- $params = array($engine, $params);
- $engine = 'auto';
- }
+ /**
+ * Computes diffs between sequences of strings.
+ *
+ * @param string $engine Name of the diffing engine to use. 'auto'
+ * will automatically select the best.
+ * @param array $params Parameters to pass to the diffing engine.
+ * Normally an array of two arrays, each
+ * containing the lines from a file.
+ */
+ function Text_Diff($engine, $params)
+ {
+ // Backward compatibility workaround.
+ if (!is_string($engine)) {
+ $params = array($engine, $params);
+ $engine = 'auto';
+ }
- if ($engine == 'auto') {
- $engine = extension_loaded('xdiff') ? 'xdiff' : 'native';
- } else {
- $engine = basename($engine);
- }
+ if ($engine == 'auto') {
+ $engine = extension_loaded('xdiff') ? 'xdiff' : 'native';
+ } else {
+ $engine = basename($engine);
+ }
- // WP #7391
- require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
- $class = 'Text_Diff_Engine_' . $engine;
- $diff_engine = new $class();
+ // WP #7391
+ require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
+ $class = 'Text_Diff_Engine_' . $engine;
+ $diff_engine = new $class();
- $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
- }
+ $this->_edits = call_user_func_array(array($diff_engine, 'diff'), $params);
+ }
- /**
- * Returns the array of differences.
- */
- function getDiff()
- {
- return $this->_edits;
- }
+ /**
+ * Returns the array of differences.
+ */
+ function getDiff()
+ {
+ return $this->_edits;
+ }
- /**
- * Computes a reversed diff.
- *
- * Example:
- *
- * $diff = new Text_Diff($lines1, $lines2);
- * $rev = $diff->reverse();
- *
- *
- * @return Text_Diff A Diff object representing the inverse of the
- * original diff. Note that we purposely don't return a
- * reference here, since this essentially is a clone()
- * method.
- */
- function reverse()
- {
- if (version_compare(zend_version(), '2', '>')) {
- $rev = clone($this);
- } else {
- $rev = $this;
- }
- $rev->_edits = array();
- foreach ($this->_edits as $edit) {
- $rev->_edits[] = $edit->reverse();
- }
- return $rev;
- }
+ /**
+ * Computes a reversed diff.
+ *
+ * Example:
+ *
+ * $diff = new Text_Diff($lines1, $lines2);
+ * $rev = $diff->reverse();
+ *
+ *
+ * @return Text_Diff A Diff object representing the inverse of the
+ * original diff. Note that we purposely don't return a
+ * reference here, since this essentially is a clone()
+ * method.
+ */
+ function reverse()
+ {
+ if (version_compare(zend_version(), '2', '>')) {
+ $rev = clone($this);
+ } else {
+ $rev = $this;
+ }
+ $rev->_edits = array();
+ foreach ($this->_edits as $edit) {
+ $rev->_edits[] = $edit->reverse();
+ }
+ return $rev;
+ }
- /**
- * Checks for an empty diff.
- *
- * @return boolean True if two sequences were identical.
- */
- function isEmpty()
- {
- foreach ($this->_edits as $edit) {
- if (!is_a($edit, 'Text_Diff_Op_copy')) {
- return false;
- }
- }
- return true;
- }
+ /**
+ * Checks for an empty diff.
+ *
+ * @return boolean True if two sequences were identical.
+ */
+ function isEmpty()
+ {
+ foreach ($this->_edits as $edit) {
+ if (!is_a($edit, 'Text_Diff_Op_copy')) {
+ return false;
+ }
+ }
+ return true;
+ }
- /**
- * Computes the length of the Longest Common Subsequence (LCS).
- *
- * This is mostly for diagnostic purposes.
- *
- * @return integer The length of the LCS.
- */
- function lcs()
- {
- $lcs = 0;
- foreach ($this->_edits as $edit) {
- if (is_a($edit, 'Text_Diff_Op_copy')) {
- $lcs += count($edit->orig);
- }
- }
- return $lcs;
- }
+ /**
+ * Computes the length of the Longest Common Subsequence (LCS).
+ *
+ * This is mostly for diagnostic purposes.
+ *
+ * @return integer The length of the LCS.
+ */
+ function lcs()
+ {
+ $lcs = 0;
+ foreach ($this->_edits as $edit) {
+ if (is_a($edit, 'Text_Diff_Op_copy')) {
+ $lcs += count($edit->orig);
+ }
+ }
+ return $lcs;
+ }
- /**
- * Gets the original set of lines.
- *
- * This reconstructs the $from_lines parameter passed to the constructor.
- *
- * @return array The original sequence of strings.
- */
- function getOriginal()
- {
- $lines = array();
- foreach ($this->_edits as $edit) {
- if ($edit->orig) {
- array_splice($lines, count($lines), 0, $edit->orig);
- }
- }
- return $lines;
- }
+ /**
+ * Gets the original set of lines.
+ *
+ * This reconstructs the $from_lines parameter passed to the constructor.
+ *
+ * @return array The original sequence of strings.
+ */
+ function getOriginal()
+ {
+ $lines = array();
+ foreach ($this->_edits as $edit) {
+ if ($edit->orig) {
+ array_splice($lines, count($lines), 0, $edit->orig);
+ }
+ }
+ return $lines;
+ }
- /**
- * Gets the final set of lines.
- *
- * This reconstructs the $to_lines parameter passed to the constructor.
- *
- * @return array The sequence of strings.
- */
- function getFinal()
- {
- $lines = array();
- foreach ($this->_edits as $edit) {
- if ($edit->final) {
- array_splice($lines, count($lines), 0, $edit->final);
- }
- }
- return $lines;
- }
+ /**
+ * Gets the final set of lines.
+ *
+ * This reconstructs the $to_lines parameter passed to the constructor.
+ *
+ * @return array The sequence of strings.
+ */
+ function getFinal()
+ {
+ $lines = array();
+ foreach ($this->_edits as $edit) {
+ if ($edit->final) {
+ array_splice($lines, count($lines), 0, $edit->final);
+ }
+ }
+ return $lines;
+ }
- /**
- * Removes trailing newlines from a line of text. This is meant to be used
- * with array_walk().
- *
- * @param string $line The line to trim.
- * @param integer $key The index of the line in the array. Not used.
- */
- function trimNewlines(&$line, $key)
- {
- $line = str_replace(array("\n", "\r"), '', $line);
- }
+ /**
+ * Removes trailing newlines from a line of text. This is meant to be used
+ * with array_walk().
+ *
+ * @param string $line The line to trim.
+ * @param integer $key The index of the line in the array. Not used.
+ */
+ function trimNewlines(&$line, $key)
+ {
+ $line = str_replace(array("\n", "\r"), '', $line);
+ }
- /**
- * Determines the location of the system temporary directory.
- *
- * @static
- *
- * @access protected
- *
- * @return string A directory name which can be used for temp files.
- * Returns false if one could not be found.
- */
- function _getTempDir()
- {
- $tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
- 'c:\windows\temp', 'c:\winnt\temp');
+ /**
+ * Determines the location of the system temporary directory.
+ *
+ * @static
+ *
+ * @access protected
+ *
+ * @return string A directory name which can be used for temp files.
+ * Returns false if one could not be found.
+ */
+ function _getTempDir()
+ {
+ $tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
+ 'c:\windows\temp', 'c:\winnt\temp');
- /* Try PHP's upload_tmp_dir directive. */
- $tmp = ini_get('upload_tmp_dir');
+ /* Try PHP's upload_tmp_dir directive. */
+ $tmp = ini_get('upload_tmp_dir');
- /* Otherwise, try to determine the TMPDIR environment variable. */
- if (!strlen($tmp)) {
- $tmp = getenv('TMPDIR');
- }
+ /* Otherwise, try to determine the TMPDIR environment variable. */
+ if (!strlen($tmp)) {
+ $tmp = getenv('TMPDIR');
+ }
- /* If we still cannot determine a value, then cycle through a list of
- * preset possibilities. */
- while (!strlen($tmp) && count($tmp_locations)) {
- $tmp_check = array_shift($tmp_locations);
- if (@is_dir($tmp_check)) {
- $tmp = $tmp_check;
- }
- }
+ /* If we still cannot determine a value, then cycle through a list of
+ * preset possibilities. */
+ while (!strlen($tmp) && count($tmp_locations)) {
+ $tmp_check = array_shift($tmp_locations);
+ if (@is_dir($tmp_check)) {
+ $tmp = $tmp_check;
+ }
+ }
- /* If it is still empty, we have failed, so return false; otherwise
- * return the directory determined. */
- return strlen($tmp) ? $tmp : false;
- }
+ /* If it is still empty, we have failed, so return false; otherwise
+ * return the directory determined. */
+ return strlen($tmp) ? $tmp : false;
+ }
- /**
- * Checks a diff for validity.
- *
- * This is here only for debugging purposes.
- */
- function _check($from_lines, $to_lines)
- {
- if (serialize($from_lines) != serialize($this->getOriginal())) {
- trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
- }
- if (serialize($to_lines) != serialize($this->getFinal())) {
- trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
- }
+ /**
+ * Checks a diff for validity.
+ *
+ * This is here only for debugging purposes.
+ */
+ function _check($from_lines, $to_lines)
+ {
+ if (serialize($from_lines) != serialize($this->getOriginal())) {
+ trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
+ }
+ if (serialize($to_lines) != serialize($this->getFinal())) {
+ trigger_error("Reconstructed final doesn't match", E_USER_ERROR);
+ }
- $rev = $this->reverse();
- if (serialize($to_lines) != serialize($rev->getOriginal())) {
- trigger_error("Reversed original doesn't match", E_USER_ERROR);
- }
- if (serialize($from_lines) != serialize($rev->getFinal())) {
- trigger_error("Reversed final doesn't match", E_USER_ERROR);
- }
+ $rev = $this->reverse();
+ if (serialize($to_lines) != serialize($rev->getOriginal())) {
+ trigger_error("Reversed original doesn't match", E_USER_ERROR);
+ }
+ if (serialize($from_lines) != serialize($rev->getFinal())) {
+ trigger_error("Reversed final doesn't match", E_USER_ERROR);
+ }
- $prevtype = null;
- foreach ($this->_edits as $edit) {
- if ($prevtype == get_class($edit)) {
- trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
- }
- $prevtype = get_class($edit);
- }
+ $prevtype = null;
+ foreach ($this->_edits as $edit) {
+ if ($prevtype == get_class($edit)) {
+ trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
+ }
+ $prevtype = get_class($edit);
+ }
- return true;
- }
+ return true;
+ }
}
@@ -252,45 +252,45 @@
*/
class Text_MappedDiff extends Text_Diff {
- /**
- * Computes a diff between sequences of strings.
- *
- * This can be used to compute things like case-insensitve diffs, or diffs
- * which ignore changes in white-space.
- *
- * @param array $from_lines An array of strings.
- * @param array $to_lines An array of strings.
- * @param array $mapped_from_lines This array should have the same size
- * number of elements as $from_lines. The
- * elements in $mapped_from_lines and
- * $mapped_to_lines are what is actually
- * compared when computing the diff.
- * @param array $mapped_to_lines This array should have the same number
- * of elements as $to_lines.
- */
- function Text_MappedDiff($from_lines, $to_lines,
- $mapped_from_lines, $mapped_to_lines)
- {
- assert(count($from_lines) == count($mapped_from_lines));
- assert(count($to_lines) == count($mapped_to_lines));
+ /**
+ * Computes a diff between sequences of strings.
+ *
+ * This can be used to compute things like case-insensitve diffs, or diffs
+ * which ignore changes in white-space.
+ *
+ * @param array $from_lines An array of strings.
+ * @param array $to_lines An array of strings.
+ * @param array $mapped_from_lines This array should have the same size
+ * number of elements as $from_lines. The
+ * elements in $mapped_from_lines and
+ * $mapped_to_lines are what is actually
+ * compared when computing the diff.
+ * @param array $mapped_to_lines This array should have the same number
+ * of elements as $to_lines.
+ */
+ function Text_MappedDiff($from_lines, $to_lines,
+ $mapped_from_lines, $mapped_to_lines)
+ {
+ assert(count($from_lines) == count($mapped_from_lines));
+ assert(count($to_lines) == count($mapped_to_lines));
- parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
+ parent::Text_Diff($mapped_from_lines, $mapped_to_lines);
- $xi = $yi = 0;
- for ($i = 0; $i < count($this->_edits); $i++) {
- $orig = &$this->_edits[$i]->orig;
- if (is_array($orig)) {
- $orig = array_slice($from_lines, $xi, count($orig));
- $xi += count($orig);
- }
+ $xi = $yi = 0;
+ for ($i = 0; $i < count($this->_edits); $i++) {
+ $orig = &$this->_edits[$i]->orig;
+ if (is_array($orig)) {
+ $orig = array_slice($from_lines, $xi, count($orig));
+ $xi += count($orig);
+ }
- $final = &$this->_edits[$i]->final;
- if (is_array($final)) {
- $final = array_slice($to_lines, $yi, count($final));
- $yi += count($final);
- }
- }
- }
+ $final = &$this->_edits[$i]->final;
+ if (is_array($final)) {
+ $final = array_slice($to_lines, $yi, count($final));
+ $yi += count($final);
+ }
+ }
+ }
}
@@ -302,23 +302,23 @@
*/
class Text_Diff_Op {
- var $orig;
- var $final;
+ var $orig;
+ var $final;
- function &reverse()
- {
- trigger_error('Abstract method', E_USER_ERROR);
- }
+ function &reverse()
+ {
+ trigger_error('Abstract method', E_USER_ERROR);
+ }
- function norig()
- {
- return $this->orig ? count($this->orig) : 0;
- }
+ function norig()
+ {
+ return $this->orig ? count($this->orig) : 0;
+ }
- function nfinal()
- {
- return $this->final ? count($this->final) : 0;
- }
+ function nfinal()
+ {
+ return $this->final ? count($this->final) : 0;
+ }
}
@@ -330,20 +330,20 @@
*/
class Text_Diff_Op_copy extends Text_Diff_Op {
- function Text_Diff_Op_copy($orig, $final = false)
- {
- if (!is_array($final)) {
- $final = $orig;
- }
- $this->orig = $orig;
- $this->final = $final;
- }
+ function Text_Diff_Op_copy($orig, $final = false)
+ {
+ if (!is_array($final)) {
+ $final = $orig;
+ }
+ $this->orig = $orig;
+ $this->final = $final;
+ }
- function &reverse()
- {
- $reverse = &new Text_Diff_Op_copy($this->final, $this->orig);
- return $reverse;
- }
+ function &reverse()
+ {
+ $reverse = &new Text_Diff_Op_copy($this->final, $this->orig);
+ return $reverse;
+ }
}
@@ -355,17 +355,17 @@
*/
class Text_Diff_Op_delete extends Text_Diff_Op {
- function Text_Diff_Op_delete($lines)
- {
- $this->orig = $lines;
- $this->final = false;
- }
+ function Text_Diff_Op_delete($lines)
+ {
+ $this->orig = $lines;
+ $this->final = false;
+ }
- function &reverse()
- {
- $reverse = &new Text_Diff_Op_add($this->orig);
- return $reverse;
- }
+ function &reverse()
+ {
+ $reverse = &new Text_Diff_Op_add($this->orig);
+ return $reverse;
+ }
}
@@ -377,17 +377,17 @@
*/
class Text_Diff_Op_add extends Text_Diff_Op {
- function Text_Diff_Op_add($lines)
- {
- $this->final = $lines;
- $this->orig = false;
- }
+ function Text_Diff_Op_add($lines)
+ {
+ $this->final = $lines;
+ $this->orig = false;
+ }
- function &reverse()
- {
- $reverse = &new Text_Diff_Op_delete($this->final);
- return $reverse;
- }
+ function &reverse()
+ {
+ $reverse = &new Text_Diff_Op_delete($this->final);
+ return $reverse;
+ }
}
@@ -399,16 +399,16 @@
*/
class Text_Diff_Op_change extends Text_Diff_Op {
- function Text_Diff_Op_change($orig, $final)
- {
- $this->orig = $orig;
- $this->final = $final;
- }
+ function Text_Diff_Op_change($orig, $final)
+ {
+ $this->orig = $orig;
+ $this->final = $final;
+ }
- function &reverse()
- {
- $reverse = &new Text_Diff_Op_change($this->final, $this->orig);
- return $reverse;
- }
+ function &reverse()
+ {
+ $reverse = &new Text_Diff_Op_change($this->final, $this->orig);
+ return $reverse;
+ }
}
Index: Text/Diff/Engine/native.php
===================================================================
--- Text/Diff/Engine/native.php (revision 8917)
+++ Text/Diff/Engine/native.php (working copy)
@@ -29,409 +29,409 @@
*/
class Text_Diff_Engine_native {
- function diff($from_lines, $to_lines)
- {
- array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
- array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+ function diff($from_lines, $to_lines)
+ {
+ array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+ array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
- $n_from = count($from_lines);
- $n_to = count($to_lines);
+ $n_from = count($from_lines);
+ $n_to = count($to_lines);
- $this->xchanged = $this->ychanged = array();
- $this->xv = $this->yv = array();
- $this->xind = $this->yind = array();
- unset($this->seq);
- unset($this->in_seq);
- unset($this->lcs);
+ $this->xchanged = $this->ychanged = array();
+ $this->xv = $this->yv = array();
+ $this->xind = $this->yind = array();
+ unset($this->seq);
+ unset($this->in_seq);
+ unset($this->lcs);
- // Skip leading common lines.
- for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
- if ($from_lines[$skip] !== $to_lines[$skip]) {
- break;
- }
- $this->xchanged[$skip] = $this->ychanged[$skip] = false;
- }
+ // Skip leading common lines.
+ for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
+ if ($from_lines[$skip] !== $to_lines[$skip]) {
+ break;
+ }
+ $this->xchanged[$skip] = $this->ychanged[$skip] = false;
+ }
- // Skip trailing common lines.
- $xi = $n_from; $yi = $n_to;
- for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
- if ($from_lines[$xi] !== $to_lines[$yi]) {
- break;
- }
- $this->xchanged[$xi] = $this->ychanged[$yi] = false;
- }
+ // Skip trailing common lines.
+ $xi = $n_from; $yi = $n_to;
+ for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
+ if ($from_lines[$xi] !== $to_lines[$yi]) {
+ break;
+ }
+ $this->xchanged[$xi] = $this->ychanged[$yi] = false;
+ }
- // Ignore lines which do not exist in both files.
- for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
- $xhash[$from_lines[$xi]] = 1;
- }
- for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
- $line = $to_lines[$yi];
- if (($this->ychanged[$yi] = empty($xhash[$line]))) {
- continue;
- }
- $yhash[$line] = 1;
- $this->yv[] = $line;
- $this->yind[] = $yi;
- }
- for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
- $line = $from_lines[$xi];
- if (($this->xchanged[$xi] = empty($yhash[$line]))) {
- continue;
- }
- $this->xv[] = $line;
- $this->xind[] = $xi;
- }
+ // Ignore lines which do not exist in both files.
+ for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+ $xhash[$from_lines[$xi]] = 1;
+ }
+ for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
+ $line = $to_lines[$yi];
+ if (($this->ychanged[$yi] = empty($xhash[$line]))) {
+ continue;
+ }
+ $yhash[$line] = 1;
+ $this->yv[] = $line;
+ $this->yind[] = $yi;
+ }
+ for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+ $line = $from_lines[$xi];
+ if (($this->xchanged[$xi] = empty($yhash[$line]))) {
+ continue;
+ }
+ $this->xv[] = $line;
+ $this->xind[] = $xi;
+ }
- // Find the LCS.
- $this->_compareseq(0, count($this->xv), 0, count($this->yv));
+ // Find the LCS.
+ $this->_compareseq(0, count($this->xv), 0, count($this->yv));
- // Merge edits when possible.
- $this->_shiftBoundaries($from_lines, $this->xchanged, $this->ychanged);
- $this->_shiftBoundaries($to_lines, $this->ychanged, $this->xchanged);
+ // Merge edits when possible.
+ $this->_shiftBoundaries($from_lines, $this->xchanged, $this->ychanged);
+ $this->_shiftBoundaries($to_lines, $this->ychanged, $this->xchanged);
- // Compute the edit operations.
- $edits = array();
- $xi = $yi = 0;
- while ($xi < $n_from || $yi < $n_to) {
- assert($yi < $n_to || $this->xchanged[$xi]);
- assert($xi < $n_from || $this->ychanged[$yi]);
+ // Compute the edit operations.
+ $edits = array();
+ $xi = $yi = 0;
+ while ($xi < $n_from || $yi < $n_to) {
+ assert($yi < $n_to || $this->xchanged[$xi]);
+ assert($xi < $n_from || $this->ychanged[$yi]);
- // Skip matching "snake".
- $copy = array();
- while ($xi < $n_from && $yi < $n_to
- && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
- $copy[] = $from_lines[$xi++];
- ++$yi;
- }
- if ($copy) {
- $edits[] = &new Text_Diff_Op_copy($copy);
- }
+ // Skip matching "snake".
+ $copy = array();
+ while ($xi < $n_from && $yi < $n_to
+ && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+ $copy[] = $from_lines[$xi++];
+ ++$yi;
+ }
+ if ($copy) {
+ $edits[] = &new Text_Diff_Op_copy($copy);
+ }
- // Find deletes & adds.
- $delete = array();
- while ($xi < $n_from && $this->xchanged[$xi]) {
- $delete[] = $from_lines[$xi++];
- }
+ // Find deletes & adds.
+ $delete = array();
+ while ($xi < $n_from && $this->xchanged[$xi]) {
+ $delete[] = $from_lines[$xi++];
+ }
- $add = array();
- while ($yi < $n_to && $this->ychanged[$yi]) {
- $add[] = $to_lines[$yi++];
- }
+ $add = array();
+ while ($yi < $n_to && $this->ychanged[$yi]) {
+ $add[] = $to_lines[$yi++];
+ }
- if ($delete && $add) {
- $edits[] = &new Text_Diff_Op_change($delete, $add);
- } elseif ($delete) {
- $edits[] = &new Text_Diff_Op_delete($delete);
- } elseif ($add) {
- $edits[] = &new Text_Diff_Op_add($add);
- }
- }
+ if ($delete && $add) {
+ $edits[] = &new Text_Diff_Op_change($delete, $add);
+ } elseif ($delete) {
+ $edits[] = &new Text_Diff_Op_delete($delete);
+ } elseif ($add) {
+ $edits[] = &new Text_Diff_Op_add($add);
+ }
+ }
- return $edits;
- }
+ return $edits;
+ }
- /**
- * Divides the Largest Common Subsequence (LCS) of the sequences (XOFF,
- * XLIM) and (YOFF, YLIM) into NCHUNKS approximately equally sized
- * segments.
- *
- * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an array of
- * NCHUNKS+1 (X, Y) indexes giving the diving points between sub
- * sequences. The first sub-sequence is contained in (X0, X1), (Y0, Y1),
- * the second in (X1, X2), (Y1, Y2) and so on. Note that (X0, Y0) ==
- * (XOFF, YOFF) and (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
- *
- * This function assumes that the first lines of the specified portions of
- * the two files do not match, and likewise that the last lines do not
- * match. The caller must trim matching lines from the beginning and end
- * of the portions it is going to specify.
- */
- function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
- {
- $flip = false;
+ /**
+ * Divides the Largest Common Subsequence (LCS) of the sequences (XOFF,
+ * XLIM) and (YOFF, YLIM) into NCHUNKS approximately equally sized
+ * segments.
+ *
+ * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an array of
+ * NCHUNKS+1 (X, Y) indexes giving the diving points between sub
+ * sequences. The first sub-sequence is contained in (X0, X1), (Y0, Y1),
+ * the second in (X1, X2), (Y1, Y2) and so on. Note that (X0, Y0) ==
+ * (XOFF, YOFF) and (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
+ *
+ * This function assumes that the first lines of the specified portions of
+ * the two files do not match, and likewise that the last lines do not
+ * match. The caller must trim matching lines from the beginning and end
+ * of the portions it is going to specify.
+ */
+ function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
+ {
+ $flip = false;
- if ($xlim - $xoff > $ylim - $yoff) {
- /* Things seems faster (I'm not sure I understand why) when the
- * shortest sequence is in X. */
- $flip = true;
- list ($xoff, $xlim, $yoff, $ylim)
- = array($yoff, $ylim, $xoff, $xlim);
- }
+ if ($xlim - $xoff > $ylim - $yoff) {
+ /* Things seems faster (I'm not sure I understand why) when the
+ * shortest sequence is in X. */
+ $flip = true;
+ list ($xoff, $xlim, $yoff, $ylim)
+ = array($yoff, $ylim, $xoff, $xlim);
+ }
- if ($flip) {
- for ($i = $ylim - 1; $i >= $yoff; $i--) {
- $ymatches[$this->xv[$i]][] = $i;
- }
- } else {
- for ($i = $ylim - 1; $i >= $yoff; $i--) {
- $ymatches[$this->yv[$i]][] = $i;
- }
- }
+ if ($flip) {
+ for ($i = $ylim - 1; $i >= $yoff; $i--) {
+ $ymatches[$this->xv[$i]][] = $i;
+ }
+ } else {
+ for ($i = $ylim - 1; $i >= $yoff; $i--) {
+ $ymatches[$this->yv[$i]][] = $i;
+ }
+ }
- $this->lcs = 0;
- $this->seq[0]= $yoff - 1;
- $this->in_seq = array();
- $ymids[0] = array();
+ $this->lcs = 0;
+ $this->seq[0]= $yoff - 1;
+ $this->in_seq = array();
+ $ymids[0] = array();
- $numer = $xlim - $xoff + $nchunks - 1;
- $x = $xoff;
- for ($chunk = 0; $chunk < $nchunks; $chunk++) {
- if ($chunk > 0) {
- for ($i = 0; $i <= $this->lcs; $i++) {
- $ymids[$i][$chunk - 1] = $this->seq[$i];
- }
- }
+ $numer = $xlim - $xoff + $nchunks - 1;
+ $x = $xoff;
+ for ($chunk = 0; $chunk < $nchunks; $chunk++) {
+ if ($chunk > 0) {
+ for ($i = 0; $i <= $this->lcs; $i++) {
+ $ymids[$i][$chunk - 1] = $this->seq[$i];
+ }
+ }
- $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
- for (; $x < $x1; $x++) {
- $line = $flip ? $this->yv[$x] : $this->xv[$x];
- if (empty($ymatches[$line])) {
- continue;
- }
- $matches = $ymatches[$line];
- reset($matches);
- while (list(, $y) = each($matches)) {
- if (empty($this->in_seq[$y])) {
- $k = $this->_lcsPos($y);
- assert($k > 0);
- $ymids[$k] = $ymids[$k - 1];
- break;
- }
- }
- while (list(, $y) = each($matches)) {
- if ($y > $this->seq[$k - 1]) {
- assert($y <= $this->seq[$k]);
- /* Optimization: this is a common case: next match is
- * just replacing previous match. */
- $this->in_seq[$this->seq[$k]] = false;
- $this->seq[$k] = $y;
- $this->in_seq[$y] = 1;
- } elseif (empty($this->in_seq[$y])) {
- $k = $this->_lcsPos($y);
- assert($k > 0);
- $ymids[$k] = $ymids[$k - 1];
- }
- }
- }
- }
+ $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
+ for (; $x < $x1; $x++) {
+ $line = $flip ? $this->yv[$x] : $this->xv[$x];
+ if (empty($ymatches[$line])) {
+ continue;
+ }
+ $matches = $ymatches[$line];
+ reset($matches);
+ while (list(, $y) = each($matches)) {
+ if (empty($this->in_seq[$y])) {
+ $k = $this->_lcsPos($y);
+ assert($k > 0);
+ $ymids[$k] = $ymids[$k - 1];
+ break;
+ }
+ }
+ while (list(, $y) = each($matches)) {
+ if ($y > $this->seq[$k - 1]) {
+ assert($y <= $this->seq[$k]);
+ /* Optimization: this is a common case: next match is
+ * just replacing previous match. */
+ $this->in_seq[$this->seq[$k]] = false;
+ $this->seq[$k] = $y;
+ $this->in_seq[$y] = 1;
+ } elseif (empty($this->in_seq[$y])) {
+ $k = $this->_lcsPos($y);
+ assert($k > 0);
+ $ymids[$k] = $ymids[$k - 1];
+ }
+ }
+ }
+ }
- $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
- $ymid = $ymids[$this->lcs];
- for ($n = 0; $n < $nchunks - 1; $n++) {
- $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
- $y1 = $ymid[$n] + 1;
- $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
- }
- $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
+ $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
+ $ymid = $ymids[$this->lcs];
+ for ($n = 0; $n < $nchunks - 1; $n++) {
+ $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+ $y1 = $ymid[$n] + 1;
+ $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
+ }
+ $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
- return array($this->lcs, $seps);
- }
+ return array($this->lcs, $seps);
+ }
- function _lcsPos($ypos)
- {
- $end = $this->lcs;
- if ($end == 0 || $ypos > $this->seq[$end]) {
- $this->seq[++$this->lcs] = $ypos;
- $this->in_seq[$ypos] = 1;
- return $this->lcs;
- }
+ function _lcsPos($ypos)
+ {
+ $end = $this->lcs;
+ if ($end == 0 || $ypos > $this->seq[$end]) {
+ $this->seq[++$this->lcs] = $ypos;
+ $this->in_seq[$ypos] = 1;
+ return $this->lcs;
+ }
- $beg = 1;
- while ($beg < $end) {
- $mid = (int)(($beg + $end) / 2);
- if ($ypos > $this->seq[$mid]) {
- $beg = $mid + 1;
- } else {
- $end = $mid;
- }
- }
+ $beg = 1;
+ while ($beg < $end) {
+ $mid = (int)(($beg + $end) / 2);
+ if ($ypos > $this->seq[$mid]) {
+ $beg = $mid + 1;
+ } else {
+ $end = $mid;
+ }
+ }
- assert($ypos != $this->seq[$end]);
+ assert($ypos != $this->seq[$end]);
- $this->in_seq[$this->seq[$end]] = false;
- $this->seq[$end] = $ypos;
- $this->in_seq[$ypos] = 1;
- return $end;
- }
+ $this->in_seq[$this->seq[$end]] = false;
+ $this->seq[$end] = $ypos;
+ $this->in_seq[$ypos] = 1;
+ return $end;
+ }
- /**
- * Finds LCS of two sequences.
- *
- * The results are recorded in the vectors $this->{x,y}changed[], by
- * storing a 1 in the element for each line that is an insertion or
- * deletion (ie. is not in the LCS).
- *
- * The subsequence of file 0 is (XOFF, XLIM) and likewise for file 1.
- *
- * Note that XLIM, YLIM are exclusive bounds. All line numbers are
- * origin-0 and discarded lines are not counted.
- */
- function _compareseq ($xoff, $xlim, $yoff, $ylim)
- {
- /* Slide down the bottom initial diagonal. */
- while ($xoff < $xlim && $yoff < $ylim
- && $this->xv[$xoff] == $this->yv[$yoff]) {
- ++$xoff;
- ++$yoff;
- }
+ /**
+ * Finds LCS of two sequences.
+ *
+ * The results are recorded in the vectors $this->{x,y}changed[], by
+ * storing a 1 in the element for each line that is an insertion or
+ * deletion (ie. is not in the LCS).
+ *
+ * The subsequence of file 0 is (XOFF, XLIM) and likewise for file 1.
+ *
+ * Note that XLIM, YLIM are exclusive bounds. All line numbers are
+ * origin-0 and discarded lines are not counted.
+ */
+ function _compareseq ($xoff, $xlim, $yoff, $ylim)
+ {
+ /* Slide down the bottom initial diagonal. */
+ while ($xoff < $xlim && $yoff < $ylim
+ && $this->xv[$xoff] == $this->yv[$yoff]) {
+ ++$xoff;
+ ++$yoff;
+ }
- /* Slide up the top initial diagonal. */
- while ($xlim > $xoff && $ylim > $yoff
- && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
- --$xlim;
- --$ylim;
- }
+ /* Slide up the top initial diagonal. */
+ while ($xlim > $xoff && $ylim > $yoff
+ && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
+ --$xlim;
+ --$ylim;
+ }
- if ($xoff == $xlim || $yoff == $ylim) {
- $lcs = 0;
- } else {
- /* This is ad hoc but seems to work well. $nchunks =
- * sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); $nchunks =
- * max(2,min(8,(int)$nchunks)); */
- $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
- list($lcs, $seps)
- = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
- }
+ if ($xoff == $xlim || $yoff == $ylim) {
+ $lcs = 0;
+ } else {
+ /* This is ad hoc but seems to work well. $nchunks =
+ * sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); $nchunks =
+ * max(2,min(8,(int)$nchunks)); */
+ $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
+ list($lcs, $seps)
+ = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
+ }
- if ($lcs == 0) {
- /* X and Y sequences have no common subsequence: mark all
- * changed. */
- while ($yoff < $ylim) {
- $this->ychanged[$this->yind[$yoff++]] = 1;
- }
- while ($xoff < $xlim) {
- $this->xchanged[$this->xind[$xoff++]] = 1;
- }
- } else {
- /* Use the partitions to split this problem into subproblems. */
- reset($seps);
- $pt1 = $seps[0];
- while ($pt2 = next($seps)) {
- $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
- $pt1 = $pt2;
- }
- }
- }
+ if ($lcs == 0) {
+ /* X and Y sequences have no common subsequence: mark all
+ * changed. */
+ while ($yoff < $ylim) {
+ $this->ychanged[$this->yind[$yoff++]] = 1;
+ }
+ while ($xoff < $xlim) {
+ $this->xchanged[$this->xind[$xoff++]] = 1;
+ }
+ } else {
+ /* Use the partitions to split this problem into subproblems. */
+ reset($seps);
+ $pt1 = $seps[0];
+ while ($pt2 = next($seps)) {
+ $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+ $pt1 = $pt2;
+ }
+ }
+ }
- /**
- * Adjusts inserts/deletes of identical lines to join changes as much as
- * possible.
- *
- * We do something when a run of changed lines include a line at one end
- * and has an excluded, identical line at the other. We are free to
- * choose which identical line is included. `compareseq' usually chooses
- * the one at the beginning, but usually it is cleaner to consider the
- * following identical line to be the "change".
- *
- * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
- */
- function _shiftBoundaries($lines, &$changed, $other_changed)
- {
- $i = 0;
- $j = 0;
+ /**
+ * Adjusts inserts/deletes of identical lines to join changes as much as
+ * possible.
+ *
+ * We do something when a run of changed lines include a line at one end
+ * and has an excluded, identical line at the other. We are free to
+ * choose which identical line is included. `compareseq' usually chooses
+ * the one at the beginning, but usually it is cleaner to consider the
+ * following identical line to be the "change".
+ *
+ * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
+ */
+ function _shiftBoundaries($lines, &$changed, $other_changed)
+ {
+ $i = 0;
+ $j = 0;
- assert('count($lines) == count($changed)');
- $len = count($lines);
- $other_len = count($other_changed);
+ assert('count($lines) == count($changed)');
+ $len = count($lines);
+ $other_len = count($other_changed);
- while (1) {
- /* Scan forward to find the beginning of another run of
- * changes. Also keep track of the corresponding point in the
- * other file.
- *
- * Throughout this code, $i and $j are adjusted together so that
- * the first $i elements of $changed and the first $j elements of
- * $other_changed both contain the same number of zeros (unchanged
- * lines).
- *
- * Furthermore, $j is always kept so that $j == $other_len or
- * $other_changed[$j] == false. */
- while ($j < $other_len && $other_changed[$j]) {
- $j++;
- }
+ while (1) {
+ /* Scan forward to find the beginning of another run of
+ * changes. Also keep track of the corresponding point in the
+ * other file.
+ *
+ * Throughout this code, $i and $j are adjusted together so that
+ * the first $i elements of $changed and the first $j elements of
+ * $other_changed both contain the same number of zeros (unchanged
+ * lines).
+ *
+ * Furthermore, $j is always kept so that $j == $other_len or
+ * $other_changed[$j] == false. */
+ while ($j < $other_len && $other_changed[$j]) {
+ $j++;
+ }
- while ($i < $len && ! $changed[$i]) {
- assert('$j < $other_len && ! $other_changed[$j]');
- $i++; $j++;
- while ($j < $other_len && $other_changed[$j]) {
- $j++;
- }
- }
+ while ($i < $len && ! $changed[$i]) {
+ assert('$j < $other_len && ! $other_changed[$j]');
+ $i++; $j++;
+ while ($j < $other_len && $other_changed[$j]) {
+ $j++;
+ }
+ }
- if ($i == $len) {
- break;
- }
+ if ($i == $len) {
+ break;
+ }
- $start = $i;
+ $start = $i;
- /* Find the end of this run of changes. */
- while (++$i < $len && $changed[$i]) {
- continue;
- }
+ /* Find the end of this run of changes. */
+ while (++$i < $len && $changed[$i]) {
+ continue;
+ }
- do {
- /* Record the length of this run of changes, so that we can
- * later determine whether the run has grown. */
- $runlength = $i - $start;
+ do {
+ /* Record the length of this run of changes, so that we can
+ * later determine whether the run has grown. */
+ $runlength = $i - $start;
- /* Move the changed region back, so long as the previous
- * unchanged line matches the last changed one. This merges
- * with previous changed regions. */
- while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
- $changed[--$start] = 1;
- $changed[--$i] = false;
- while ($start > 0 && $changed[$start - 1]) {
- $start--;
- }
- assert('$j > 0');
- while ($other_changed[--$j]) {
- continue;
- }
- assert('$j >= 0 && !$other_changed[$j]');
- }
+ /* Move the changed region back, so long as the previous
+ * unchanged line matches the last changed one. This merges
+ * with previous changed regions. */
+ while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
+ $changed[--$start] = 1;
+ $changed[--$i] = false;
+ while ($start > 0 && $changed[$start - 1]) {
+ $start--;
+ }
+ assert('$j > 0');
+ while ($other_changed[--$j]) {
+ continue;
+ }
+ assert('$j >= 0 && !$other_changed[$j]');
+ }
- /* Set CORRESPONDING to the end of the changed run, at the
- * last point where it corresponds to a changed run in the
- * other file. CORRESPONDING == LEN means no such point has
- * been found. */
- $corresponding = $j < $other_len ? $i : $len;
+ /* Set CORRESPONDING to the end of the changed run, at the
+ * last point where it corresponds to a changed run in the
+ * other file. CORRESPONDING == LEN means no such point has
+ * been found. */
+ $corresponding = $j < $other_len ? $i : $len;
- /* Move the changed region forward, so long as the first
- * changed line matches the following unchanged one. This
- * merges with following changed regions. Do this second, so
- * that if there are no merges, the changed region is moved
- * forward as far as possible. */
- while ($i < $len && $lines[$start] == $lines[$i]) {
- $changed[$start++] = false;
- $changed[$i++] = 1;
- while ($i < $len && $changed[$i]) {
- $i++;
- }
+ /* Move the changed region forward, so long as the first
+ * changed line matches the following unchanged one. This
+ * merges with following changed regions. Do this second, so
+ * that if there are no merges, the changed region is moved
+ * forward as far as possible. */
+ while ($i < $len && $lines[$start] == $lines[$i]) {
+ $changed[$start++] = false;
+ $changed[$i++] = 1;
+ while ($i < $len && $changed[$i]) {
+ $i++;
+ }
- assert('$j < $other_len && ! $other_changed[$j]');
- $j++;
- if ($j < $other_len && $other_changed[$j]) {
- $corresponding = $i;
- while ($j < $other_len && $other_changed[$j]) {
- $j++;
- }
- }
- }
- } while ($runlength != $i - $start);
+ assert('$j < $other_len && ! $other_changed[$j]');
+ $j++;
+ if ($j < $other_len && $other_changed[$j]) {
+ $corresponding = $i;
+ while ($j < $other_len && $other_changed[$j]) {
+ $j++;
+ }
+ }
+ }
+ } while ($runlength != $i - $start);
- /* If possible, move the fully-merged run of changes back to a
- * corresponding run in the other file. */
- while ($corresponding < $i) {
- $changed[--$start] = 1;
- $changed[--$i] = 0;
- assert('$j > 0');
- while ($other_changed[--$j]) {
- continue;
- }
- assert('$j >= 0 && !$other_changed[$j]');
- }
- }
- }
+ /* If possible, move the fully-merged run of changes back to a
+ * corresponding run in the other file. */
+ while ($corresponding < $i) {
+ $changed[--$start] = 1;
+ $changed[--$i] = 0;
+ assert('$j > 0');
+ while ($other_changed[--$j]) {
+ continue;
+ }
+ assert('$j >= 0 && !$other_changed[$j]');
+ }
+ }
+ }
}
Index: Text/Diff/Engine/shell.php
===================================================================
--- Text/Diff/Engine/shell.php (revision 8917)
+++ Text/Diff/Engine/shell.php (working copy)
@@ -18,147 +18,147 @@
*/
class Text_Diff_Engine_shell {
- /**
- * Path to the diff executable
- *
- * @var string
- */
- var $_diffCommand = 'diff';
+ /**
+ * Path to the diff executable
+ *
+ * @var string
+ */
+ var $_diffCommand = 'diff';
- /**
- * Returns the array of differences.
- *
- * @param array $from_lines lines of text from old file
- * @param array $to_lines lines of text from new file
- *
- * @return array all changes made (array with Text_Diff_Op_* objects)
- */
- function diff($from_lines, $to_lines)
- {
- array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
- array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+ /**
+ * Returns the array of differences.
+ *
+ * @param array $from_lines lines of text from old file
+ * @param array $to_lines lines of text from new file
+ *
+ * @return array all changes made (array with Text_Diff_Op_* objects)
+ */
+ function diff($from_lines, $to_lines)
+ {
+ array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+ array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
- $temp_dir = Text_Diff::_getTempDir();
+ $temp_dir = Text_Diff::_getTempDir();
- // Execute gnu diff or similar to get a standard diff file.
- $from_file = tempnam($temp_dir, 'Text_Diff');
- $to_file = tempnam($temp_dir, 'Text_Diff');
- $fp = fopen($from_file, 'w');
- fwrite($fp, implode("\n", $from_lines));
- fclose($fp);
- $fp = fopen($to_file, 'w');
- fwrite($fp, implode("\n", $to_lines));
- fclose($fp);
- $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
- unlink($from_file);
- unlink($to_file);
+ // Execute gnu diff or similar to get a standard diff file.
+ $from_file = tempnam($temp_dir, 'Text_Diff');
+ $to_file = tempnam($temp_dir, 'Text_Diff');
+ $fp = fopen($from_file, 'w');
+ fwrite($fp, implode("\n", $from_lines));
+ fclose($fp);
+ $fp = fopen($to_file, 'w');
+ fwrite($fp, implode("\n", $to_lines));
+ fclose($fp);
+ $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
+ unlink($from_file);
+ unlink($to_file);
- if (is_null($diff)) {
- // No changes were made
- return array(new Text_Diff_Op_copy($from_lines));
- }
+ if (is_null($diff)) {
+ // No changes were made
+ return array(new Text_Diff_Op_copy($from_lines));
+ }
- $from_line_no = 1;
- $to_line_no = 1;
- $edits = array();
+ $from_line_no = 1;
+ $to_line_no = 1;
+ $edits = array();
- // Get changed lines by parsing something like:
- // 0a1,2
- // 1,2c4,6
- // 1,5d6
- preg_match_all('#^(\d+)(?:,(\d+))?([adc])(\d+)(?:,(\d+))?$#m', $diff,
- $matches, PREG_SET_ORDER);
+ // Get changed lines by parsing something like:
+ // 0a1,2
+ // 1,2c4,6
+ // 1,5d6
+ preg_match_all('#^(\d+)(?:,(\d+))?([adc])(\d+)(?:,(\d+))?$#m', $diff,
+ $matches, PREG_SET_ORDER);
- foreach ($matches as $match) {
- if (!isset($match[5])) {
- // This paren is not set every time (see regex).
- $match[5] = false;
- }
+ foreach ($matches as $match) {
+ if (!isset($match[5])) {
+ // This paren is not set every time (see regex).
+ $match[5] = false;
+ }
- if ($match[3] == 'a') {
- $from_line_no--;
- }
+ if ($match[3] == 'a') {
+ $from_line_no--;
+ }
- if ($match[3] == 'd') {
- $to_line_no--;
- }
+ if ($match[3] == 'd') {
+ $to_line_no--;
+ }
- if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
- // copied lines
- assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
- array_push($edits,
- new Text_Diff_Op_copy(
- $this->_getLines($from_lines, $from_line_no, $match[1] - 1),
- $this->_getLines($to_lines, $to_line_no, $match[4] - 1)));
- }
+ if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
+ // copied lines
+ assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
+ array_push($edits,
+ new Text_Diff_Op_copy(
+ $this->_getLines($from_lines, $from_line_no, $match[1] - 1),
+ $this->_getLines($to_lines, $to_line_no, $match[4] - 1)));
+ }
- switch ($match[3]) {
- case 'd':
- // deleted lines
- array_push($edits,
- new Text_Diff_Op_delete(
- $this->_getLines($from_lines, $from_line_no, $match[2])));
- $to_line_no++;
- break;
+ switch ($match[3]) {
+ case 'd':
+ // deleted lines
+ array_push($edits,
+ new Text_Diff_Op_delete(
+ $this->_getLines($from_lines, $from_line_no, $match[2])));
+ $to_line_no++;
+ break;
- case 'c':
- // changed lines
- array_push($edits,
- new Text_Diff_Op_change(
- $this->_getLines($from_lines, $from_line_no, $match[2]),
- $this->_getLines($to_lines, $to_line_no, $match[5])));
- break;
+ case 'c':
+ // changed lines
+ array_push($edits,
+ new Text_Diff_Op_change(
+ $this->_getLines($from_lines, $from_line_no, $match[2]),
+ $this->_getLines($to_lines, $to_line_no, $match[5])));
+ break;
- case 'a':
- // added lines
- array_push($edits,
- new Text_Diff_Op_add(
- $this->_getLines($to_lines, $to_line_no, $match[5])));
- $from_line_no++;
- break;
- }
- }
+ case 'a':
+ // added lines
+ array_push($edits,
+ new Text_Diff_Op_add(
+ $this->_getLines($to_lines, $to_line_no, $match[5])));
+ $from_line_no++;
+ break;
+ }
+ }
- if (!empty($from_lines)) {
- // Some lines might still be pending. Add them as copied
- array_push($edits,
- new Text_Diff_Op_copy(
- $this->_getLines($from_lines, $from_line_no,
- $from_line_no + count($from_lines) - 1),
- $this->_getLines($to_lines, $to_line_no,
- $to_line_no + count($to_lines) - 1)));
- }
+ if (!empty($from_lines)) {
+ // Some lines might still be pending. Add them as copied
+ array_push($edits,
+ new Text_Diff_Op_copy(
+ $this->_getLines($from_lines, $from_line_no,
+ $from_line_no + count($from_lines) - 1),
+ $this->_getLines($to_lines, $to_line_no,
+ $to_line_no + count($to_lines) - 1)));
+ }
- return $edits;
- }
+ return $edits;
+ }
- /**
- * Get lines from either the old or new text
- *
- * @access private
- *
- * @param array &$text_lines Either $from_lines or $to_lines
- * @param int &$line_no Current line number
- * @param int $end Optional end line, when we want to chop more
- * than one line.
- *
- * @return array The chopped lines
- */
- function _getLines(&$text_lines, &$line_no, $end = false)
- {
- if (!empty($end)) {
- $lines = array();
- // We can shift even more
- while ($line_no <= $end) {
- array_push($lines, array_shift($text_lines));
- $line_no++;
- }
- } else {
- $lines = array(array_shift($text_lines));
- $line_no++;
- }
+ /**
+ * Get lines from either the old or new text
+ *
+ * @access private
+ *
+ * @param array &$text_lines Either $from_lines or $to_lines
+ * @param int &$line_no Current line number
+ * @param int $end Optional end line, when we want to chop more
+ * than one line.
+ *
+ * @return array The chopped lines
+ */
+ function _getLines(&$text_lines, &$line_no, $end = false)
+ {
+ if (!empty($end)) {
+ $lines = array();
+ // We can shift even more
+ while ($line_no <= $end) {
+ array_push($lines, array_shift($text_lines));
+ $line_no++;
+ }
+ } else {
+ $lines = array(array_shift($text_lines));
+ $line_no++;
+ }
- return $lines;
- }
+ return $lines;
+ }
}
Index: Text/Diff/Engine/string.php
===================================================================
--- Text/Diff/Engine/string.php (revision 8917)
+++ Text/Diff/Engine/string.php (working copy)
@@ -24,211 +24,211 @@
*/
class Text_Diff_Engine_string {
- /**
- * Parses a unified or context diff.
- *
- * First param contains the whole diff and the second can be used to force
- * a specific diff type. If the second parameter is 'autodetect', the
- * diff will be examined to find out which type of diff this is.
- *
- * @param string $diff The diff content.
- * @param string $mode The diff mode of the content in $diff. One of
- * 'context', 'unified', or 'autodetect'.
- *
- * @return array List of all diff operations.
- */
- function diff($diff, $mode = 'autodetect')
- {
- if ($mode != 'autodetect' && $mode != 'context' && $mode != 'unified') {
- return PEAR::raiseError('Type of diff is unsupported');
- }
+ /**
+ * Parses a unified or context diff.
+ *
+ * First param contains the whole diff and the second can be used to force
+ * a specific diff type. If the second parameter is 'autodetect', the
+ * diff will be examined to find out which type of diff this is.
+ *
+ * @param string $diff The diff content.
+ * @param string $mode The diff mode of the content in $diff. One of
+ * 'context', 'unified', or 'autodetect'.
+ *
+ * @return array List of all diff operations.
+ */
+ function diff($diff, $mode = 'autodetect')
+ {
+ if ($mode != 'autodetect' && $mode != 'context' && $mode != 'unified') {
+ return PEAR::raiseError('Type of diff is unsupported');
+ }
- if ($mode == 'autodetect') {
- $context = strpos($diff, '***');
- $unified = strpos($diff, '---');
- if ($context === $unified) {
- return PEAR::raiseError('Type of diff could not be detected');
- } elseif ($context === false || $context === false) {
- $mode = $context !== false ? 'context' : 'unified';
- } else {
- $mode = $context < $unified ? 'context' : 'unified';
- }
- }
+ if ($mode == 'autodetect') {
+ $context = strpos($diff, '***');
+ $unified = strpos($diff, '---');
+ if ($context === $unified) {
+ return PEAR::raiseError('Type of diff could not be detected');
+ } elseif ($context === false || $context === false) {
+ $mode = $context !== false ? 'context' : 'unified';
+ } else {
+ $mode = $context < $unified ? 'context' : 'unified';
+ }
+ }
- // split by new line and remove the diff header
- $diff = explode("\n", $diff);
- array_shift($diff);
- array_shift($diff);
+ // split by new line and remove the diff header
+ $diff = explode("\n", $diff);
+ array_shift($diff);
+ array_shift($diff);
- if ($mode == 'context') {
- return $this->parseContextDiff($diff);
- } else {
- return $this->parseUnifiedDiff($diff);
- }
- }
+ if ($mode == 'context') {
+ return $this->parseContextDiff($diff);
+ } else {
+ return $this->parseUnifiedDiff($diff);
+ }
+ }
- /**
- * Parses an array containing the unified diff.
- *
- * @param array $diff Array of lines.
- *
- * @return array List of all diff operations.
- */
- function parseUnifiedDiff($diff)
- {
- $edits = array();
- $end = count($diff) - 1;
- for ($i = 0; $i < $end;) {
- $diff1 = array();
- switch (substr($diff[$i], 0, 1)) {
- case ' ':
- do {
- $diff1[] = substr($diff[$i], 1);
- } while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
- $edits[] = &new Text_Diff_Op_copy($diff1);
- break;
+ /**
+ * Parses an array containing the unified diff.
+ *
+ * @param array $diff Array of lines.
+ *
+ * @return array List of all diff operations.
+ */
+ function parseUnifiedDiff($diff)
+ {
+ $edits = array();
+ $end = count($diff) - 1;
+ for ($i = 0; $i < $end;) {
+ $diff1 = array();
+ switch (substr($diff[$i], 0, 1)) {
+ case ' ':
+ do {
+ $diff1[] = substr($diff[$i], 1);
+ } while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
+ $edits[] = &new Text_Diff_Op_copy($diff1);
+ break;
- case '+':
- // get all new lines
- do {
- $diff1[] = substr($diff[$i], 1);
- } while (++$i < $end && substr($diff[$i], 0, 1) == '+');
- $edits[] = &new Text_Diff_Op_add($diff1);
- break;
+ case '+':
+ // get all new lines
+ do {
+ $diff1[] = substr($diff[$i], 1);
+ } while (++$i < $end && substr($diff[$i], 0, 1) == '+');
+ $edits[] = &new Text_Diff_Op_add($diff1);
+ break;
- case '-':
- // get changed or removed lines
- $diff2 = array();
- do {
- $diff1[] = substr($diff[$i], 1);
- } while (++$i < $end && substr($diff[$i], 0, 1) == '-');
+ case '-':
+ // get changed or removed lines
+ $diff2 = array();
+ do {
+ $diff1[] = substr($diff[$i], 1);
+ } while (++$i < $end && substr($diff[$i], 0, 1) == '-');
- while ($i < $end && substr($diff[$i], 0, 1) == '+') {
- $diff2[] = substr($diff[$i++], 1);
- }
- if (count($diff2) == 0) {
- $edits[] = &new Text_Diff_Op_delete($diff1);
- } else {
- $edits[] = &new Text_Diff_Op_change($diff1, $diff2);
- }
- break;
+ while ($i < $end && substr($diff[$i], 0, 1) == '+') {
+ $diff2[] = substr($diff[$i++], 1);
+ }
+ if (count($diff2) == 0) {
+ $edits[] = &new Text_Diff_Op_delete($diff1);
+ } else {
+ $edits[] = &new Text_Diff_Op_change($diff1, $diff2);
+ }
+ break;
- default:
- $i++;
- break;
- }
- }
+ default:
+ $i++;
+ break;
+ }
+ }
- return $edits;
- }
+ return $edits;
+ }
- /**
- * Parses an array containing the context diff.
- *
- * @param array $diff Array of lines.
- *
- * @return array List of all diff operations.
- */
- function parseContextDiff(&$diff)
- {
- $edits = array();
- $i = $max_i = $j = $max_j = 0;
- $end = count($diff) - 1;
- while ($i < $end && $j < $end) {
- while ($i >= $max_i && $j >= $max_j) {
- // Find the boundaries of the diff output of the two files
- for ($i = $j;
- $i < $end && substr($diff[$i], 0, 3) == '***';
- $i++);
- for ($max_i = $i;
- $max_i < $end && substr($diff[$max_i], 0, 3) != '---';
- $max_i++);
- for ($j = $max_i;
- $j < $end && substr($diff[$j], 0, 3) == '---';
- $j++);
- for ($max_j = $j;
- $max_j < $end && substr($diff[$max_j], 0, 3) != '***';
- $max_j++);
- }
+ /**
+ * Parses an array containing the context diff.
+ *
+ * @param array $diff Array of lines.
+ *
+ * @return array List of all diff operations.
+ */
+ function parseContextDiff(&$diff)
+ {
+ $edits = array();
+ $i = $max_i = $j = $max_j = 0;
+ $end = count($diff) - 1;
+ while ($i < $end && $j < $end) {
+ while ($i >= $max_i && $j >= $max_j) {
+ // Find the boundaries of the diff output of the two files
+ for ($i = $j;
+ $i < $end && substr($diff[$i], 0, 3) == '***';
+ $i++);
+ for ($max_i = $i;
+ $max_i < $end && substr($diff[$max_i], 0, 3) != '---';
+ $max_i++);
+ for ($j = $max_i;
+ $j < $end && substr($diff[$j], 0, 3) == '---';
+ $j++);
+ for ($max_j = $j;
+ $max_j < $end && substr($diff[$max_j], 0, 3) != '***';
+ $max_j++);
+ }
- // find what hasn't been changed
- $array = array();
- while ($i < $max_i &&
- $j < $max_j &&
- strcmp($diff[$i], $diff[$j]) == 0) {
- $array[] = substr($diff[$i], 2);
- $i++;
- $j++;
- }
+ // find what hasn't been changed
+ $array = array();
+ while ($i < $max_i &&
+ $j < $max_j &&
+ strcmp($diff[$i], $diff[$j]) == 0) {
+ $array[] = substr($diff[$i], 2);
+ $i++;
+ $j++;
+ }
- while ($i < $max_i && ($max_j-$j) <= 1) {
- if ($diff[$i] != '' && substr($diff[$i], 0, 1) != ' ') {
- break;
- }
- $array[] = substr($diff[$i++], 2);
- }
+ while ($i < $max_i && ($max_j-$j) <= 1) {
+ if ($diff[$i] != '' && substr($diff[$i], 0, 1) != ' ') {
+ break;
+ }
+ $array[] = substr($diff[$i++], 2);
+ }
- while ($j < $max_j && ($max_i-$i) <= 1) {
- if ($diff[$j] != '' && substr($diff[$j], 0, 1) != ' ') {
- break;
- }
- $array[] = substr($diff[$j++], 2);
- }
- if (count($array) > 0) {
- $edits[] = &new Text_Diff_Op_copy($array);
- }
+ while ($j < $max_j && ($max_i-$i) <= 1) {
+ if ($diff[$j] != '' && substr($diff[$j], 0, 1) != ' ') {
+ break;
+ }
+ $array[] = substr($diff[$j++], 2);
+ }
+ if (count($array) > 0) {
+ $edits[] = &new Text_Diff_Op_copy($array);
+ }
- if ($i < $max_i) {
- $diff1 = array();
- switch (substr($diff[$i], 0, 1)) {
- case '!':
- $diff2 = array();
- do {
- $diff1[] = substr($diff[$i], 2);
- if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
- $diff2[] = substr($diff[$j++], 2);
- }
- } while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
- $edits[] = &new Text_Diff_Op_change($diff1, $diff2);
- break;
+ if ($i < $max_i) {
+ $diff1 = array();
+ switch (substr($diff[$i], 0, 1)) {
+ case '!':
+ $diff2 = array();
+ do {
+ $diff1[] = substr($diff[$i], 2);
+ if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
+ $diff2[] = substr($diff[$j++], 2);
+ }
+ } while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
+ $edits[] = &new Text_Diff_Op_change($diff1, $diff2);
+ break;
- case '+':
- do {
- $diff1[] = substr($diff[$i], 2);
- } while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
- $edits[] = &new Text_Diff_Op_add($diff1);
- break;
+ case '+':
+ do {
+ $diff1[] = substr($diff[$i], 2);
+ } while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
+ $edits[] = &new Text_Diff_Op_add($diff1);
+ break;
- case '-':
- do {
- $diff1[] = substr($diff[$i], 2);
- } while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
- $edits[] = &new Text_Diff_Op_delete($diff1);
- break;
- }
- }
+ case '-':
+ do {
+ $diff1[] = substr($diff[$i], 2);
+ } while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
+ $edits[] = &new Text_Diff_Op_delete($diff1);
+ break;
+ }
+ }
- if ($j < $max_j) {
- $diff2 = array();
- switch (substr($diff[$j], 0, 1)) {
- case '+':
- do {
- $diff2[] = substr($diff[$j++], 2);
- } while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
- $edits[] = &new Text_Diff_Op_add($diff2);
- break;
+ if ($j < $max_j) {
+ $diff2 = array();
+ switch (substr($diff[$j], 0, 1)) {
+ case '+':
+ do {
+ $diff2[] = substr($diff[$j++], 2);
+ } while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
+ $edits[] = &new Text_Diff_Op_add($diff2);
+ break;
- case '-':
- do {
- $diff2[] = substr($diff[$j++], 2);
- } while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
- $edits[] = &new Text_Diff_Op_delete($diff2);
- break;
- }
- }
- }
+ case '-':
+ do {
+ $diff2[] = substr($diff[$j++], 2);
+ } while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
+ $edits[] = &new Text_Diff_Op_delete($diff2);
+ break;
+ }
+ }
+ }
- return $edits;
- }
+ return $edits;
+ }
}
Index: Text/Diff/Engine/xdiff.php
===================================================================
--- Text/Diff/Engine/xdiff.php (revision 8917)
+++ Text/Diff/Engine/xdiff.php (working copy)
@@ -17,47 +17,47 @@
*/
class Text_Diff_Engine_xdiff {
- /**
- */
- function diff($from_lines, $to_lines)
- {
- array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
- array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+ /**
+ */
+ function diff($from_lines, $to_lines)
+ {
+ array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+ array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
- /* Convert the two input arrays into strings for xdiff processing. */
- $from_string = implode("\n", $from_lines);
- $to_string = implode("\n", $to_lines);
+ /* Convert the two input arrays into strings for xdiff processing. */
+ $from_string = implode("\n", $from_lines);
+ $to_string = implode("\n", $to_lines);
- /* Diff the two strings and convert the result to an array. */
- $diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
- $diff = explode("\n", $diff);
+ /* Diff the two strings and convert the result to an array. */
+ $diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
+ $diff = explode("\n", $diff);
- /* Walk through the diff one line at a time. We build the $edits
- * array of diff operations by reading the first character of the
- * xdiff output (which is in the "unified diff" format).
- *
- * Note that we don't have enough information to detect "changed"
- * lines using this approach, so we can't add Text_Diff_Op_changed
- * instances to the $edits array. The result is still perfectly
- * valid, albeit a little less descriptive and efficient. */
- $edits = array();
- foreach ($diff as $line) {
- switch ($line[0]) {
- case ' ':
- $edits[] = &new Text_Diff_Op_copy(array(substr($line, 1)));
- break;
+ /* Walk through the diff one line at a time. We build the $edits
+ * array of diff operations by reading the first character of the
+ * xdiff output (which is in the "unified diff" format).
+ *
+ * Note that we don't have enough information to detect "changed"
+ * lines using this approach, so we can't add Text_Diff_Op_changed
+ * instances to the $edits array. The result is still perfectly
+ * valid, albeit a little less descriptive and efficient. */
+ $edits = array();
+ foreach ($diff as $line) {
+ switch ($line[0]) {
+ case ' ':
+ $edits[] = &new Text_Diff_Op_copy(array(substr($line, 1)));
+ break;
- case '+':
- $edits[] = &new Text_Diff_Op_add(array(substr($line, 1)));
- break;
+ case '+':
+ $edits[] = &new Text_Diff_Op_add(array(substr($line, 1)));
+ break;
- case '-':
- $edits[] = &new Text_Diff_Op_delete(array(substr($line, 1)));
- break;
- }
- }
+ case '-':
+ $edits[] = &new Text_Diff_Op_delete(array(substr($line, 1)));
+ break;
+ }
+ }
- return $edits;
- }
+ return $edits;
+ }
}
Index: Text/Diff/Renderer.php
===================================================================
--- Text/Diff/Renderer.php (revision 8917)
+++ Text/Diff/Renderer.php (working copy)
@@ -16,222 +16,222 @@
*/
class Text_Diff_Renderer {
- /**
- * Number of leading context "lines" to preserve.
- *
- * This should be left at zero for this class, but subclasses may want to
- * set this to other values.
- */
- var $_leading_context_lines = 0;
+ /**
+ * Number of leading context "lines" to preserve.
+ *
+ * This should be left at zero for this class, but subclasses may want to
+ * set this to other values.
+ */
+ var $_leading_context_lines = 0;
- /**
- * Number of trailing context "lines" to preserve.
- *
- * This should be left at zero for this class, but subclasses may want to
- * set this to other values.
- */
- var $_trailing_context_lines = 0;
+ /**
+ * Number of trailing context "lines" to preserve.
+ *
+ * This should be left at zero for this class, but subclasses may want to
+ * set this to other values.
+ */
+ var $_trailing_context_lines = 0;
- /**
- * Constructor.
- */
- function Text_Diff_Renderer($params = array())
- {
- foreach ($params as $param => $value) {
- $v = '_' . $param;
- if (isset($this->$v)) {
- $this->$v = $value;
- }
- }
- }
+ /**
+ * Constructor.
+ */
+ function Text_Diff_Renderer($params = array())
+ {
+ foreach ($params as $param => $value) {
+ $v = '_' . $param;
+ if (isset($this->$v)) {
+ $this->$v = $value;
+ }
+ }
+ }
- /**
- * Get any renderer parameters.
- *
- * @return array All parameters of this renderer object.
- */
- function getParams()
- {
- $params = array();
- foreach (get_object_vars($this) as $k => $v) {
- if ($k[0] == '_') {
- $params[substr($k, 1)] = $v;
- }
- }
+ /**
+ * Get any renderer parameters.
+ *
+ * @return array All parameters of this renderer object.
+ */
+ function getParams()
+ {
+ $params = array();
+ foreach (get_object_vars($this) as $k => $v) {
+ if ($k[0] == '_') {
+ $params[substr($k, 1)] = $v;
+ }
+ }
- return $params;
- }
+ return $params;
+ }
- /**
- * Renders a diff.
- *
- * @param Text_Diff $diff A Text_Diff object.
- *
- * @return string The formatted output.
- */
- function render($diff)
- {
- $xi = $yi = 1;
- $block = false;
- $context = array();
+ /**
+ * Renders a diff.
+ *
+ * @param Text_Diff $diff A Text_Diff object.
+ *
+ * @return string The formatted output.
+ */
+ function render($diff)
+ {
+ $xi = $yi = 1;
+ $block = false;
+ $context = array();
- $nlead = $this->_leading_context_lines;
- $ntrail = $this->_trailing_context_lines;
+ $nlead = $this->_leading_context_lines;
+ $ntrail = $this->_trailing_context_lines;
- $output = $this->_startDiff();
+ $output = $this->_startDiff();
- $diffs = $diff->getDiff();
- foreach ($diffs as $i => $edit) {
- /* If these are unchanged (copied) lines, and we want to keep
- * leading or trailing context lines, extract them from the copy
- * block. */
- if (is_a($edit, 'Text_Diff_Op_copy')) {
- /* Do we have any diff blocks yet? */
- if (is_array($block)) {
- /* How many lines to keep as context from the copy
- * block. */
- $keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
- if (count($edit->orig) <= $keep) {
- /* We have less lines in the block than we want for
- * context => keep the whole block. */
- $block[] = $edit;
- } else {
- if ($ntrail) {
- /* Create a new block with as many lines as we need
- * for the trailing context. */
- $context = array_slice($edit->orig, 0, $ntrail);
- $block[] = &new Text_Diff_Op_copy($context);
- }
- /* @todo */
- $output .= $this->_block($x0, $ntrail + $xi - $x0,
- $y0, $ntrail + $yi - $y0,
- $block);
- $block = false;
- }
- }
- /* Keep the copy block as the context for the next block. */
- $context = $edit->orig;
- } else {
- /* Don't we have any diff blocks yet? */
- if (!is_array($block)) {
- /* Extract context lines from the preceding copy block. */
- $context = array_slice($context, count($context) - $nlead);
- $x0 = $xi - count($context);
- $y0 = $yi - count($context);
- $block = array();
- if ($context) {
- $block[] = &new Text_Diff_Op_copy($context);
- }
- }
- $block[] = $edit;
- }
+ $diffs = $diff->getDiff();
+ foreach ($diffs as $i => $edit) {
+ /* If these are unchanged (copied) lines, and we want to keep
+ * leading or trailing context lines, extract them from the copy
+ * block. */
+ if (is_a($edit, 'Text_Diff_Op_copy')) {
+ /* Do we have any diff blocks yet? */
+ if (is_array($block)) {
+ /* How many lines to keep as context from the copy
+ * block. */
+ $keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
+ if (count($edit->orig) <= $keep) {
+ /* We have less lines in the block than we want for
+ * context => keep the whole block. */
+ $block[] = $edit;
+ } else {
+ if ($ntrail) {
+ /* Create a new block with as many lines as we need
+ * for the trailing context. */
+ $context = array_slice($edit->orig, 0, $ntrail);
+ $block[] = &new Text_Diff_Op_copy($context);
+ }
+ /* @todo */
+ $output .= $this->_block($x0, $ntrail + $xi - $x0,
+ $y0, $ntrail + $yi - $y0,
+ $block);
+ $block = false;
+ }
+ }
+ /* Keep the copy block as the context for the next block. */
+ $context = $edit->orig;
+ } else {
+ /* Don't we have any diff blocks yet? */
+ if (!is_array($block)) {
+ /* Extract context lines from the preceding copy block. */
+ $context = array_slice($context, count($context) - $nlead);
+ $x0 = $xi - count($context);
+ $y0 = $yi - count($context);
+ $block = array();
+ if ($context) {
+ $block[] = &new Text_Diff_Op_copy($context);
+ }
+ }
+ $block[] = $edit;
+ }
- if ($edit->orig) {
- $xi += count($edit->orig);
- }
- if ($edit->final) {
- $yi += count($edit->final);
- }
- }
+ if ($edit->orig) {
+ $xi += count($edit->orig);
+ }
+ if ($edit->final) {
+ $yi += count($edit->final);
+ }
+ }
- if (is_array($block)) {
- $output .= $this->_block($x0, $xi - $x0,
- $y0, $yi - $y0,
- $block);
- }
+ if (is_array($block)) {
+ $output .= $this->_block($x0, $xi - $x0,
+ $y0, $yi - $y0,
+ $block);
+ }
- return $output . $this->_endDiff();
- }
+ return $output . $this->_endDiff();
+ }
- function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
- {
- $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
+ function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
+ {
+ $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
- foreach ($edits as $edit) {
- switch (strtolower(get_class($edit))) {
- case 'text_diff_op_copy':
- $output .= $this->_context($edit->orig);
- break;
+ foreach ($edits as $edit) {
+ switch (strtolower(get_class($edit))) {
+ case 'text_diff_op_copy':
+ $output .= $this->_context($edit->orig);
+ break;
- case 'text_diff_op_add':
- $output .= $this->_added($edit->final);
- break;
+ case 'text_diff_op_add':
+ $output .= $this->_added($edit->final);
+ break;
- case 'text_diff_op_delete':
- $output .= $this->_deleted($edit->orig);
- break;
+ case 'text_diff_op_delete':
+ $output .= $this->_deleted($edit->orig);
+ break;
- case 'text_diff_op_change':
- $output .= $this->_changed($edit->orig, $edit->final);
- break;
- }
- }
+ case 'text_diff_op_change':
+ $output .= $this->_changed($edit->orig, $edit->final);
+ break;
+ }
+ }
- return $output . $this->_endBlock();
- }
+ return $output . $this->_endBlock();
+ }
- function _startDiff()
- {
- return '';
- }
+ function _startDiff()
+ {
+ return '';
+ }
- function _endDiff()
- {
- return '';
- }
+ function _endDiff()
+ {
+ return '';
+ }
- function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
- {
- if ($xlen > 1) {
- $xbeg .= ',' . ($xbeg + $xlen - 1);
- }
- if ($ylen > 1) {
- $ybeg .= ',' . ($ybeg + $ylen - 1);
- }
+ function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
+ {
+ if ($xlen > 1) {
+ $xbeg .= ',' . ($xbeg + $xlen - 1);
+ }
+ if ($ylen > 1) {
+ $ybeg .= ',' . ($ybeg + $ylen - 1);
+ }
- // this matches the GNU Diff behaviour
- if ($xlen && !$ylen) {
- $ybeg--;
- } elseif (!$xlen) {
- $xbeg--;
- }
+ // this matches the GNU Diff behaviour
+ if ($xlen && !$ylen) {
+ $ybeg--;
+ } elseif (!$xlen) {
+ $xbeg--;
+ }
- return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
- }
+ return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+ }
- function _startBlock($header)
- {
- return $header . "\n";
- }
+ function _startBlock($header)
+ {
+ return $header . "\n";
+ }
- function _endBlock()
- {
- return '';
- }
+ function _endBlock()
+ {
+ return '';
+ }
- function _lines($lines, $prefix = ' ')
- {
- return $prefix . implode("\n$prefix", $lines) . "\n";
- }
+ function _lines($lines, $prefix = ' ')
+ {
+ return $prefix . implode("\n$prefix", $lines) . "\n";
+ }
- function _context($lines)
- {
- return $this->_lines($lines, ' ');
- }
+ function _context($lines)
+ {
+ return $this->_lines($lines, ' ');
+ }
- function _added($lines)
- {
- return $this->_lines($lines, '> ');
- }
+ function _added($lines)
+ {
+ return $this->_lines($lines, '> ');
+ }
- function _deleted($lines)
- {
- return $this->_lines($lines, '< ');
- }
+ function _deleted($lines)
+ {
+ return $this->_lines($lines, '< ');
+ }
- function _changed($orig, $final)
- {
- return $this->_deleted($orig) . "---\n" . $this->_added($final);
- }
+ function _changed($orig, $final)
+ {
+ return $this->_deleted($orig) . "---\n" . $this->_added($final);
+ }
}
Index: Text/Diff/Renderer/inline.php
===================================================================
--- Text/Diff/Renderer/inline.php (revision 8917)
+++ Text/Diff/Renderer/inline.php (working copy)
@@ -28,145 +28,145 @@
*/
class Text_Diff_Renderer_inline extends Text_Diff_Renderer {
- /**
- * Number of leading context "lines" to preserve.
- */
- var $_leading_context_lines = 10000;
+ /**
+ * Number of leading context "lines" to preserve.
+ */
+ var $_leading_context_lines = 10000;
- /**
- * Number of trailing context "lines" to preserve.
- */
- var $_trailing_context_lines = 10000;
+ /**
+ * Number of trailing context "lines" to preserve.
+ */
+ var $_trailing_context_lines = 10000;
- /**
- * Prefix for inserted text.
- */
- var $_ins_prefix = '';
+ /**
+ * Prefix for inserted text.
+ */
+ var $_ins_prefix = '';
- /**
- * Suffix for inserted text.
- */
- var $_ins_suffix = '';
+ /**
+ * Suffix for inserted text.
+ */
+ var $_ins_suffix = '';
- /**
- * Prefix for deleted text.
- */
- var $_del_prefix = '';
+ /**
+ * Prefix for deleted text.
+ */
+ var $_del_prefix = '';
- /**
- * Suffix for deleted text.
- */
- var $_del_suffix = '';
+ /**
+ * Suffix for deleted text.
+ */
+ var $_del_suffix = '';
- /**
- * Header for each change block.
- */
- var $_block_header = '';
+ /**
+ * Header for each change block.
+ */
+ var $_block_header = '';
- /**
- * What are we currently splitting on? Used to recurse to show word-level
- * changes.
- */
- var $_split_level = 'lines';
+ /**
+ * What are we currently splitting on? Used to recurse to show word-level
+ * changes.
+ */
+ var $_split_level = 'lines';
- function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
- {
- return $this->_block_header;
- }
+ function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
+ {
+ return $this->_block_header;
+ }
- function _startBlock($header)
- {
- return $header;
- }
+ function _startBlock($header)
+ {
+ return $header;
+ }
- function _lines($lines, $prefix = ' ', $encode = true)
- {
- if ($encode) {
- array_walk($lines, array(&$this, '_encode'));
- }
+ function _lines($lines, $prefix = ' ', $encode = true)
+ {
+ if ($encode) {
+ array_walk($lines, array(&$this, '_encode'));
+ }
- if ($this->_split_level == 'words') {
- return implode('', $lines);
- } else {
- return implode("\n", $lines) . "\n";
- }
- }
+ if ($this->_split_level == 'words') {
+ return implode('', $lines);
+ } else {
+ return implode("\n", $lines) . "\n";
+ }
+ }
- function _added($lines)
- {
- array_walk($lines, array(&$this, '_encode'));
- $lines[0] = $this->_ins_prefix . $lines[0];
- $lines[count($lines) - 1] .= $this->_ins_suffix;
- return $this->_lines($lines, ' ', false);
- }
+ function _added($lines)
+ {
+ array_walk($lines, array(&$this, '_encode'));
+ $lines[0] = $this->_ins_prefix . $lines[0];
+ $lines[count($lines) - 1] .= $this->_ins_suffix;
+ return $this->_lines($lines, ' ', false);
+ }
- function _deleted($lines, $words = false)
- {
- array_walk($lines, array(&$this, '_encode'));
- $lines[0] = $this->_del_prefix . $lines[0];
- $lines[count($lines) - 1] .= $this->_del_suffix;
- return $this->_lines($lines, ' ', false);
- }
+ function _deleted($lines, $words = false)
+ {
+ array_walk($lines, array(&$this, '_encode'));
+ $lines[0] = $this->_del_prefix . $lines[0];
+ $lines[count($lines) - 1] .= $this->_del_suffix;
+ return $this->_lines($lines, ' ', false);
+ }
- function _changed($orig, $final)
- {
- /* If we've already split on words, don't try to do so again - just
- * display. */
- if ($this->_split_level == 'words') {
- $prefix = '';
- while ($orig[0] !== false && $final[0] !== false &&
- substr($orig[0], 0, 1) == ' ' &&
- substr($final[0], 0, 1) == ' ') {
- $prefix .= substr($orig[0], 0, 1);
- $orig[0] = substr($orig[0], 1);
- $final[0] = substr($final[0], 1);
- }
- return $prefix . $this->_deleted($orig) . $this->_added($final);
- }
+ function _changed($orig, $final)
+ {
+ /* If we've already split on words, don't try to do so again - just
+ * display. */
+ if ($this->_split_level == 'words') {
+ $prefix = '';
+ while ($orig[0] !== false && $final[0] !== false &&
+ substr($orig[0], 0, 1) == ' ' &&
+ substr($final[0], 0, 1) == ' ') {
+ $prefix .= substr($orig[0], 0, 1);
+ $orig[0] = substr($orig[0], 1);
+ $final[0] = substr($final[0], 1);
+ }
+ return $prefix . $this->_deleted($orig) . $this->_added($final);
+ }
- $text1 = implode("\n", $orig);
- $text2 = implode("\n", $final);
+ $text1 = implode("\n", $orig);
+ $text2 = implode("\n", $final);
- /* Non-printing newline marker. */
- $nl = "\0";
+ /* Non-printing newline marker. */
+ $nl = "\0";
- /* We want to split on word boundaries, but we need to
- * preserve whitespace as well. Therefore we split on words,
- * but include all blocks of whitespace in the wordlist. */
- $diff = new Text_Diff($this->_splitOnWords($text1, $nl),
- $this->_splitOnWords($text2, $nl));
+ /* We want to split on word boundaries, but we need to
+ * preserve whitespace as well. Therefore we split on words,
+ * but include all blocks of whitespace in the wordlist. */
+ $diff = new Text_Diff($this->_splitOnWords($text1, $nl),
+ $this->_splitOnWords($text2, $nl));
- /* Get the diff in inline format. */
- $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(),
- array('split_level' => 'words')));
+ /* Get the diff in inline format. */
+ $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(),
+ array('split_level' => 'words')));
- /* Run the diff and get the output. */
- return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
- }
+ /* Run the diff and get the output. */
+ return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
+ }
- function _splitOnWords($string, $newlineEscape = "\n")
- {
- // Ignore \0; otherwise the while loop will never finish.
- $string = str_replace("\0", '', $string);
+ function _splitOnWords($string, $newlineEscape = "\n")
+ {
+ // Ignore \0; otherwise the while loop will never finish.
+ $string = str_replace("\0", '', $string);
- $words = array();
- $length = strlen($string);
- $pos = 0;
+ $words = array();
+ $length = strlen($string);
+ $pos = 0;
- while ($pos < $length) {
- // Eat a word with any preceding whitespace.
- $spaces = strspn(substr($string, $pos), " \n");
- $nextpos = strcspn(substr($string, $pos + $spaces), " \n");
- $words[] = str_replace("\n", $newlineEscape, substr($string, $pos, $spaces + $nextpos));
- $pos += $spaces + $nextpos;
- }
+ while ($pos < $length) {
+ // Eat a word with any preceding whitespace.
+ $spaces = strspn(substr($string, $pos), " \n");
+ $nextpos = strcspn(substr($string, $pos + $spaces), " \n");
+ $words[] = str_replace("\n", $newlineEscape, substr($string, $pos, $spaces + $nextpos));
+ $pos += $spaces + $nextpos;
+ }
- return $words;
- }
+ return $words;
+ }
- function _encode(&$string)
- {
- $string = htmlspecialchars($string);
- }
+ function _encode(&$string)
+ {
+ $string = htmlspecialchars($string);
+ }
}