annotate kdiff3/src-QT4/diff.cpp @ 113:7bca1f1340f6 tip

Build fixes for Xcode 10 / Qt 5.12
author Chris Cannam
date Mon, 17 Dec 2018 11:13:01 +0000
parents 5024edf90636
children
rev   line source
joachim99@8 1 /***************************************************************************
joachim99@8 2 diff.cpp - description
joachim99@8 3 -------------------
joachim99@8 4 begin : Mon Mar 18 2002
joachim99@77 5 copyright : (C) 2002-2007 by Joachim Eibl
joachim99@69 6 email : joachim.eibl at gmx.de
joachim99@8 7 ***************************************************************************/
joachim99@8 8
joachim99@8 9 /***************************************************************************
joachim99@8 10 * *
joachim99@8 11 * This program is free software; you can redistribute it and/or modify *
joachim99@8 12 * it under the terms of the GNU General Public License as published by *
joachim99@8 13 * the Free Software Foundation; either version 2 of the License, or *
joachim99@8 14 * (at your option) any later version. *
joachim99@8 15 * *
joachim99@8 16 ***************************************************************************/
joachim99@8 17
joachim99@8 18 #include <stdio.h>
joachim99@77 19 #include <cstdlib>
joachim99@8 20 #include <iostream>
joachim99@8 21
joachim99@8 22 #include "diff.h"
joachim99@8 23 #include "fileaccess.h"
joachim99@58 24 #include "optiondialog.h"
joachim99@8 25
joachim99@8 26 #include <kmessagebox.h>
joachim99@8 27 #include <klocale.h>
joachim99@75 28
joachim99@75 29 #include <QFileInfo>
joachim99@75 30 #include <QDir>
joachim99@75 31 #include <QTextCodec>
joachim99@70 32 #include <QTextStream>
joachim99@75 33 #include <QProcess>
joachim99@8 34
joachim99@8 35 #include <map>
joachim99@8 36 #include <assert.h>
joachim99@8 37 #include <ctype.h>
joachim99@8 38 //using namespace std;
joachim99@8 39
joachim99@8 40
joachim99@69 41 int LineData::width(int tabSize) const
joachim99@8 42 {
joachim99@8 43 int w=0;
joachim99@8 44 int j=0;
joachim99@8 45 for( int i=0; i<size; ++i )
joachim99@8 46 {
joachim99@8 47 if ( pLine[i]=='\t' )
joachim99@8 48 {
joachim99@69 49 for(j %= tabSize; j<tabSize; ++j)
joachim99@8 50 ++w;
joachim99@8 51 j=0;
joachim99@8 52 }
joachim99@8 53 else
joachim99@8 54 {
joachim99@8 55 ++w;
joachim99@8 56 ++j;
joachim99@8 57 }
joachim99@8 58 }
joachim99@8 59 return w;
joachim99@8 60 }
joachim99@8 61
joachim99@8 62
joachim99@8 63 // The bStrict flag is true during the test where a nonmatching area ends.
joachim99@8 64 // Then the equal()-function requires that the match has more than 2 nonwhite characters.
joachim99@8 65 // This is to avoid matches on trivial lines (e.g. with white space only).
joachim99@8 66 // This choice is good for C/C++.
joachim99@8 67 bool equal( const LineData& l1, const LineData& l2, bool bStrict )
joachim99@8 68 {
joachim99@8 69 if ( l1.pLine==0 || l2.pLine==0) return false;
joachim99@8 70
joachim99@69 71 if ( bStrict && g_bIgnoreTrivialMatches )//&& (l1.occurances>=5 || l2.occurances>=5) )
joachim99@8 72 return false;
joachim99@8 73
joachim99@8 74 // Ignore white space diff
joachim99@68 75 const QChar* p1 = l1.pLine;
joachim99@68 76 const QChar* p1End = p1 + l1.size;
joachim99@8 77
joachim99@68 78 const QChar* p2 = l2.pLine;
joachim99@68 79 const QChar* p2End = p2 + l2.size;
joachim99@8 80
joachim99@8 81 if ( g_bIgnoreWhiteSpace )
joachim99@8 82 {
joachim99@8 83 int nonWhite = 0;
joachim99@8 84 for(;;)
joachim99@8 85 {
joachim99@8 86 while( isWhite( *p1 ) && p1!=p1End ) ++p1;
joachim99@8 87 while( isWhite( *p2 ) && p2!=p2End ) ++p2;
joachim99@8 88
joachim99@8 89 if ( p1 == p1End && p2 == p2End )
joachim99@8 90 {
joachim99@8 91 if ( bStrict && g_bIgnoreTrivialMatches )
joachim99@8 92 { // Then equality is not enough
joachim99@8 93 return nonWhite>2;
joachim99@8 94 }
joachim99@8 95 else // equality is enough
joachim99@8 96 return true;
joachim99@8 97 }
joachim99@8 98 else if ( p1 == p1End || p2 == p2End )
joachim99@8 99 return false;
joachim99@8 100
joachim99@8 101 if( *p1 != *p2 )
joachim99@8 102 return false;
joachim99@8 103 ++p1;
joachim99@8 104 ++p2;
joachim99@8 105 ++nonWhite;
joachim99@8 106 }
joachim99@8 107 }
joachim99@8 108
joachim99@8 109 else
joachim99@8 110 {
joachim99@8 111 if ( l1.size==l2.size && memcmp(p1, p2, l1.size)==0)
joachim99@8 112 return true;
joachim99@8 113 else
joachim99@8 114 return false;
joachim99@8 115 }
joachim99@8 116 }
joachim99@8 117
joachim99@8 118
joachim99@68 119 static bool isLineOrBufEnd( const QChar* p, int i, int size )
joachim99@8 120 {
joachim99@58 121 return
joachim99@58 122 i>=size // End of file
joachim99@58 123 || p[i]=='\n' // Normal end of line
joachim99@8 124
joachim99@58 125 // No support for Mac-end of line yet, because incompatible with GNU-diff-routines.
joachim99@58 126 // || ( p[i]=='\r' && (i>=size-1 || p[i+1]!='\n')
joachim99@58 127 // && (i==0 || p[i-1]!='\n') ) // Special case: '\r' without '\n'
joachim99@58 128 ;
joachim99@58 129 }
joachim99@8 130
joachim99@43 131
joachim99@58 132 /* Features of class SourceData:
joachim99@58 133 - Read a file (from the given URL) or accept data via a string.
joachim99@58 134 - Allocate and free buffers as necessary.
joachim99@58 135 - Run a preprocessor, when specified.
joachim99@58 136 - Run the line-matching preprocessor, when specified.
joachim99@68 137 - Run other preprocessing steps: Uppercase, ignore comments,
joachim99@58 138 remove carriage return, ignore numbers.
joachim99@58 139
joachim99@58 140 Order of operation:
joachim99@58 141 1. If data was given via a string then save it to a temp file. (see setData())
joachim99@58 142 2. If the specified file is nonlocal (URL) copy it to a temp file.
joachim99@58 143 3. If a preprocessor was specified, run the input file through it.
joachim99@58 144 4. Read the output of the preprocessor.
joachim99@58 145 5. If Uppercase was specified: Turn the read data to uppercase.
joachim99@58 146 6. Write the result to a temp file.
joachim99@58 147 7. If a line-matching preprocessor was specified, run the temp file through it.
joachim99@58 148 8. Read the output of the line-matching preprocessor.
joachim99@58 149 9. If ignore numbers was specified, strip the LMPP-output of all numbers.
joachim99@58 150 10. If ignore comments was specified, strip the LMPP-output of comments.
joachim99@58 151
joachim99@58 152 Optimizations: Skip unneeded steps.
joachim99@58 153 */
joachim99@58 154
joachim99@58 155 SourceData::SourceData()
joachim99@68 156 {
joachim99@58 157 m_pOptionDialog = 0;
joachim99@58 158 reset();
joachim99@58 159 }
joachim99@58 160
joachim99@58 161 SourceData::~SourceData()
joachim99@58 162 {
joachim99@58 163 reset();
joachim99@58 164 }
joachim99@8 165
joachim99@8 166 void SourceData::reset()
joachim99@8 167 {
joachim99@80 168 m_pEncoding = 0;
joachim99@66 169 m_fileAccess = FileAccess();
joachim99@58 170 m_normalData.reset();
joachim99@58 171 m_lmppData.reset();
joachim99@58 172 if ( !m_tempInputFileName.isEmpty() )
joachim99@58 173 {
joachim99@58 174 FileAccess::removeFile( m_tempInputFileName );
joachim99@58 175 m_tempInputFileName = "";
joachim99@58 176 }
joachim99@58 177 }
joachim99@58 178
joachim99@58 179 void SourceData::setFilename( const QString& filename )
joachim99@58 180 {
joachim99@58 181 if (filename.isEmpty())
joachim99@58 182 {
joachim99@58 183 reset();
joachim99@58 184 }
joachim99@58 185 else
joachim99@58 186 {
joachim99@58 187 FileAccess fa( filename );
joachim99@58 188 setFileAccess( fa );
joachim99@58 189 }
joachim99@58 190 }
joachim99@58 191
joachim99@58 192 bool SourceData::isEmpty()
joachim99@58 193 {
joachim99@58 194 return getFilename().isEmpty();
joachim99@58 195 }
joachim99@58 196
joachim99@58 197 bool SourceData::hasData()
joachim99@58 198 {
joachim99@58 199 return m_normalData.m_pBuf != 0;
joachim99@58 200 }
joachim99@58 201
joachim99@66 202 bool SourceData::isValid()
joachim99@66 203 {
joachim99@66 204 return isEmpty() || hasData();
joachim99@66 205 }
joachim99@66 206
joachim99@58 207 void SourceData::setOptionDialog( OptionDialog* pOptionDialog )
joachim99@58 208 {
joachim99@58 209 m_pOptionDialog = pOptionDialog;
joachim99@58 210 }
joachim99@58 211
joachim99@58 212 QString SourceData::getFilename()
joachim99@58 213 {
joachim99@80 214 return m_fileAccess.absoluteFilePath();
joachim99@58 215 }
joachim99@58 216
joachim99@58 217 QString SourceData::getAliasName()
joachim99@58 218 {
joachim99@58 219 return m_aliasName.isEmpty() ? m_fileAccess.prettyAbsPath() : m_aliasName;
joachim99@58 220 }
joachim99@58 221
joachim99@58 222 void SourceData::setAliasName( const QString& name )
joachim99@58 223 {
joachim99@58 224 m_aliasName = name;
joachim99@58 225 }
joachim99@58 226
joachim99@58 227 void SourceData::setFileAccess( const FileAccess& fileAccess )
joachim99@58 228 {
joachim99@58 229 m_fileAccess = fileAccess;
joachim99@58 230 m_aliasName = QString();
joachim99@58 231 if ( !m_tempInputFileName.isEmpty() )
joachim99@58 232 {
joachim99@58 233 FileAccess::removeFile( m_tempInputFileName );
joachim99@58 234 m_tempInputFileName = "";
joachim99@58 235 }
joachim99@58 236 }
joachim99@58 237
joachim99@58 238 void SourceData::setData( const QString& data )
joachim99@58 239 {
joachim99@58 240 // Create a temp file for preprocessing:
joachim99@58 241 if ( m_tempInputFileName.isEmpty() )
joachim99@58 242 {
joachim99@58 243 m_tempInputFileName = FileAccess::tempFileName();
joachim99@58 244 }
joachim99@68 245
joachim99@58 246 FileAccess f( m_tempInputFileName );
joachim99@92 247 QByteArray ba = QTextCodec::codecForName("UTF-8")->fromUnicode(data);
joachim99@92 248 bool bSuccess = f.writeFile( ba.constData(), ba.length() );
joachim99@58 249 if ( !bSuccess )
joachim99@58 250 {
joachim99@58 251 KMessageBox::error( m_pOptionDialog, i18n("Writing clipboard data to temp file failed.") );
joachim99@58 252 return;
joachim99@58 253 }
joachim99@68 254
joachim99@58 255 m_aliasName = i18n("From Clipboard");
joachim99@58 256 m_fileAccess = FileAccess(""); // Effect: m_fileAccess.isValid() is false
joachim99@58 257 }
joachim99@58 258
joachim99@68 259 const LineData* SourceData::getLineDataForDiff() const
joachim99@58 260 {
joachim99@69 261 if ( m_lmppData.m_pBuf==0 )
joachim99@69 262 return m_normalData.m_v.size()>0 ? &m_normalData.m_v[0] : 0;
joachim99@69 263 else
joachim99@69 264 return m_lmppData.m_v.size()>0 ? &m_lmppData.m_v[0] : 0;
joachim99@58 265 }
joachim99@58 266
joachim99@58 267 const LineData* SourceData::getLineDataForDisplay() const
joachim99@58 268 {
joachim99@69 269 return m_normalData.m_v.size()>0 ? &m_normalData.m_v[0] : 0;
joachim99@58 270 }
joachim99@58 271
joachim99@58 272 int SourceData::getSizeLines() const
joachim99@58 273 {
joachim99@58 274 return m_normalData.m_vSize;
joachim99@58 275 }
joachim99@58 276
joachim99@58 277 int SourceData::getSizeBytes() const
joachim99@58 278 {
joachim99@58 279 return m_normalData.m_size;
joachim99@58 280 }
joachim99@58 281
joachim99@58 282 const char* SourceData::getBuf() const
joachim99@58 283 {
joachim99@58 284 return m_normalData.m_pBuf;
joachim99@58 285 }
joachim99@58 286
joachim99@58 287 bool SourceData::isText()
joachim99@58 288 {
joachim99@58 289 return m_normalData.m_bIsText;
joachim99@58 290 }
joachim99@58 291
joachim99@58 292 bool SourceData::isFromBuffer()
joachim99@58 293 {
joachim99@58 294 return !m_fileAccess.isValid();
joachim99@58 295 }
joachim99@58 296
joachim99@58 297
joachim99@58 298 bool SourceData::isBinaryEqualWith( const SourceData& other ) const
joachim99@58 299 {
joachim99@77 300 return m_fileAccess.exists() && other.m_fileAccess.exists() &&
joachim99@77 301 getSizeBytes() == other.getSizeBytes() &&
joachim99@66 302 ( getSizeBytes()==0 || memcmp( getBuf(), other.getBuf(), getSizeBytes() )==0 );
joachim99@58 303 }
joachim99@58 304
joachim99@58 305 void SourceData::FileData::reset()
joachim99@58 306 {
joachim99@69 307 delete[] (char*)m_pBuf;
joachim99@8 308 m_pBuf = 0;
joachim99@8 309 m_v.clear();
joachim99@8 310 m_size = 0;
joachim99@8 311 m_vSize = 0;
joachim99@58 312 m_bIsText = true;
joachim99@80 313 m_eLineEndStyle = eLineEndStyleUndefined;
joachim99@8 314 }
joachim99@8 315
joachim99@58 316 bool SourceData::FileData::readFile( const QString& filename )
joachim99@58 317 {
joachim99@58 318 reset();
joachim99@58 319 if ( filename.isEmpty() ) { return true; }
joachim99@58 320
joachim99@58 321 FileAccess fa( filename );
joachim99@58 322 m_size = fa.sizeForReading();
joachim99@58 323 char* pBuf;
joachim99@58 324 m_pBuf = pBuf = new char[m_size+100]; // Alloc 100 byte extra: Savety hack, not nice but does no harm.
joachim99@68 325 // Some extra bytes at the end of the buffer are needed by
joachim99@68 326 // the diff algorithm. See also GnuDiff::diff_2_files().
joachim99@58 327 bool bSuccess = fa.readFile( pBuf, m_size );
joachim99@58 328 if ( !bSuccess )
joachim99@58 329 {
joachim99@58 330 delete pBuf;
joachim99@58 331 m_pBuf = 0;
joachim99@58 332 m_size = 0;
joachim99@58 333 }
joachim99@58 334 return bSuccess;
joachim99@58 335 }
joachim99@58 336
joachim99@58 337 bool SourceData::saveNormalDataAs( const QString& fileName )
joachim99@58 338 {
joachim99@58 339 return m_normalData.writeFile( fileName );
joachim99@58 340 }
joachim99@58 341
joachim99@58 342 bool SourceData::FileData::writeFile( const QString& filename )
joachim99@58 343 {
joachim99@58 344 if ( filename.isEmpty() ) { return true; }
joachim99@58 345
joachim99@58 346 FileAccess fa( filename );
joachim99@58 347 bool bSuccess = fa.writeFile(m_pBuf, m_size);
joachim99@58 348 return bSuccess;
joachim99@58 349 }
joachim99@58 350
joachim99@58 351 void SourceData::FileData::copyBufFrom( const FileData& src )
joachim99@58 352 {
joachim99@58 353 reset();
joachim99@68 354 char* pBuf;
joachim99@58 355 m_size = src.m_size;
joachim99@58 356 m_pBuf = pBuf = new char[m_size+100];
joachim99@58 357 memcpy( pBuf, src.m_pBuf, m_size );
joachim99@58 358 }
joachim99@58 359
joachim99@68 360 // Convert the input file from input encoding to output encoding and write it to the output file.
joachim99@68 361 static bool convertFileEncoding( const QString& fileNameIn, QTextCodec* pCodecIn,
joachim99@68 362 const QString& fileNameOut, QTextCodec* pCodecOut )
joachim99@58 363 {
joachim99@68 364 QFile in( fileNameIn );
joachim99@70 365 if ( ! in.open(QIODevice::ReadOnly ) )
joachim99@68 366 return false;
joachim99@68 367 QTextStream inStream( &in );
joachim99@68 368 inStream.setCodec( pCodecIn );
joachim99@75 369 inStream.setAutoDetectUnicode( false );
joachim99@68 370
joachim99@68 371 QFile out( fileNameOut );
joachim99@70 372 if ( ! out.open( QIODevice::WriteOnly ) )
joachim99@68 373 return false;
joachim99@68 374 QTextStream outStream( &out );
joachim99@68 375 outStream.setCodec( pCodecOut );
joachim99@68 376
joachim99@75 377 QString data = inStream.readAll();
joachim99@68 378 outStream << data;
joachim99@68 379
joachim99@68 380 return true;
joachim99@68 381 }
joachim99@68 382
joachim99@75 383 static QTextCodec* detectEncoding( const char* buf, qint64 size, qint64& skipBytes )
joachim99@75 384 {
joachim99@75 385 if (size>=2)
joachim99@75 386 {
joachim99@75 387 skipBytes = 2;
joachim99@75 388 if (buf[0]=='\xFF' && buf[1]=='\xFE' )
joachim99@75 389 return QTextCodec::codecForName( "UTF-16LE" );
joachim99@75 390
joachim99@75 391 if (buf[0]=='\xFE' && buf[1]=='\xFF' )
joachim99@75 392 return QTextCodec::codecForName( "UTF-16BE" );
joachim99@75 393 }
joachim99@75 394 if (size>=3)
joachim99@75 395 {
joachim99@75 396 skipBytes = 3;
joachim99@75 397 if (buf[0]=='\xEF' && buf[1]=='\xBB' && buf[2]=='\xBF' )
joachim99@75 398 return QTextCodec::codecForName( "UTF-8-BOM" );
joachim99@75 399 }
joachim99@75 400 skipBytes = 0;
joachim99@75 401 return 0;
joachim99@75 402 }
joachim99@75 403
joachim99@75 404 QTextCodec* SourceData::detectEncoding( const QString& fileName, QTextCodec* pFallbackCodec )
joachim99@75 405 {
joachim99@75 406 QFile f(fileName);
joachim99@75 407 if ( f.open(QIODevice::ReadOnly) )
joachim99@75 408 {
joachim99@75 409 char buf[4];
joachim99@75 410 qint64 size = f.read( buf, sizeof(buf) );
joachim99@75 411 qint64 skipBytes = 0;
joachim99@75 412 QTextCodec* pCodec = ::detectEncoding( buf, size, skipBytes );
joachim99@75 413 if (pCodec)
joachim99@75 414 return pCodec;
joachim99@75 415 }
joachim99@75 416 return pFallbackCodec;
joachim99@75 417 }
joachim99@75 418
joachim99@75 419 void SourceData::readAndPreprocess( QTextCodec* pEncoding, bool bAutoDetectUnicode )
joachim99@68 420 {
joachim99@68 421 m_pEncoding = pEncoding;
joachim99@58 422 QString fileNameIn1;
joachim99@58 423 QString fileNameOut1;
joachim99@58 424 QString fileNameIn2;
joachim99@58 425 QString fileNameOut2;
joachim99@68 426
joachim99@58 427 bool bTempFileFromClipboard = !m_fileAccess.isValid();
joachim99@68 428
joachim99@58 429 // Detect the input for the preprocessing operations
joachim99@58 430 if ( !bTempFileFromClipboard )
joachim99@58 431 {
joachim99@58 432 if ( m_fileAccess.isLocal() )
joachim99@58 433 {
joachim99@80 434 fileNameIn1 = m_fileAccess.absoluteFilePath();
joachim99@58 435 }
joachim99@58 436 else // File is not local: create a temporary local copy:
joachim99@58 437 {
joachim99@58 438 if ( m_tempInputFileName.isEmpty() ) { m_tempInputFileName = FileAccess::tempFileName(); }
joachim99@68 439
joachim99@58 440 m_fileAccess.copyFile(m_tempInputFileName);
joachim99@58 441 fileNameIn1 = m_tempInputFileName;
joachim99@58 442 }
joachim99@75 443 if ( bAutoDetectUnicode )
joachim99@75 444 {
joachim99@75 445 m_pEncoding = detectEncoding( fileNameIn1, pEncoding );
joachim99@75 446 }
joachim99@58 447 }
joachim99@58 448 else // The input was set via setData(), probably from clipboard.
joachim99@58 449 {
joachim99@58 450 fileNameIn1 = m_tempInputFileName;
joachim99@68 451 m_pEncoding = QTextCodec::codecForName("UTF-8");
joachim99@58 452 }
joachim99@75 453 QTextCodec* pEncoding1 = m_pEncoding;
joachim99@75 454 QTextCodec* pEncoding2 = m_pEncoding;
joachim99@68 455
joachim99@58 456 m_normalData.reset();
joachim99@58 457 m_lmppData.reset();
joachim99@68 458
joachim99@58 459 FileAccess faIn(fileNameIn1);
joachim99@58 460 int fileInSize = faIn.size();
joachim99@68 461
joachim99@66 462 if ( faIn.exists() ) // fileInSize > 0 )
joachim99@68 463 {
joachim99@58 464
joachim99@95 465 #if defined(_WIN32) || defined(Q_OS_OS2)
joachim99@58 466 QString catCmd = "type";
joachim99@58 467 fileNameIn1.replace( '/', "\\" );
joachim99@58 468 #else
joachim99@58 469 QString catCmd = "cat";
joachim99@58 470 #endif
joachim99@68 471
joachim99@58 472 // Run the first preprocessor
joachim99@58 473 if ( m_pOptionDialog->m_PreProcessorCmd.isEmpty() )
joachim99@58 474 {
joachim99@58 475 // No preprocessing: Read the file directly:
joachim99@58 476 m_normalData.readFile( fileNameIn1 );
joachim99@58 477 }
joachim99@58 478 else
joachim99@58 479 {
joachim99@68 480 QString fileNameInPP = fileNameIn1;
joachim99@68 481
joachim99@68 482 if ( pEncoding1 != m_pOptionDialog->m_pEncodingPP )
joachim99@68 483 {
joachim99@68 484 // Before running the preprocessor convert to the format that the preprocessor expects.
joachim99@68 485 fileNameInPP = FileAccess::tempFileName();
joachim99@68 486 pEncoding1 = m_pOptionDialog->m_pEncodingPP;
joachim99@68 487 convertFileEncoding( fileNameIn1, pEncoding, fileNameInPP, pEncoding1 );
joachim99@68 488 }
joachim99@68 489
joachim99@58 490 QString ppCmd = m_pOptionDialog->m_PreProcessorCmd;
joachim99@58 491 fileNameOut1 = FileAccess::tempFileName();
joachim99@75 492
joachim99@75 493 QProcess ppProcess;
joachim99@75 494 ppProcess.setStandardInputFile( fileNameInPP );
joachim99@75 495 ppProcess.setStandardOutputFile( fileNameOut1 );
joachim99@75 496 ppProcess.start( ppCmd );
joachim99@75 497 ppProcess.waitForFinished(-1);
joachim99@75 498 //QString cmd = catCmd + " \"" + fileNameInPP + "\" | " + ppCmd + " >\"" + fileNameOut1+"\"";
joachim99@75 499 //::system( encodeString(cmd) );
joachim99@58 500 bool bSuccess = m_normalData.readFile( fileNameOut1 );
joachim99@58 501 if ( fileInSize >0 && ( !bSuccess || m_normalData.m_size==0 ) )
joachim99@58 502 {
joachim99@58 503 KMessageBox::error(m_pOptionDialog,
joachim99@58 504 i18n("Preprocessing possibly failed. Check this command:\n\n %1"
joachim99@58 505 "\n\nThe preprocessing command will be disabled now."
joachim99@75 506 ).arg(ppCmd) );
joachim99@58 507 m_pOptionDialog->m_PreProcessorCmd = "";
joachim99@58 508 m_normalData.readFile( fileNameIn1 );
joachim99@68 509 pEncoding1 = m_pEncoding;
joachim99@68 510 }
joachim99@68 511 if (fileNameInPP != fileNameIn1)
joachim99@68 512 {
joachim99@73 513 FileAccess::removeTempFile( fileNameInPP );
joachim99@58 514 }
joachim99@58 515 }
joachim99@68 516
joachim99@58 517 // LineMatching Preprocessor
joachim99@58 518 if ( ! m_pOptionDialog->m_LineMatchingPreProcessorCmd.isEmpty() )
joachim99@58 519 {
joachim99@66 520 fileNameIn2 = fileNameOut1.isEmpty() ? fileNameIn1 : fileNameOut1;
joachim99@68 521 QString fileNameInPP = fileNameIn2;
joachim99@68 522 pEncoding2 = pEncoding1;
joachim99@68 523 if ( pEncoding2 != m_pOptionDialog->m_pEncodingPP )
joachim99@68 524 {
joachim99@75 525 // Before running the preprocessor convert to the format that the preprocessor expects.
joachim99@68 526 fileNameInPP = FileAccess::tempFileName();
joachim99@68 527 pEncoding2 = m_pOptionDialog->m_pEncodingPP;
joachim99@68 528 convertFileEncoding( fileNameIn2, pEncoding1, fileNameInPP, pEncoding2 );
joachim99@68 529 }
joachim99@68 530
joachim99@58 531 QString ppCmd = m_pOptionDialog->m_LineMatchingPreProcessorCmd;
joachim99@58 532 fileNameOut2 = FileAccess::tempFileName();
joachim99@75 533 QProcess ppProcess;
joachim99@75 534 ppProcess.setStandardInputFile( fileNameInPP );
joachim99@75 535 ppProcess.setStandardOutputFile( fileNameOut2 );
joachim99@75 536 ppProcess.start( ppCmd );
joachim99@75 537 ppProcess.waitForFinished(-1);
joachim99@75 538 //QString cmd = catCmd + " \"" + fileNameInPP + "\" | " + ppCmd + " >\"" + fileNameOut2 + "\"";
joachim99@75 539 //::system( encodeString(cmd) );
joachim99@58 540 bool bSuccess = m_lmppData.readFile( fileNameOut2 );
joachim99@58 541 if ( FileAccess(fileNameIn2).size()>0 && ( !bSuccess || m_lmppData.m_size==0 ) )
joachim99@58 542 {
joachim99@58 543 KMessageBox::error(m_pOptionDialog,
joachim99@58 544 i18n("The line-matching-preprocessing possibly failed. Check this command:\n\n %1"
joachim99@58 545 "\n\nThe line-matching-preprocessing command will be disabled now."
joachim99@75 546 ).arg(ppCmd) );
joachim99@58 547 m_pOptionDialog->m_LineMatchingPreProcessorCmd = "";
joachim99@58 548 m_lmppData.readFile( fileNameIn2 );
joachim99@58 549 }
joachim99@73 550 FileAccess::removeTempFile( fileNameOut2 );
joachim99@68 551 if (fileNameInPP != fileNameIn2)
joachim99@68 552 {
joachim99@73 553 FileAccess::removeTempFile( fileNameInPP );
joachim99@68 554 }
joachim99@58 555 }
joachim99@66 556 else if ( m_pOptionDialog->m_bIgnoreComments || m_pOptionDialog->m_bIgnoreCase )
joachim99@58 557 {
joachim99@58 558 // We need a copy of the normal data.
joachim99@58 559 m_lmppData.copyBufFrom( m_normalData );
joachim99@58 560 }
joachim99@58 561 else
joachim99@58 562 { // We don't need any lmpp data at all.
joachim99@58 563 m_lmppData.reset();
joachim99@58 564 }
joachim99@68 565 }
joachim99@68 566
joachim99@68 567 m_normalData.preprocess( m_pOptionDialog->m_bPreserveCarriageReturn, pEncoding1 );
joachim99@68 568 m_lmppData.preprocess( false, pEncoding2 );
joachim99@68 569
joachim99@58 570 if ( m_lmppData.m_vSize < m_normalData.m_vSize )
joachim99@58 571 {
joachim99@58 572 // This probably is the fault of the LMPP-Command, but not worth reporting.
joachim99@58 573 m_lmppData.m_v.resize( m_normalData.m_vSize );
joachim99@58 574 for(int i=m_lmppData.m_vSize; i<m_normalData.m_vSize; ++i )
joachim99@58 575 { // Set all empty lines to point to the end of the buffer.
joachim99@68 576 m_lmppData.m_v[i].pLine = m_lmppData.m_unicodeBuf.unicode()+m_lmppData.m_unicodeBuf.length();
joachim99@58 577 }
joachim99@68 578
joachim99@58 579 m_lmppData.m_vSize = m_normalData.m_vSize;
joachim99@58 580 }
joachim99@66 581
joachim99@66 582 // Internal Preprocessing: Uppercase-conversion
joachim99@66 583 if ( m_pOptionDialog->m_bIgnoreCase )
joachim99@66 584 {
joachim99@66 585 int i;
joachim99@68 586 QChar* pBuf = const_cast<QChar*>(m_lmppData.m_unicodeBuf.unicode());
joachim99@68 587 int ucSize = m_lmppData.m_unicodeBuf.length();
joachim99@68 588 for(i=0; i<ucSize; ++i)
joachim99@66 589 {
joachim99@75 590 pBuf[i] = pBuf[i].toUpper();
joachim99@66 591 }
joachim99@68 592 }
joachim99@68 593
joachim99@58 594 // Ignore comments
joachim99@58 595 if ( m_pOptionDialog->m_bIgnoreComments )
joachim99@58 596 {
joachim99@58 597 m_lmppData.removeComments();
joachim99@58 598 int vSize = min2(m_normalData.m_vSize, m_lmppData.m_vSize);
joachim99@58 599 for(int i=0; i<vSize; ++i )
joachim99@58 600 {
joachim99@58 601 m_normalData.m_v[i].bContainsPureComment = m_lmppData.m_v[i].bContainsPureComment;
joachim99@58 602 }
joachim99@58 603 }
joachim99@68 604
joachim99@58 605 // Remove unneeded temporary files. (A temp file from clipboard must not be deleted.)
joachim99@58 606 if ( !bTempFileFromClipboard && !m_tempInputFileName.isEmpty() )
joachim99@58 607 {
joachim99@73 608 FileAccess::removeTempFile( m_tempInputFileName );
joachim99@58 609 m_tempInputFileName = "";
joachim99@58 610 }
joachim99@68 611
joachim99@58 612 if ( !fileNameOut1.isEmpty() )
joachim99@58 613 {
joachim99@73 614 FileAccess::removeTempFile( fileNameOut1 );
joachim99@58 615 fileNameOut1="";
joachim99@58 616 }
joachim99@58 617 }
joachim99@58 618
joachim99@58 619
joachim99@8 620 /** Prepare the linedata vector for every input line.*/
joachim99@68 621 void SourceData::FileData::preprocess( bool bPreserveCR, QTextCodec* pEncoding )
joachim99@8 622 {
joachim99@68 623 //m_unicodeBuf = decodeString( m_pBuf, m_size, eEncoding );
joachim99@68 624
joachim99@80 625 qint64 i;
joachim99@80 626 // detect line end style
joachim99@80 627 m_eLineEndStyle = eLineEndStyleUndefined;
joachim99@80 628 for( i=0; i<m_size; ++i )
joachim99@80 629 {
joachim99@80 630 if ( m_pBuf[i]=='\n' )
joachim99@80 631 {
joachim99@80 632 if ( i>0 && m_pBuf[i-1]=='\r' || // normal file
joachim99@80 633 i>3 && m_pBuf[i-1]=='\0' && m_pBuf[i-2]=='\r' && m_pBuf[i-3]=='\0') // 16-bit unicode
joachim99@80 634 m_eLineEndStyle = eLineEndStyleDos;
joachim99@80 635 else
joachim99@80 636 m_eLineEndStyle = eLineEndStyleUnix;
joachim99@80 637 break; // Only analyze first line
joachim99@80 638 }
joachim99@80 639 }
joachim99@75 640 qint64 skipBytes = 0;
joachim99@75 641 QTextCodec* pCodec = ::detectEncoding( m_pBuf, m_size, skipBytes );
joachim99@75 642 if ( pCodec != pEncoding )
joachim99@75 643 skipBytes=0;
joachim99@75 644
joachim99@75 645 QByteArray ba = QByteArray::fromRawData( m_pBuf+skipBytes, m_size-skipBytes );
joachim99@70 646 QTextStream ts( ba, QIODevice::ReadOnly );
joachim99@68 647 ts.setCodec( pEncoding);
joachim99@75 648 ts.setAutoDetectUnicode( false );
joachim99@75 649 m_unicodeBuf = ts.readAll();
joachim99@75 650 ba.clear();
joachim99@68 651
joachim99@68 652 int ucSize = m_unicodeBuf.length();
joachim99@68 653 const QChar* p = m_unicodeBuf.unicode();
joachim99@68 654
joachim99@8 655 m_bIsText = true;
joachim99@8 656 int lines = 1;
joachim99@68 657 for( i=0; i<ucSize; ++i )
joachim99@8 658 {
joachim99@68 659 if ( isLineOrBufEnd(p,i,ucSize) )
joachim99@8 660 {
joachim99@8 661 ++lines;
joachim99@8 662 }
joachim99@8 663 if ( p[i]=='\0' )
joachim99@8 664 {
joachim99@8 665 m_bIsText = false;
joachim99@8 666 }
joachim99@8 667 }
joachim99@8 668
joachim99@8 669 m_v.resize( lines+5 );
joachim99@8 670 int lineIdx=0;
joachim99@8 671 int lineLength=0;
joachim99@8 672 bool bNonWhiteFound = false;
joachim99@8 673 int whiteLength = 0;
joachim99@68 674 for( i=0; i<=ucSize; ++i )
joachim99@8 675 {
joachim99@68 676 if ( isLineOrBufEnd( p, i, ucSize ) )
joachim99@8 677 {
joachim99@8 678 m_v[lineIdx].pLine = &p[ i-lineLength ];
joachim99@39 679 while ( !bPreserveCR && lineLength>0 && m_v[lineIdx].pLine[lineLength-1]=='\r' )
joachim99@39 680 {
joachim99@39 681 --lineLength;
joachim99@39 682 }
joachim99@43 683 m_v[lineIdx].pFirstNonWhiteChar = m_v[lineIdx].pLine + min2(whiteLength,lineLength);
joachim99@8 684 m_v[lineIdx].size = lineLength;
joachim99@8 685 lineLength = 0;
joachim99@8 686 bNonWhiteFound = false;
joachim99@8 687 whiteLength = 0;
joachim99@8 688 ++lineIdx;
joachim99@8 689 }
joachim99@8 690 else
joachim99@8 691 {
joachim99@8 692 ++lineLength;
joachim99@8 693
joachim99@8 694 if ( ! bNonWhiteFound && isWhite( p[i] ) )
joachim99@8 695 ++whiteLength;
joachim99@8 696 else
joachim99@8 697 bNonWhiteFound = true;
joachim99@8 698 }
joachim99@8 699 }
joachim99@8 700 assert( lineIdx == lines );
joachim99@8 701
joachim99@8 702 m_vSize = lines;
joachim99@8 703 }
joachim99@8 704
joachim99@51 705
joachim99@51 706 // Must not be entered, when within a comment.
joachim99@51 707 // Returns either at a newline-character p[i]=='\n' or when i==size.
joachim99@51 708 // A line that contains only comments is still "white".
joachim99@51 709 // Comments in white lines must remain, while comments in
joachim99@51 710 // non-white lines are overwritten with spaces.
joachim99@51 711 static void checkLineForComments(
joachim99@68 712 QChar* p, // pointer to start of buffer
joachim99@51 713 int& i, // index of current position (in, out)
joachim99@51 714 int size, // size of buffer
joachim99@51 715 bool& bWhite, // false if this line contains nonwhite characters (in, out)
joachim99@51 716 bool& bCommentInLine, // true if any comment is within this line (in, out)
joachim99@51 717 bool& bStartsOpenComment // true if the line ends within an comment (out)
joachim99@51 718 )
joachim99@8 719 {
joachim99@51 720 bStartsOpenComment = false;
joachim99@51 721 for(; i<size; ++i )
joachim99@51 722 {
joachim99@51 723 // A single apostroph ' has prio over a double apostroph " (e.g. '"')
joachim99@51 724 // (if not in a string)
joachim99@51 725 if ( p[i]=='\'' )
joachim99@51 726 {
joachim99@51 727 bWhite = false;
joachim99@51 728 ++i;
joachim99@58 729 for( ; !isLineOrBufEnd(p,i,size) && p[i]!='\''; ++i)
joachim99@51 730 ;
joachim99@51 731 if (p[i]=='\'') ++i;
joachim99@51 732 }
joachim99@51 733
joachim99@51 734 // Strings have priority over comments: e.g. "/* Not a comment, but a string. */"
joachim99@51 735 else if ( p[i]=='"' )
joachim99@51 736 {
joachim99@51 737 bWhite = false;
joachim99@51 738 ++i;
joachim99@58 739 for( ; !isLineOrBufEnd(p,i,size) && !(p[i]=='"' && p[i-1]!='\\'); ++i)
joachim99@51 740 ;
joachim99@51 741 if (p[i]=='"') ++i;
joachim99@51 742 }
joachim99@51 743
joachim99@51 744 // C++-comment
joachim99@51 745 else if ( p[i]=='/' && i+1<size && p[i+1] =='/' )
joachim99@51 746 {
joachim99@51 747 int commentStart = i;
joachim99@51 748 bCommentInLine = true;
joachim99@51 749 i+=2;
joachim99@58 750 for( ; !isLineOrBufEnd(p,i,size); ++i)
joachim99@51 751 ;
joachim99@51 752 if ( !bWhite )
joachim99@51 753 {
joachim99@51 754 memset( &p[commentStart], ' ', i-commentStart );
joachim99@51 755 }
joachim99@51 756 return;
joachim99@51 757 }
joachim99@51 758
joachim99@51 759 // C-comment
joachim99@51 760 else if ( p[i]=='/' && i+1<size && p[i+1] =='*' )
joachim99@51 761 {
joachim99@51 762 int commentStart = i;
joachim99@51 763 bCommentInLine = true;
joachim99@51 764 i+=2;
joachim99@58 765 for( ; !isLineOrBufEnd(p,i,size); ++i)
joachim99@51 766 {
joachim99@51 767 if ( i+1<size && p[i]=='*' && p[i+1]=='/') // end of the comment
joachim99@51 768 {
joachim99@51 769 i+=2;
joachim99@51 770
joachim99@51 771 // More comments in the line?
joachim99@51 772 checkLineForComments( p, i, size, bWhite, bCommentInLine, bStartsOpenComment );
joachim99@51 773 if ( !bWhite )
joachim99@51 774 {
joachim99@51 775 memset( &p[commentStart], ' ', i-commentStart );
joachim99@51 776 }
joachim99@51 777 return;
joachim99@51 778 }
joachim99@51 779 }
joachim99@51 780 bStartsOpenComment = true;
joachim99@51 781 return;
joachim99@51 782 }
joachim99@51 783
joachim99@51 784
joachim99@58 785 if ( isLineOrBufEnd(p,i,size) )
joachim99@51 786 {
joachim99@51 787 return;
joachim99@51 788 }
joachim99@70 789 else if ( !p[i].isSpace() )
joachim99@51 790 {
joachim99@51 791 bWhite = false;
joachim99@51 792 }
joachim99@51 793 }
joachim99@51 794 }
joachim99@51 795
joachim99@51 796 // Modifies the input data, and replaces C/C++ comments with whitespace
joachim99@51 797 // when the line contains other data too. If the line contains only
joachim99@51 798 // a comment or white data, remember this in the flag bContainsPureComment.
joachim99@58 799 void SourceData::FileData::removeComments()
joachim99@51 800 {
joachim99@51 801 int line=0;
joachim99@68 802 QChar* p = const_cast<QChar*>(m_unicodeBuf.unicode());
joachim99@51 803 bool bWithinComment=false;
joachim99@68 804 int size = m_unicodeBuf.length();
joachim99@51 805 for(int i=0; i<size; ++i )
joachim99@51 806 {
joachim99@51 807 // std::cout << "2 " << std::string(&p[i], m_v[line].size) << std::endl;
joachim99@51 808 bool bWhite = true;
joachim99@51 809 bool bCommentInLine = false;
joachim99@51 810
joachim99@51 811 if ( bWithinComment )
joachim99@51 812 {
joachim99@51 813 int commentStart = i;
joachim99@51 814 bCommentInLine = true;
joachim99@51 815
joachim99@58 816 for( ; !isLineOrBufEnd(p,i,size); ++i)
joachim99@51 817 {
joachim99@51 818 if ( i+1<size && p[i]=='*' && p[i+1]=='/') // end of the comment
joachim99@51 819 {
joachim99@51 820 i+=2;
joachim99@51 821
joachim99@51 822 // More comments in the line?
joachim99@51 823 checkLineForComments( p, i, size, bWhite, bCommentInLine, bWithinComment );
joachim99@51 824 if ( !bWhite )
joachim99@51 825 {
joachim99@51 826 memset( &p[commentStart], ' ', i-commentStart );
joachim99@51 827 }
joachim99@51 828 break;
joachim99@51 829 }
joachim99@51 830 }
joachim99@51 831 }
joachim99@51 832 else
joachim99@51 833 {
joachim99@51 834 checkLineForComments( p, i, size, bWhite, bCommentInLine, bWithinComment );
joachim99@51 835 }
joachim99@51 836
joachim99@51 837 // end of line
joachim99@58 838 assert( isLineOrBufEnd(p,i,size));
joachim99@58 839 m_v[line].bContainsPureComment = bCommentInLine && bWhite;
joachim99@51 840 /* std::cout << line << " : " <<
joachim99@51 841 ( bCommentInLine ? "c" : " " ) <<
joachim99@51 842 ( bWhite ? "w " : " ") <<
joachim99@51 843 std::string(pLD[line].pLine, pLD[line].size) << std::endl;*/
joachim99@51 844
joachim99@51 845 ++line;
joachim99@51 846 }
joachim99@51 847 }
joachim99@51 848
joachim99@8 849
joachim99@8 850
joachim99@8 851 // First step
joachim99@8 852 void calcDiff3LineListUsingAB(
joachim99@8 853 const DiffList* pDiffListAB,
joachim99@8 854 Diff3LineList& d3ll
joachim99@8 855 )
joachim99@8 856 {
joachim99@8 857 // First make d3ll for AB (from pDiffListAB)
joachim99@8 858
joachim99@8 859 DiffList::const_iterator i=pDiffListAB->begin();
joachim99@8 860 int lineA=0;
joachim99@8 861 int lineB=0;
joachim99@8 862 Diff d(0,0,0);
joachim99@8 863
joachim99@8 864 for(;;)
joachim99@8 865 {
joachim99@8 866 if ( d.nofEquals==0 && d.diff1==0 && d.diff2==0 )
joachim99@8 867 {
joachim99@8 868 if ( i!=pDiffListAB->end() )
joachim99@8 869 {
joachim99@8 870 d=*i;
joachim99@8 871 ++i;
joachim99@8 872 }
joachim99@8 873 else
joachim99@8 874 break;
joachim99@8 875 }
joachim99@8 876
joachim99@8 877 Diff3Line d3l;
joachim99@8 878 if( d.nofEquals>0 )
joachim99@8 879 {
joachim99@8 880 d3l.bAEqB = true;
joachim99@8 881 d3l.lineA = lineA;
joachim99@8 882 d3l.lineB = lineB;
joachim99@8 883 --d.nofEquals;
joachim99@8 884 ++lineA;
joachim99@8 885 ++lineB;
joachim99@8 886 }
joachim99@8 887 else if ( d.diff1>0 && d.diff2>0 )
joachim99@8 888 {
joachim99@8 889 d3l.lineA = lineA;
joachim99@8 890 d3l.lineB = lineB;
joachim99@8 891 --d.diff1;
joachim99@8 892 --d.diff2;
joachim99@8 893 ++lineA;
joachim99@8 894 ++lineB;
joachim99@8 895 }
joachim99@8 896 else if ( d.diff1>0 )
joachim99@8 897 {
joachim99@8 898 d3l.lineA = lineA;
joachim99@8 899 --d.diff1;
joachim99@8 900 ++lineA;
joachim99@8 901 }
joachim99@8 902 else if ( d.diff2>0 )
joachim99@8 903 {
joachim99@8 904 d3l.lineB = lineB;
joachim99@8 905 --d.diff2;
joachim99@8 906 ++lineB;
joachim99@8 907 }
joachim99@8 908
joachim99@58 909 d3ll.push_back( d3l );
joachim99@8 910 }
joachim99@8 911 }
joachim99@8 912
joachim99@8 913
joachim99@8 914 // Second step
joachim99@58 915 void calcDiff3LineListUsingAC(
joachim99@8 916 const DiffList* pDiffListAC,
joachim99@8 917 Diff3LineList& d3ll
joachim99@8 918 )
joachim99@8 919 {
joachim99@8 920 ////////////////
joachim99@8 921 // Now insert data from C using pDiffListAC
joachim99@8 922
joachim99@8 923 DiffList::const_iterator i=pDiffListAC->begin();
joachim99@8 924 Diff3LineList::iterator i3 = d3ll.begin();
joachim99@8 925 int lineA=0;
joachim99@8 926 int lineC=0;
joachim99@8 927 Diff d(0,0,0);
joachim99@8 928
joachim99@8 929 for(;;)
joachim99@8 930 {
joachim99@8 931 if ( d.nofEquals==0 && d.diff1==0 && d.diff2==0 )
joachim99@8 932 {
joachim99@8 933 if ( i!=pDiffListAC->end() )
joachim99@8 934 {
joachim99@8 935 d=*i;
joachim99@8 936 ++i;
joachim99@8 937 }
joachim99@8 938 else
joachim99@8 939 break;
joachim99@8 940 }
joachim99@8 941
joachim99@8 942 Diff3Line d3l;
joachim99@8 943 if( d.nofEquals>0 )
joachim99@8 944 {
joachim99@8 945 // Find the corresponding lineA
joachim99@58 946 while( (*i3).lineA!=lineA )
joachim99@69 947 ++i3;
joachim99@8 948
joachim99@8 949 (*i3).lineC = lineC;
joachim99@8 950 (*i3).bAEqC = true;
joachim99@8 951 (*i3).bBEqC = (*i3).bAEqB;
joachim99@58 952
joachim99@8 953 --d.nofEquals;
joachim99@8 954 ++lineA;
joachim99@8 955 ++lineC;
joachim99@8 956 ++i3;
joachim99@8 957 }
joachim99@8 958 else if ( d.diff1>0 && d.diff2>0 )
joachim99@8 959 {
joachim99@8 960 d3l.lineC = lineC;
joachim99@8 961 d3ll.insert( i3, d3l );
joachim99@8 962 --d.diff1;
joachim99@8 963 --d.diff2;
joachim99@8 964 ++lineA;
joachim99@8 965 ++lineC;
joachim99@8 966 }
joachim99@8 967 else if ( d.diff1>0 )
joachim99@8 968 {
joachim99@8 969 --d.diff1;
joachim99@8 970 ++lineA;
joachim99@8 971 }
joachim99@8 972 else if ( d.diff2>0 )
joachim99@8 973 {
joachim99@8 974 d3l.lineC = lineC;
joachim99@8 975 d3ll.insert( i3, d3l );
joachim99@8 976 --d.diff2;
joachim99@8 977 ++lineC;
joachim99@8 978 }
joachim99@8 979 }
joachim99@8 980 }
joachim99@8 981
joachim99@8 982 // Third step
joachim99@58 983 void calcDiff3LineListUsingBC(
joachim99@8 984 const DiffList* pDiffListBC,
joachim99@8 985 Diff3LineList& d3ll
joachim99@8 986 )
joachim99@8 987 {
joachim99@8 988 ////////////////
joachim99@8 989 // Now improve the position of data from C using pDiffListBC
joachim99@8 990 // If a line from C equals a line from A then it is in the
joachim99@8 991 // same Diff3Line already.
joachim99@8 992 // If a line from C equals a line from B but not A, this
joachim99@8 993 // information will be used here.
joachim99@8 994
joachim99@8 995 DiffList::const_iterator i=pDiffListBC->begin();
joachim99@8 996 Diff3LineList::iterator i3b = d3ll.begin();
joachim99@8 997 Diff3LineList::iterator i3c = d3ll.begin();
joachim99@8 998 int lineB=0;
joachim99@8 999 int lineC=0;
joachim99@8 1000 Diff d(0,0,0);
joachim99@8 1001
joachim99@8 1002 for(;;)
joachim99@8 1003 {
joachim99@8 1004 if ( d.nofEquals==0 && d.diff1==0 && d.diff2==0 )
joachim99@8 1005 {
joachim99@8 1006 if ( i!=pDiffListBC->end() )
joachim99@8 1007 {
joachim99@8 1008 d=*i;
joachim99@8 1009 ++i;
joachim99@8 1010 }
joachim99@8 1011 else
joachim99@8 1012 break;
joachim99@8 1013 }
joachim99@8 1014
joachim99@8 1015 Diff3Line d3l;
joachim99@8 1016 if( d.nofEquals>0 )
joachim99@8 1017 {
joachim99@8 1018 // Find the corresponding lineB and lineC
joachim99@39 1019 while( i3b!=d3ll.end() && (*i3b).lineB!=lineB )
joachim99@8 1020 ++i3b;
joachim99@8 1021
joachim99@8 1022 while( i3c!=d3ll.end() && (*i3c).lineC!=lineC )
joachim99@8 1023 ++i3c;
joachim99@8 1024
joachim99@8 1025 assert(i3b!=d3ll.end());
joachim99@8 1026 assert(i3c!=d3ll.end());
joachim99@8 1027
joachim99@8 1028 if ( i3b==i3c )
joachim99@8 1029 {
joachim99@8 1030 assert( (*i3b).lineC == lineC );
joachim99@8 1031 (*i3b).bBEqC = true;
joachim99@8 1032 }
joachim99@69 1033 else
joachim99@8 1034 {
joachim99@8 1035 // Is it possible to move this line up?
joachim99@8 1036 // Test if no other B's are used between i3c and i3b
joachim99@8 1037
joachim99@8 1038 // First test which is before: i3c or i3b ?
joachim99@8 1039 Diff3LineList::iterator i3c1 = i3c;
joachim99@8 1040 Diff3LineList::iterator i3b1 = i3b;
joachim99@8 1041 while( i3c1!=i3b && i3b1!=i3c )
joachim99@8 1042 {
joachim99@8 1043 assert(i3b1!=d3ll.end() || i3c1!=d3ll.end());
joachim99@8 1044 if( i3c1!=d3ll.end() ) ++i3c1;
joachim99@8 1045 if( i3b1!=d3ll.end() ) ++i3b1;
joachim99@8 1046 }
joachim99@8 1047
joachim99@8 1048 if( i3c1==i3b && !(*i3b).bAEqB ) // i3c before i3b
joachim99@8 1049 {
joachim99@8 1050 Diff3LineList::iterator i3 = i3c;
joachim99@8 1051 int nofDisturbingLines = 0;
joachim99@8 1052 while( i3 != i3b && i3!=d3ll.end() )
joachim99@8 1053 {
joachim99@58 1054 if ( (*i3).lineB != -1 )
joachim99@8 1055 ++nofDisturbingLines;
joachim99@8 1056 ++i3;
joachim99@8 1057 }
joachim99@8 1058
joachim99@69 1059 if ( nofDisturbingLines>0 )//&& nofDisturbingLines < d.nofEquals*d.nofEquals+4 )
joachim99@8 1060 {
joachim99@8 1061 // Move the disturbing lines up, out of sight.
joachim99@8 1062 i3 = i3c;
joachim99@8 1063 while( i3 != i3b )
joachim99@8 1064 {
joachim99@58 1065 if ( (*i3).lineB != -1 )
joachim99@8 1066 {
joachim99@8 1067 Diff3Line d3l;
joachim99@8 1068 d3l.lineB = (*i3).lineB;
joachim99@8 1069 (*i3).lineB = -1;
joachim99@8 1070 (*i3).bAEqB = false;
joachim99@8 1071 (*i3).bBEqC = false;
joachim99@8 1072 d3ll.insert( i3c, d3l );
joachim99@8 1073 }
joachim99@8 1074 ++i3;
joachim99@8 1075 }
joachim99@8 1076 nofDisturbingLines=0;
joachim99@8 1077 }
joachim99@8 1078
joachim99@8 1079 if ( nofDisturbingLines == 0 )
joachim99@8 1080 {
joachim99@8 1081 // Yes, the line from B can be moved.
joachim99@8 1082 (*i3b).lineB = -1; // This might leave an empty line: removed later.
joachim99@8 1083 (*i3b).bAEqB = false;
joachim99@8 1084 (*i3b).bAEqC = false;
joachim99@8 1085 (*i3b).bBEqC = false;
joachim99@8 1086 (*i3c).lineB = lineB;
joachim99@8 1087 (*i3c).bBEqC = true;
joachim99@8 1088 }
joachim99@8 1089 }
joachim99@69 1090 else if( i3b1==i3c && !(*i3c).bAEqC)
joachim99@8 1091 {
joachim99@8 1092 Diff3LineList::iterator i3 = i3b;
joachim99@8 1093 int nofDisturbingLines = 0;
joachim99@8 1094 while( i3 != i3c && i3!=d3ll.end() )
joachim99@8 1095 {
joachim99@58 1096 if ( (*i3).lineC != -1 )
joachim99@8 1097 ++nofDisturbingLines;
joachim99@8 1098 ++i3;
joachim99@8 1099 }
joachim99@8 1100
joachim99@69 1101 if ( nofDisturbingLines>0 )//&& nofDisturbingLines < d.nofEquals*d.nofEquals+4 )
joachim99@8 1102 {
joachim99@69 1103 // Move the disturbing lines up.
joachim99@8 1104 i3 = i3b;
joachim99@8 1105 while( i3 != i3c )
joachim99@8 1106 {
joachim99@58 1107 if ( (*i3).lineC != -1 )
joachim99@8 1108 {
joachim99@8 1109 Diff3Line d3l;
joachim99@8 1110 d3l.lineC = (*i3).lineC;
joachim99@8 1111 (*i3).lineC = -1;
joachim99@8 1112 (*i3).bAEqC = false;
joachim99@8 1113 (*i3).bBEqC = false;
joachim99@8 1114 d3ll.insert( i3b, d3l );
joachim99@8 1115 }
joachim99@8 1116 ++i3;
joachim99@8 1117 }
joachim99@8 1118 nofDisturbingLines=0;
joachim99@8 1119 }
joachim99@8 1120
joachim99@8 1121 if ( nofDisturbingLines == 0 )
joachim99@8 1122 {
joachim99@8 1123 // Yes, the line from C can be moved.
joachim99@8 1124 (*i3c).lineC = -1; // This might leave an empty line: removed later.
joachim99@8 1125 (*i3c).bAEqC = false;
joachim99@8 1126 (*i3c).bBEqC = false;
joachim99@8 1127 (*i3b).lineC = lineC;
joachim99@8 1128 (*i3b).bBEqC = true;
joachim99@8 1129 }
joachim99@8 1130 }
joachim99@8 1131 }
joachim99@58 1132
joachim99@8 1133 --d.nofEquals;
joachim99@8 1134 ++lineB;
joachim99@8 1135 ++lineC;
joachim99@8 1136 ++i3b;
joachim99@8 1137 ++i3c;
joachim99@8 1138 }
joachim99@8 1139 else if ( d.diff1>0 )
joachim99@8 1140 {
joachim99@8 1141 Diff3LineList::iterator i3 = i3b;
joachim99@39 1142 while( (*i3).lineB!=lineB )
joachim99@8 1143 ++i3;
joachim99@8 1144 if( i3 != i3b && (*i3).bAEqB==false )
joachim99@8 1145 {
joachim99@69 1146 // Take B from this line and move it up as far as possible
joachim99@8 1147 d3l.lineB = lineB;
joachim99@8 1148 d3ll.insert( i3b, d3l );
joachim99@8 1149 (*i3).lineB = -1;
joachim99@8 1150 }
joachim99@8 1151 else
joachim99@8 1152 {
joachim99@8 1153 i3b=i3;
joachim99@8 1154 }
joachim99@8 1155 --d.diff1;
joachim99@8 1156 ++lineB;
joachim99@8 1157 ++i3b;
joachim99@8 1158
joachim99@8 1159 if( d.diff2>0 )
joachim99@8 1160 {
joachim99@8 1161 --d.diff2;
joachim99@8 1162 ++lineC;
joachim99@8 1163 }
joachim99@8 1164 }
joachim99@8 1165 else if ( d.diff2>0 )
joachim99@8 1166 {
joachim99@8 1167 --d.diff2;
joachim99@8 1168 ++lineC;
joachim99@8 1169 }
joachim99@8 1170 }
joachim99@8 1171 /*
joachim99@8 1172 Diff3LineList::iterator it = d3ll.begin();
joachim99@8 1173 int li=0;
joachim99@8 1174 for( ; it!=d3ll.end(); ++it, ++li )
joachim99@8 1175 {
joachim99@58 1176 printf( "%4d %4d %4d %4d A%c=B A%c=C B%c=C\n",
joachim99@58 1177 li, (*it).lineA, (*it).lineB, (*it).lineC,
joachim99@8 1178 (*it).bAEqB ? '=' : '!', (*it).bAEqC ? '=' : '!', (*it).bBEqC ? '=' : '!' );
joachim99@8 1179 }
joachim99@8 1180 printf("\n");*/
joachim99@8 1181 }
joachim99@8 1182
joachim99@8 1183 #ifdef _WIN32
joachim99@8 1184 using ::equal;
joachim99@8 1185 #endif
joachim99@8 1186
joachim99@69 1187 // Test if the move would pass a barrier. Return true if not.
joachim99@69 1188 static bool isValidMove( ManualDiffHelpList* pManualDiffHelpList, int line1, int line2, int winIdx1, int winIdx2 )
joachim99@69 1189 {
joachim99@69 1190 if (line1>=0 && line2>=0)
joachim99@69 1191 {
joachim99@69 1192 ManualDiffHelpList::const_iterator i;
joachim99@69 1193 for( i = pManualDiffHelpList->begin(); i!=pManualDiffHelpList->end(); ++i )
joachim99@69 1194 {
joachim99@69 1195 const ManualDiffHelpEntry& mdhe = *i;
joachim99@69 1196
joachim99@69 1197 // Barrier
joachim99@69 1198 int l1 = winIdx1 == 1 ? mdhe.lineA1 : winIdx1==2 ? mdhe.lineB1 : mdhe.lineC1 ;
joachim99@69 1199 int l2 = winIdx2 == 1 ? mdhe.lineA1 : winIdx2==2 ? mdhe.lineB1 : mdhe.lineC1 ;
joachim99@69 1200
joachim99@69 1201 if ( l1>=0 && l2>=0 )
joachim99@69 1202 {
joachim99@69 1203 if ( line1>=l1 && line2<l2 || line1<l1 && line2>=l2 )
joachim99@69 1204 return false;
joachim99@69 1205 l1 = winIdx1 == 1 ? mdhe.lineA2 : winIdx1==2 ? mdhe.lineB2 : mdhe.lineC2 ;
joachim99@69 1206 l2 = winIdx2 == 1 ? mdhe.lineA2 : winIdx2==2 ? mdhe.lineB2 : mdhe.lineC2 ;
joachim99@69 1207 ++l1;
joachim99@69 1208 ++l2;
joachim99@69 1209 if ( line1>=l1 && line2<l2 || line1<l1 && line2>=l2 )
joachim99@69 1210 return false;
joachim99@69 1211 }
joachim99@69 1212 }
joachim99@69 1213 }
joachim99@69 1214 return true; // no barrier passed.
joachim99@69 1215 }
joachim99@69 1216
joachim99@69 1217 void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManualDiffHelpList )
joachim99@69 1218 {
joachim99@69 1219 if ( pManualDiffHelpList->empty() )
joachim99@69 1220 return;
joachim99@69 1221
joachim99@69 1222 // If a line appears unaligned in comparison to the manual alignment, correct this.
joachim99@69 1223
joachim99@69 1224 ManualDiffHelpList::iterator iMDHL;
joachim99@69 1225 for( iMDHL = pManualDiffHelpList->begin(); iMDHL != pManualDiffHelpList->end(); ++iMDHL )
joachim99@69 1226 {
joachim99@69 1227 Diff3LineList::iterator i3 = d3ll.begin();
joachim99@69 1228 int winIdxPreferred = 0;
joachim99@69 1229 int missingWinIdx = 0;
joachim99@69 1230 int alignedSum = (iMDHL->lineA1<0?0:1) + (iMDHL->lineB1<0?0:1) + (iMDHL->lineC1<0?0:1);
joachim99@69 1231 if (alignedSum==2)
joachim99@69 1232 {
joachim99@69 1233 // If only A & B are aligned then let C rather be aligned with A
joachim99@69 1234 // If only A & C are aligned then let B rather be aligned with A
joachim99@69 1235 // If only B & C are aligned then let A rather be aligned with B
joachim99@69 1236 missingWinIdx = iMDHL->lineA1<0 ? 1 : (iMDHL->lineB1<0 ? 2 : 3 );
joachim99@69 1237 winIdxPreferred = missingWinIdx == 1 ? 2 : 1;
joachim99@69 1238 }
joachim99@69 1239 else if (alignedSum<=1)
joachim99@69 1240 {
joachim99@69 1241 return;
joachim99@69 1242 }
joachim99@69 1243
joachim99@69 1244 // At the first aligned line, move up the two other lines into new d3ls until the second input is aligned
joachim99@69 1245 // Then move up the third input until all three lines are aligned.
joachim99@69 1246 int wi=0;
joachim99@69 1247 for( ; i3!=d3ll.end(); ++i3 )
joachim99@69 1248 {
joachim99@69 1249 for ( wi=1; wi<=3; ++wi )
joachim99@69 1250 {
joachim99@69 1251 if ( i3->getLineInFile(wi) >= 0 && iMDHL->firstLine(wi) == i3->getLineInFile(wi) )
joachim99@69 1252 break;
joachim99@69 1253 }
joachim99@69 1254 if ( wi<=3 )
joachim99@69 1255 break;
joachim99@69 1256 }
joachim99@69 1257
joachim99@69 1258 if (wi>=1 && wi <= 3)
joachim99@69 1259 {
joachim99@69 1260 // Found manual alignment for one source
joachim99@69 1261 Diff3LineList::iterator iDest = i3;
joachim99@69 1262
joachim99@69 1263 // Move lines up until the next firstLine is found. Omit wi from move and search.
joachim99@69 1264 int wi2=0;
joachim99@69 1265 for( ; i3!=d3ll.end(); ++i3 )
joachim99@69 1266 {
joachim99@69 1267 for ( wi2=1; wi2<=3; ++wi2 )
joachim99@69 1268 {
joachim99@69 1269 if ( wi!=wi2 && i3->getLineInFile(wi2) >= 0 && iMDHL->firstLine(wi2) == i3->getLineInFile(wi2) )
joachim99@69 1270 break;
joachim99@69 1271 }
joachim99@69 1272 if (wi2>3)
joachim99@69 1273 { // Not yet found
joachim99@69 1274 // Move both others up
joachim99@69 1275 Diff3Line d3l;
joachim99@69 1276 // Move both up
joachim99@69 1277 if (wi==1) // Move B and C up
joachim99@69 1278 {
joachim99@69 1279 d3l.bBEqC = i3->bBEqC;
joachim99@69 1280 d3l.lineB = i3->lineB;
joachim99@69 1281 d3l.lineC = i3->lineC;
joachim99@69 1282 i3->lineB = -1;
joachim99@69 1283 i3->lineC = -1;
joachim99@69 1284 }
joachim99@69 1285 if (wi==2) // Move A and C up
joachim99@69 1286 {
joachim99@69 1287 d3l.bAEqC = i3->bAEqC;
joachim99@69 1288 d3l.lineA = i3->lineA;
joachim99@69 1289 d3l.lineC = i3->lineC;
joachim99@69 1290 i3->lineA = -1;
joachim99@69 1291 i3->lineC = -1;
joachim99@69 1292 }
joachim99@69 1293 if (wi==3) // Move A and B up
joachim99@69 1294 {
joachim99@69 1295 d3l.bAEqB = i3->bAEqB;
joachim99@69 1296 d3l.lineA = i3->lineA;
joachim99@69 1297 d3l.lineB = i3->lineB;
joachim99@69 1298 i3->lineA = -1;
joachim99@69 1299 i3->lineB = -1;
joachim99@69 1300 }
joachim99@69 1301 i3->bAEqB = false;
joachim99@69 1302 i3->bAEqC = false;
joachim99@69 1303 i3->bBEqC = false;
joachim99@69 1304 d3ll.insert( iDest, d3l );
joachim99@69 1305 }
joachim99@69 1306 else
joachim99@69 1307 {
joachim99@69 1308 // align the found line with the line we already have here
joachim99@69 1309 if ( i3 != iDest )
joachim99@69 1310 {
joachim99@69 1311 if (wi2==1)
joachim99@69 1312 {
joachim99@69 1313 iDest->lineA = i3->lineA;
joachim99@69 1314 i3->lineA = -1;
joachim99@69 1315 i3->bAEqB = false;
joachim99@69 1316 i3->bAEqC = false;
joachim99@69 1317 }
joachim99@69 1318 else if (wi2==2)
joachim99@69 1319 {
joachim99@69 1320 iDest->lineB = i3->lineB;
joachim99@69 1321 i3->lineB = -1;
joachim99@69 1322 i3->bAEqB = false;
joachim99@69 1323 i3->bBEqC = false;
joachim99@69 1324 }
joachim99@69 1325 else if (wi2==3)
joachim99@69 1326 {
joachim99@69 1327 iDest->lineC = i3->lineC;
joachim99@69 1328 i3->lineC = -1;
joachim99@69 1329 i3->bBEqC = false;
joachim99@69 1330 i3->bAEqC = false;
joachim99@69 1331 }
joachim99@69 1332 }
joachim99@69 1333
joachim99@69 1334 if ( missingWinIdx!=0 )
joachim99@69 1335 {
joachim99@69 1336 for( ; i3!=d3ll.end(); ++i3 )
joachim99@69 1337 {
joachim99@69 1338 int wi3 = missingWinIdx;
joachim99@69 1339 if ( i3->getLineInFile(wi3) >= 0 )
joachim99@69 1340 {
joachim99@73 1341 // not found, move the line before iDest
joachim99@73 1342 Diff3Line d3l;
joachim99@73 1343 if ( wi3==1 )
joachim99@69 1344 {
joachim99@73 1345 if (i3->bAEqB) // Stop moving lines up if one equal is found.
joachim99@73 1346 break;
joachim99@73 1347 d3l.lineA = i3->lineA;
joachim99@73 1348 i3->lineA = -1;
joachim99@73 1349 i3->bAEqB = false;
joachim99@73 1350 i3->bAEqC = false;
joachim99@69 1351 }
joachim99@73 1352 if ( wi3==2 )
joachim99@69 1353 {
joachim99@73 1354 if (i3->bAEqB)
joachim99@73 1355 break;
joachim99@73 1356 d3l.lineB = i3->lineB;
joachim99@73 1357 i3->lineB = -1;
joachim99@73 1358 i3->bAEqB = false;
joachim99@73 1359 i3->bBEqC = false;
joachim99@69 1360 }
joachim99@73 1361 if ( wi3==3 )
joachim99@73 1362 {
joachim99@73 1363 if (i3->bAEqC)
joachim99@73 1364 break;
joachim99@73 1365 d3l.lineC = i3->lineC;
joachim99@73 1366 i3->lineC = -1;
joachim99@73 1367 i3->bAEqC = false;
joachim99@73 1368 i3->bBEqC = false;
joachim99@73 1369 }
joachim99@73 1370 d3ll.insert( iDest, d3l );
joachim99@69 1371 }
joachim99@69 1372 } // for(), searching for wi3
joachim99@69 1373 }
joachim99@69 1374 break;
joachim99@69 1375 }
joachim99@69 1376 } // for(), searching for wi2
joachim99@69 1377 } // if, wi found
joachim99@69 1378 } // for (iMDHL)
joachim99@69 1379 }
joachim99@69 1380
joachim99@8 1381 // Fourth step
joachim99@58 1382 void calcDiff3LineListTrim(
joachim99@69 1383 Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC, ManualDiffHelpList* pManualDiffHelpList
joachim99@8 1384 )
joachim99@8 1385 {
joachim99@8 1386 const Diff3Line d3l_empty;
joachim99@8 1387 d3ll.remove( d3l_empty );
joachim99@8 1388
joachim99@8 1389 Diff3LineList::iterator i3 = d3ll.begin();
joachim99@8 1390 Diff3LineList::iterator i3A = d3ll.begin();
joachim99@8 1391 Diff3LineList::iterator i3B = d3ll.begin();
joachim99@8 1392 Diff3LineList::iterator i3C = d3ll.begin();
joachim99@8 1393
joachim99@69 1394 int line=0; // diff3line counters
joachim99@69 1395 int lineA=0; //
joachim99@8 1396 int lineB=0;
joachim99@8 1397 int lineC=0;
joachim99@8 1398
joachim99@69 1399 ManualDiffHelpList::iterator iMDHL = pManualDiffHelpList->begin();
joachim99@8 1400 // The iterator i3 and the variable line look ahead.
joachim99@8 1401 // The iterators i3A, i3B, i3C and corresponding lineA, lineB and lineC stop at empty lines, if found.
joachim99@8 1402 // If possible, then the texts from the look ahead will be moved back to the empty places.
joachim99@8 1403
joachim99@8 1404 for( ; i3!=d3ll.end(); ++i3, ++line )
joachim99@8 1405 {
joachim99@69 1406 if ( iMDHL!=pManualDiffHelpList->end() )
joachim99@69 1407 {
joachim99@69 1408 if ( i3->lineA >= 0 && i3->lineA==iMDHL->lineA1 ||
joachim99@69 1409 i3->lineB >= 0 && i3->lineB==iMDHL->lineB1 ||
joachim99@69 1410 i3->lineC >= 0 && i3->lineC==iMDHL->lineC1 )
joachim99@69 1411 {
joachim99@69 1412 i3A = i3;
joachim99@69 1413 i3B = i3;
joachim99@69 1414 i3C = i3;
joachim99@69 1415 lineA = line;
joachim99@69 1416 lineB = line;
joachim99@69 1417 lineC = line;
joachim99@69 1418 ++iMDHL;
joachim99@69 1419 }
joachim99@69 1420 }
joachim99@69 1421
joachim99@8 1422 if( line>lineA && (*i3).lineA != -1 && (*i3A).lineB!=-1 && (*i3A).bBEqC &&
joachim99@69 1423 ::equal( pldA[(*i3).lineA], pldB[(*i3A).lineB], false ) &&
joachim99@69 1424 isValidMove( pManualDiffHelpList, (*i3).lineA, (*i3A).lineB, 1, 2 ) &&
joachim99@69 1425 isValidMove( pManualDiffHelpList, (*i3).lineA, (*i3A).lineC, 1, 3 ) )
joachim99@8 1426 {
joachim99@8 1427 // Empty space for A. A matches B and C in the empty line. Move it up.
joachim99@8 1428 (*i3A).lineA = (*i3).lineA;
joachim99@8 1429 (*i3A).bAEqB = true;
joachim99@8 1430 (*i3A).bAEqC = true;
joachim99@8 1431 (*i3).lineA = -1;
joachim99@8 1432 (*i3).bAEqB = false;
joachim99@8 1433 (*i3).bAEqC = false;
joachim99@8 1434 ++i3A;
joachim99@8 1435 ++lineA;
joachim99@8 1436 }
joachim99@8 1437
joachim99@8 1438 if( line>lineB && (*i3).lineB != -1 && (*i3B).lineA!=-1 && (*i3B).bAEqC &&
joachim99@69 1439 ::equal( pldB[(*i3).lineB], pldA[(*i3B).lineA], false ) &&
joachim99@69 1440 isValidMove( pManualDiffHelpList, (*i3).lineB, (*i3B).lineA, 2, 1 ) &&
joachim99@69 1441 isValidMove( pManualDiffHelpList, (*i3).lineB, (*i3B).lineC, 2, 3 ) )
joachim99@8 1442 {
joachim99@8 1443 // Empty space for B. B matches A and C in the empty line. Move it up.
joachim99@8 1444 (*i3B).lineB = (*i3).lineB;
joachim99@8 1445 (*i3B).bAEqB = true;
joachim99@8 1446 (*i3B).bBEqC = true;
joachim99@8 1447 (*i3).lineB = -1;
joachim99@8 1448 (*i3).bAEqB = false;
joachim99@8 1449 (*i3).bBEqC = false;
joachim99@8 1450 ++i3B;
joachim99@8 1451 ++lineB;
joachim99@8 1452 }
joachim99@8 1453
joachim99@8 1454 if( line>lineC && (*i3).lineC != -1 && (*i3C).lineA!=-1 && (*i3C).bAEqB &&
joachim99@69 1455 ::equal( pldC[(*i3).lineC], pldA[(*i3C).lineA], false )&&
joachim99@69 1456 isValidMove( pManualDiffHelpList, (*i3).lineC, (*i3C).lineA, 3, 1 ) &&
joachim99@69 1457 isValidMove( pManualDiffHelpList, (*i3).lineC, (*i3C).lineB, 3, 2 ) )
joachim99@8 1458 {
joachim99@8 1459 // Empty space for C. C matches A and B in the empty line. Move it up.
joachim99@8 1460 (*i3C).lineC = (*i3).lineC;
joachim99@8 1461 (*i3C).bAEqC = true;
joachim99@8 1462 (*i3C).bBEqC = true;
joachim99@8 1463 (*i3).lineC = -1;
joachim99@8 1464 (*i3).bAEqC = false;
joachim99@8 1465 (*i3).bBEqC = false;
joachim99@8 1466 ++i3C;
joachim99@8 1467 ++lineC;
joachim99@8 1468 }
joachim99@8 1469
joachim99@69 1470 if( line>lineA && (*i3).lineA != -1 && !(*i3).bAEqB && !(*i3).bAEqC &&
joachim99@69 1471 isValidMove( pManualDiffHelpList, (*i3).lineA, (*i3A).lineB, 1, 2 ) &&
joachim99@69 1472 isValidMove( pManualDiffHelpList, (*i3).lineA, (*i3A).lineC, 1, 3 ) ) {
joachim99@8 1473 // Empty space for A. A doesn't match B or C. Move it up.
joachim99@8 1474 (*i3A).lineA = (*i3).lineA;
joachim99@8 1475 (*i3).lineA = -1;
joachim99@8 1476 ++i3A;
joachim99@8 1477 ++lineA;
joachim99@8 1478 }
joachim99@8 1479
joachim99@69 1480 if( line>lineB && (*i3).lineB != -1 && !(*i3).bAEqB && !(*i3).bBEqC &&
joachim99@69 1481 isValidMove( pManualDiffHelpList, (*i3).lineB, (*i3B).lineA, 2, 1 ) &&
joachim99@69 1482 isValidMove( pManualDiffHelpList, (*i3).lineB, (*i3B).lineC, 2, 3 ) )
joachim99@8 1483 {
joachim99@8 1484 // Empty space for B. B matches neither A nor C. Move B up.
joachim99@8 1485 (*i3B).lineB = (*i3).lineB;
joachim99@8 1486 (*i3).lineB = -1;
joachim99@8 1487 ++i3B;
joachim99@8 1488 ++lineB;
joachim99@8 1489 }
joachim99@8 1490
joachim99@69 1491 if( line>lineC && (*i3).lineC != -1 && !(*i3).bAEqC && !(*i3).bBEqC &&
joachim99@69 1492 isValidMove( pManualDiffHelpList, (*i3).lineC, (*i3C).lineA, 3, 1 ) &&
joachim99@69 1493 isValidMove( pManualDiffHelpList, (*i3).lineC, (*i3C).lineB, 3, 2 ) )
joachim99@8 1494 {
joachim99@8 1495 // Empty space for C. C matches neither A nor B. Move C up.
joachim99@8 1496 (*i3C).lineC = (*i3).lineC;
joachim99@8 1497 (*i3).lineC = -1;
joachim99@8 1498 ++i3C;
joachim99@8 1499 ++lineC;
joachim99@8 1500 }
joachim99@8 1501
joachim99@8 1502 if( line>lineA && line>lineB && (*i3).lineA != -1 && (*i3).bAEqB && !(*i3).bAEqC )
joachim99@8 1503 {
joachim99@8 1504 // Empty space for A and B. A matches B, but not C. Move A & B up.
joachim99@8 1505 Diff3LineList::iterator i = lineA > lineB ? i3A : i3B;
joachim99@8 1506 int l = lineA > lineB ? lineA : lineB;
joachim99@8 1507
joachim99@69 1508 if ( isValidMove( pManualDiffHelpList, i->lineC, (*i3).lineA, 3, 1 ) &&
joachim99@69 1509 isValidMove( pManualDiffHelpList, i->lineC, (*i3).lineB, 3, 2 ) )
joachim99@69 1510 {
joachim99@69 1511 (*i).lineA = (*i3).lineA;
joachim99@69 1512 (*i).lineB = (*i3).lineB;
joachim99@69 1513 (*i).bAEqB = true;
joachim99@58 1514
joachim99@69 1515 (*i3).lineA = -1;
joachim99@69 1516 (*i3).lineB = -1;
joachim99@69 1517 (*i3).bAEqB = false;
joachim99@69 1518 i3A = i;
joachim99@69 1519 i3B = i;
joachim99@69 1520 ++i3A;
joachim99@69 1521 ++i3B;
joachim99@69 1522 lineA=l+1;
joachim99@69 1523 lineB=l+1;
joachim99@69 1524 }
joachim99@8 1525 }
joachim99@8 1526 else if( line>lineA && line>lineC && (*i3).lineA != -1 && (*i3).bAEqC && !(*i3).bAEqB )
joachim99@8 1527 {
joachim99@8 1528 // Empty space for A and C. A matches C, but not B. Move A & C up.
joachim99@8 1529 Diff3LineList::iterator i = lineA > lineC ? i3A : i3C;
joachim99@8 1530 int l = lineA > lineC ? lineA : lineC;
joachim99@58 1531
joachim99@69 1532 if ( isValidMove( pManualDiffHelpList, i->lineB, (*i3).lineA, 2, 1 ) &&
joachim99@69 1533 isValidMove( pManualDiffHelpList, i->lineB, (*i3).lineC, 2, 3 ) )
joachim99@69 1534 {
joachim99@69 1535 (*i).lineA = (*i3).lineA;
joachim99@69 1536 (*i).lineC = (*i3).lineC;
joachim99@69 1537 (*i).bAEqC = true;
joachim99@69 1538
joachim99@69 1539 (*i3).lineA = -1;
joachim99@69 1540 (*i3).lineC = -1;
joachim99@69 1541 (*i3).bAEqC = false;
joachim99@69 1542 i3A = i;
joachim99@69 1543 i3C = i;
joachim99@69 1544 ++i3A;
joachim99@69 1545 ++i3C;
joachim99@69 1546 lineA=l+1;
joachim99@69 1547 lineC=l+1;
joachim99@69 1548 }
joachim99@8 1549 }
joachim99@8 1550 else if( line>lineB && line>lineC && (*i3).lineB != -1 && (*i3).bBEqC && !(*i3).bAEqC )
joachim99@8 1551 {
joachim99@8 1552 // Empty space for B and C. B matches C, but not A. Move B & C up.
joachim99@8 1553 Diff3LineList::iterator i = lineB > lineC ? i3B : i3C;
joachim99@8 1554 int l = lineB > lineC ? lineB : lineC;
joachim99@58 1555
joachim99@69 1556 if ( isValidMove( pManualDiffHelpList, i->lineA, (*i3).lineB, 1, 2 ) &&
joachim99@69 1557 isValidMove( pManualDiffHelpList, i->lineA, (*i3).lineC, 1, 3 ) )
joachim99@69 1558 {
joachim99@69 1559 (*i).lineB = (*i3).lineB;
joachim99@69 1560 (*i).lineC = (*i3).lineC;
joachim99@69 1561 (*i).bBEqC = true;
joachim99@69 1562
joachim99@69 1563 (*i3).lineB = -1;
joachim99@69 1564 (*i3).lineC = -1;
joachim99@69 1565 (*i3).bBEqC = false;
joachim99@69 1566 i3B = i;
joachim99@69 1567 i3C = i;
joachim99@69 1568 ++i3B;
joachim99@69 1569 ++i3C;
joachim99@69 1570 lineB=l+1;
joachim99@69 1571 lineC=l+1;
joachim99@69 1572 }
joachim99@8 1573 }
joachim99@8 1574
joachim99@8 1575 if ( (*i3).lineA != -1 )
joachim99@8 1576 {
joachim99@8 1577 lineA = line+1;
joachim99@8 1578 i3A = i3;
joachim99@8 1579 ++i3A;
joachim99@8 1580 }
joachim99@8 1581 if ( (*i3).lineB != -1 )
joachim99@8 1582 {
joachim99@8 1583 lineB = line+1;
joachim99@8 1584 i3B = i3;
joachim99@8 1585 ++i3B;
joachim99@8 1586 }
joachim99@8 1587 if ( (*i3).lineC != -1 )
joachim99@8 1588 {
joachim99@8 1589 lineC = line+1;
joachim99@8 1590 i3C = i3;
joachim99@8 1591 ++i3C;
joachim99@8 1592 }
joachim99@8 1593 }
joachim99@8 1594
joachim99@8 1595 d3ll.remove( d3l_empty );
joachim99@8 1596
joachim99@8 1597 /*
joachim99@8 1598
joachim99@8 1599 Diff3LineList::iterator it = d3ll.begin();
joachim99@8 1600 int li=0;
joachim99@8 1601 for( ; it!=d3ll.end(); ++it, ++li )
joachim99@8 1602 {
joachim99@58 1603 printf( "%4d %4d %4d %4d A%c=B A%c=C B%c=C\n",
joachim99@58 1604 li, (*it).lineA, (*it).lineB, (*it).lineC,
joachim99@8 1605 (*it).bAEqB ? '=' : '!', (*it).bAEqC ? '=' : '!', (*it).bBEqC ? '=' : '!' );
joachim99@8 1606
joachim99@8 1607 }
joachim99@8 1608 */
joachim99@8 1609 }
joachim99@8 1610
joachim99@69 1611 void DiffBufferInfo::init( Diff3LineList* pD3ll, const Diff3LineVector* pD3lv,
joachim99@69 1612 const LineData* pldA, int sizeA, const LineData* pldB, int sizeB, const LineData* pldC, int sizeC )
joachim99@69 1613 {
joachim99@69 1614 m_pDiff3LineList = pD3ll;
joachim99@69 1615 m_pDiff3LineVector = pD3lv;
joachim99@69 1616 m_pLineDataA = pldA;
joachim99@69 1617 m_pLineDataB = pldB;
joachim99@69 1618 m_pLineDataC = pldC;
joachim99@69 1619 m_sizeA = sizeA;
joachim99@69 1620 m_sizeB = sizeB;
joachim99@69 1621 m_sizeC = sizeC;
joachim99@69 1622 Diff3LineList::iterator i3 = pD3ll->begin();
joachim99@69 1623 for( ; i3!=pD3ll->end(); ++i3 )
joachim99@69 1624 {
joachim99@69 1625 i3->m_pDiffBufferInfo = this;
joachim99@69 1626 }
joachim99@69 1627 }
joachim99@69 1628
joachim99@51 1629 void calcWhiteDiff3Lines(
joachim99@58 1630 Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC
joachim99@8 1631 )
joachim99@8 1632 {
joachim99@8 1633 Diff3LineList::iterator i3 = d3ll.begin();
joachim99@8 1634
joachim99@8 1635 for( ; i3!=d3ll.end(); ++i3 )
joachim99@8 1636 {
joachim99@69 1637 i3->bWhiteLineA = ( (*i3).lineA == -1 || pldA==0 || pldA[(*i3).lineA].whiteLine() || pldA[(*i3).lineA].bContainsPureComment );
joachim99@69 1638 i3->bWhiteLineB = ( (*i3).lineB == -1 || pldB==0 || pldB[(*i3).lineB].whiteLine() || pldB[(*i3).lineB].bContainsPureComment );
joachim99@69 1639 i3->bWhiteLineC = ( (*i3).lineC == -1 || pldC==0 || pldC[(*i3).lineC].whiteLine() || pldC[(*i3).lineC].bContainsPureComment );
joachim99@8 1640 }
joachim99@8 1641 }
joachim99@8 1642
joachim99@8 1643 // Just make sure that all input lines are in the output too, exactly once.
joachim99@8 1644 void debugLineCheck( Diff3LineList& d3ll, int size, int idx )
joachim99@8 1645 {
joachim99@8 1646 Diff3LineList::iterator it = d3ll.begin();
joachim99@8 1647 int i=0;
joachim99@8 1648
joachim99@8 1649 for ( it = d3ll.begin(); it!= d3ll.end(); ++it )
joachim99@8 1650 {
joachim99@53 1651 int l=0;
joachim99@8 1652 if (idx==1) l=(*it).lineA;
joachim99@8 1653 else if (idx==2) l=(*it).lineB;
joachim99@8 1654 else if (idx==3) l=(*it).lineC;
joachim99@8 1655 else assert(false);
joachim99@8 1656
joachim99@8 1657 if ( l!=-1 )
joachim99@8 1658 {
joachim99@8 1659 if( l!=i )
joachim99@8 1660 {
joachim99@8 1661 KMessageBox::error(0, i18n(
joachim99@8 1662 "Data loss error:\n"
joachim99@97 1663 "If it is reproducible please contact the author.\n"
joachim99@51 1664 ), i18n("Severe Internal Error") );
joachim99@8 1665 assert(false);
joachim99@8 1666 std::cerr << "Severe Internal Error.\n";
joachim99@8 1667 ::exit(-1);
joachim99@8 1668 }
joachim99@8 1669 ++i;
joachim99@8 1670 }
joachim99@8 1671 }
joachim99@8 1672
joachim99@8 1673 if( size!=i )
joachim99@8 1674 {
joachim99@8 1675 KMessageBox::error(0, i18n(
joachim99@8 1676 "Data loss error:\n"
joachim99@97 1677 "If it is reproducible please contact the author.\n"
joachim99@51 1678 ), i18n("Severe Internal Error") );
joachim99@8 1679 assert(false);
joachim99@8 1680 std::cerr << "Severe Internal Error.\n";
joachim99@8 1681 ::exit(-1);
joachim99@8 1682 }
joachim99@8 1683 }
joachim99@8 1684
joachim99@68 1685 inline bool equal( QChar c1, QChar c2, bool /*bStrict*/ )
joachim99@51 1686 {
joachim99@51 1687 // If bStrict then white space doesn't match
joachim99@51 1688
joachim99@51 1689 //if ( bStrict && ( c1==' ' || c1=='\t' ) )
joachim99@51 1690 // return false;
joachim99@51 1691
joachim99@51 1692 return c1==c2;
joachim99@51 1693 }
joachim99@51 1694
joachim99@51 1695
joachim99@51 1696 // My own diff-invention:
joachim99@51 1697 template <class T>
joachim99@51 1698 void calcDiff( const T* p1, int size1, const T* p2, int size2, DiffList& diffList, int match, int maxSearchRange )
joachim99@51 1699 {
joachim99@51 1700 diffList.clear();
joachim99@51 1701
joachim99@51 1702 const T* p1start = p1;
joachim99@51 1703 const T* p2start = p2;
joachim99@51 1704 const T* p1end=p1+size1;
joachim99@51 1705 const T* p2end=p2+size2;
joachim99@51 1706 for(;;)
joachim99@51 1707 {
joachim99@51 1708 int nofEquals = 0;
joachim99@51 1709 while( p1!=p1end && p2!=p2end && equal(*p1, *p2, false) )
joachim99@51 1710 {
joachim99@51 1711 ++p1;
joachim99@51 1712 ++p2;
joachim99@51 1713 ++nofEquals;
joachim99@51 1714 }
joachim99@51 1715
joachim99@51 1716 bool bBestValid=false;
joachim99@51 1717 int bestI1=0;
joachim99@51 1718 int bestI2=0;
joachim99@51 1719 int i1=0;
joachim99@51 1720 int i2=0;
joachim99@51 1721 for( i1=0; ; ++i1 )
joachim99@51 1722 {
joachim99@51 1723 if ( &p1[i1]==p1end || ( bBestValid && i1>= bestI1+bestI2))
joachim99@51 1724 {
joachim99@51 1725 break;
joachim99@51 1726 }
joachim99@51 1727 for(i2=0;i2<maxSearchRange;++i2)
joachim99@51 1728 {
joachim99@51 1729 if( &p2[i2]==p2end || ( bBestValid && i1+i2>=bestI1+bestI2) )
joachim99@51 1730 {
joachim99@51 1731 break;
joachim99@51 1732 }
joachim99@51 1733 else if( equal( p2[i2], p1[i1], true ) &&
joachim99@51 1734 ( match==1 || abs(i1-i2)<3 || ( &p2[i2+1]==p2end && &p1[i1+1]==p1end ) ||
joachim99@51 1735 ( &p2[i2+1]!=p2end && &p1[i1+1]!=p1end && equal( p2[i2+1], p1[i1+1], false ))
joachim99@51 1736 )
joachim99@51 1737 )
joachim99@51 1738 {
joachim99@51 1739 if ( i1+i2 < bestI1+bestI2 || bBestValid==false )
joachim99@51 1740 {
joachim99@51 1741 bestI1 = i1;
joachim99@51 1742 bestI2 = i2;
joachim99@51 1743 bBestValid = true;
joachim99@51 1744 break;
joachim99@51 1745 }
joachim99@51 1746 }
joachim99@51 1747 }
joachim99@51 1748 }
joachim99@51 1749
joachim99@51 1750 // The match was found using the strict search. Go back if there are non-strict
joachim99@51 1751 // matches.
joachim99@51 1752 while( bestI1>=1 && bestI2>=1 && equal( p1[bestI1-1], p2[bestI2-1], false ) )
joachim99@51 1753 {
joachim99@51 1754 --bestI1;
joachim99@51 1755 --bestI2;
joachim99@51 1756 }
joachim99@51 1757
joachim99@51 1758
joachim99@51 1759 bool bEndReached = false;
joachim99@51 1760 if (bBestValid)
joachim99@51 1761 {
joachim99@51 1762 // continue somehow
joachim99@51 1763 Diff d(nofEquals, bestI1, bestI2);
joachim99@51 1764 diffList.push_back( d );
joachim99@51 1765
joachim99@51 1766 p1 += bestI1;
joachim99@51 1767 p2 += bestI2;
joachim99@51 1768 }
joachim99@51 1769 else
joachim99@51 1770 {
joachim99@51 1771 // Nothing else to match.
joachim99@51 1772 Diff d(nofEquals, p1end-p1, p2end-p2);
joachim99@51 1773 diffList.push_back( d );
joachim99@51 1774
joachim99@51 1775 bEndReached = true; //break;
joachim99@51 1776 }
joachim99@51 1777
joachim99@51 1778 // Sometimes the algorithm that chooses the first match unfortunately chooses
joachim99@51 1779 // a match where later actually equal parts don't match anymore.
joachim99@51 1780 // A different match could be achieved, if we start at the end.
joachim99@51 1781 // Do it, if it would be a better match.
joachim99@51 1782 int nofUnmatched = 0;
joachim99@51 1783 const T* pu1 = p1-1;
joachim99@51 1784 const T* pu2 = p2-1;
joachim99@51 1785 while ( pu1>=p1start && pu2>=p2start && equal( *pu1, *pu2, false ) )
joachim99@51 1786 {
joachim99@51 1787 ++nofUnmatched;
joachim99@51 1788 --pu1;
joachim99@51 1789 --pu2;
joachim99@51 1790 }
joachim99@51 1791
joachim99@51 1792 Diff d = diffList.back();
joachim99@51 1793 if ( nofUnmatched > 0 )
joachim99@51 1794 {
joachim99@51 1795 // We want to go backwards the nofUnmatched elements and redo
joachim99@51 1796 // the matching
joachim99@51 1797 d = diffList.back();
joachim99@51 1798 Diff origBack = d;
joachim99@51 1799 diffList.pop_back();
joachim99@51 1800
joachim99@51 1801 while ( nofUnmatched > 0 )
joachim99@51 1802 {
joachim99@51 1803 if ( d.diff1 > 0 && d.diff2 > 0 )
joachim99@51 1804 {
joachim99@51 1805 --d.diff1;
joachim99@51 1806 --d.diff2;
joachim99@51 1807 --nofUnmatched;
joachim99@51 1808 }
joachim99@51 1809 else if ( d.nofEquals > 0 )
joachim99@51 1810 {
joachim99@51 1811 --d.nofEquals;
joachim99@51 1812 --nofUnmatched;
joachim99@51 1813 }
joachim99@51 1814
joachim99@51 1815 if ( d.nofEquals==0 && (d.diff1==0 || d.diff2==0) && nofUnmatched>0 )
joachim99@51 1816 {
joachim99@51 1817 if ( diffList.empty() )
joachim99@51 1818 break;
joachim99@51 1819 d.nofEquals += diffList.back().nofEquals;
joachim99@51 1820 d.diff1 += diffList.back().diff1;
joachim99@51 1821 d.diff2 += diffList.back().diff2;
joachim99@51 1822 diffList.pop_back();
joachim99@51 1823 bEndReached = false;
joachim99@51 1824 }
joachim99@51 1825 }
joachim99@51 1826
joachim99@51 1827 if ( bEndReached )
joachim99@51 1828 diffList.push_back( origBack );
joachim99@51 1829 else
joachim99@51 1830 {
joachim99@51 1831
joachim99@51 1832 p1 = pu1 + 1 + nofUnmatched;
joachim99@51 1833 p2 = pu2 + 1 + nofUnmatched;
joachim99@51 1834 diffList.push_back( d );
joachim99@51 1835 }
joachim99@51 1836 }
joachim99@51 1837 if ( bEndReached )
joachim99@51 1838 break;
joachim99@51 1839 }
joachim99@51 1840
joachim99@51 1841 #ifndef NDEBUG
joachim99@51 1842 // Verify difflist
joachim99@51 1843 {
joachim99@51 1844 int l1=0;
joachim99@51 1845 int l2=0;
joachim99@51 1846 DiffList::iterator i;
joachim99@51 1847 for( i = diffList.begin(); i!=diffList.end(); ++i )
joachim99@51 1848 {
joachim99@51 1849 l1+= i->nofEquals + i->diff1;
joachim99@51 1850 l2+= i->nofEquals + i->diff2;
joachim99@51 1851 }
joachim99@51 1852
joachim99@51 1853 //if( l1!=p1-p1start || l2!=p2-p2start )
joachim99@51 1854 if( l1!=size1 || l2!=size2 )
joachim99@51 1855 assert( false );
joachim99@51 1856 }
joachim99@51 1857 #endif
joachim99@51 1858 }
joachim99@8 1859
joachim99@8 1860 void fineDiff(
joachim99@8 1861 Diff3LineList& diff3LineList,
joachim99@8 1862 int selector,
joachim99@58 1863 const LineData* v1,
joachim99@58 1864 const LineData* v2,
joachim99@8 1865 bool& bTextsTotalEqual
joachim99@8 1866 )
joachim99@8 1867 {
joachim99@8 1868 // Finetuning: Diff each line with deltas
joachim99@66 1869 ProgressProxy pp;
joachim99@51 1870 int maxSearchLength=500;
joachim99@8 1871 Diff3LineList::iterator i;
joachim99@8 1872 int k1=0;
joachim99@8 1873 int k2=0;
joachim99@8 1874 bTextsTotalEqual = true;
joachim99@8 1875 int listSize = diff3LineList.size();
joachim99@8 1876 int listIdx = 0;
joachim99@8 1877 for( i= diff3LineList.begin(); i!= diff3LineList.end(); ++i)
joachim99@8 1878 {
joachim99@8 1879 if (selector==1){ k1=i->lineA; k2=i->lineB; }
joachim99@8 1880 else if (selector==2){ k1=i->lineB; k2=i->lineC; }
joachim99@8 1881 else if (selector==3){ k1=i->lineC; k2=i->lineA; }
joachim99@8 1882 else assert(false);
joachim99@8 1883 if( k1==-1 && k2!=-1 || k1!=-1 && k2==-1 ) bTextsTotalEqual=false;
joachim99@8 1884 if( k1!=-1 && k2!=-1 )
joachim99@8 1885 {
joachim99@68 1886 if ( v1[k1].size != v2[k2].size || memcmp( v1[k1].pLine, v2[k2].pLine, v1[k1].size<<1)!=0 )
joachim99@8 1887 {
joachim99@8 1888 bTextsTotalEqual = false;
joachim99@8 1889 DiffList* pDiffList = new DiffList;
joachim99@8 1890 calcDiff( v1[k1].pLine, v1[k1].size, v2[k2].pLine, v2[k2].size, *pDiffList, 2, maxSearchLength );
joachim99@8 1891
joachim99@8 1892 // Optimize the diff list.
joachim99@8 1893 DiffList::iterator dli;
joachim99@58 1894 bool bUsefulFineDiff = false;
joachim99@8 1895 for( dli = pDiffList->begin(); dli!=pDiffList->end(); ++dli)
joachim99@8 1896 {
joachim99@58 1897 if( dli->nofEquals >= 4 )
joachim99@58 1898 {
joachim99@58 1899 bUsefulFineDiff = true;
joachim99@58 1900 break;
joachim99@58 1901 }
joachim99@58 1902 }
joachim99@58 1903
joachim99@58 1904 for( dli = pDiffList->begin(); dli!=pDiffList->end(); ++dli)
joachim99@58 1905 {
joachim99@58 1906 if( dli->nofEquals < 4 && (dli->diff1>0 || dli->diff2>0)
joachim99@58 1907 && !( bUsefulFineDiff && dli==pDiffList->begin() )
joachim99@58 1908 )
joachim99@8 1909 {
joachim99@8 1910 dli->diff1 += dli->nofEquals;
joachim99@8 1911 dli->diff2 += dli->nofEquals;
joachim99@8 1912 dli->nofEquals = 0;
joachim99@8 1913 }
joachim99@8 1914 }
joachim99@8 1915
joachim99@8 1916 if (selector==1){ delete (*i).pFineAB; (*i).pFineAB = pDiffList; }
joachim99@8 1917 else if (selector==2){ delete (*i).pFineBC; (*i).pFineBC = pDiffList; }
joachim99@8 1918 else if (selector==3){ delete (*i).pFineCA; (*i).pFineCA = pDiffList; }
joachim99@8 1919 else assert(false);
joachim99@8 1920 }
joachim99@51 1921
joachim99@51 1922 if ( (v1[k1].bContainsPureComment || v1[k1].whiteLine()) && (v2[k2].bContainsPureComment || v2[k2].whiteLine()))
joachim99@51 1923 {
joachim99@51 1924 if (selector==1){ i->bAEqB = true; }
joachim99@51 1925 else if (selector==2){ i->bBEqC = true; }
joachim99@51 1926 else if (selector==3){ i->bAEqC = true; }
joachim99@51 1927 else assert(false);
joachim99@51 1928 }
joachim99@8 1929 }
joachim99@8 1930 ++listIdx;
joachim99@66 1931 pp.setCurrent(double(listIdx)/listSize);
joachim99@8 1932 }
joachim99@8 1933 }
joachim99@8 1934
joachim99@8 1935
joachim99@8 1936 // Convert the list to a vector of pointers
joachim99@66 1937 void calcDiff3LineVector( Diff3LineList& d3ll, Diff3LineVector& d3lv )
joachim99@8 1938 {
joachim99@8 1939 d3lv.resize( d3ll.size() );
joachim99@66 1940 Diff3LineList::iterator i;
joachim99@8 1941 int j=0;
joachim99@8 1942 for( i= d3ll.begin(); i!= d3ll.end(); ++i, ++j)
joachim99@8 1943 {
joachim99@8 1944 d3lv[j] = &(*i);
joachim99@8 1945 }
joachim99@58 1946 assert( j==(int)d3lv.size() );
joachim99@8 1947 }
joachim99@8 1948
joachim99@8 1949