Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\LexPython.cxx
Last modified2005-03-21 12:17:54.000 +0100
Size13.9 Kb (440 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\LexPython.cxx
Last modified2006-03-16 13:07:08.000 +0100
Size14.1 Kb (448 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged7437
Inserted510
Deleted00
Ignored00
Changed14



   Comparison Details  

108 skipped lines
109 109     }
110 110  
111 111     WordList &keywords = *keywordlists[0];
  112     WordList &keywords2 = *keywordlists[1];
112 113  
113 114     const int whingeLevel = styler.GetPropertyInt("tab.timmy.whinge.level");
114 115  
71 skipped lines
186 187         style = SCE_P_CLASSNAME;
187 188         } else if (kwLast == kwDef) {
188 189         style = SCE_P_DEFNAME;
  190         } else if (keywords2.InList(s)) {
  191         style = SCE_P_WORD2;
189 192         }
190 193         sc.ChangeState(style);
191 194         sc.SetState(SCE_P_DEFAULT);
6 skipped lines
198 201         kwLast = kwImport;
199 202         else
200 203         kwLast = kwOther;
201         } else if (style == SCE_P_CLASSNAME) { 204         } else {
202         kwLast = kwOther;  
203         } else if (style == SCE_P_DEFNAME) {  
204 205         kwLast = kwOther;
205 206         }
206 207         }
1 skipped line
208 209         if (sc.ch == '\r' || sc.ch == '\n') {
209 210         sc.SetState(SCE_P_DEFAULT);
210 211         }
  212         } else if (sc.state == SCE_P_DECORATOR) {
  213         if (sc.ch == '\r' || sc.ch == '\n') {
  214         sc.SetState(SCE_P_DEFAULT);
  215         }
211 216         } else if ((sc.state == SCE_P_STRING) || (sc.state == SCE_P_CHARACTER)) {
212 217         if (sc.ch == '\\') {
213 218         if ((sc.chNext == '\r') && (sc.GetRelative(2) == '\n')) {
48 skipped lines
262 267         sc.SetState(SCE_P_OPERATOR);
263 268         } else if (sc.ch == '#') {
264 269         sc.SetState(sc.chNext == '#' ? SCE_P_COMMENTBLOCK : SCE_P_COMMENTLINE);
  270         } else if (sc.ch == '@') {
  271         sc.SetState(SCE_P_DECORATOR);
265 272         } else if (IsPyStringStart(sc.ch, sc.chNext, sc.GetRelative(2))) {
266 273         unsigned int nextIndex = 0;
267 274         sc.SetState(GetPyStringState(styler, sc.currentPos, &nextIndex));
164 skipped lines
432 439  
433 440 static const char * const pythonWordListDesc[] = {
434 441     "Keywords",
  442     "Highlighted identifiers",
435 443     0
436 444 };
437 445  
3 skipped lines

   Text comparison Options  

Syntax colouring language used: C / C++
Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Added lineExample of added line
Removed lineExample of removed line
Ignored lineExample of ignored line

This report has been generated by Ellié Computing Merge on 2006-09-07 15:48:30.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.