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
109U109U    }
110U110U 
111U111U    WordList &keywords = *keywordlists[0];
  112A    WordList &keywords2 = *keywordlists[1];
112U113U 
113U114U    const int whingeLevel = styler.GetPropertyInt("tab.timmy.whinge.level");
114U115U 
71 skipped lines
186U187U        style = SCE_P_CLASSNAME;
187U188U        } else if (kwLast == kwDef) {
188U189U        style = SCE_P_DEFNAME;
  190A        } else if (keywords2.InList(s)) {
  191A        style = SCE_P_WORD2;
189U192U        }
190U193U        sc.ChangeState(style);
191U194U        sc.SetState(SCE_P_DEFAULT);
6 skipped lines
198U201U        kwLast = kwImport;
199U202U        else
200U203U        kwLast = kwOther;
201C        } else if (style == SCE_P_CLASSNAME) { 204C        } else {
202C        kwLast = kwOther;  
203C        } else if (style == SCE_P_DEFNAME) {  
204U205U        kwLast = kwOther;
205U206U        }
206U207U        }
1 skipped line
208U209U        if (sc.ch == '\r' || sc.ch == '\n') {
209U210U        sc.SetState(SCE_P_DEFAULT);
210U211U        }
  212A        } else if (sc.state == SCE_P_DECORATOR) {
  213A        if (sc.ch == '\r' || sc.ch == '\n') {
  214A        sc.SetState(SCE_P_DEFAULT);
  215A        }
211U216U        } else if ((sc.state == SCE_P_STRING) || (sc.state == SCE_P_CHARACTER)) {
212U217U        if (sc.ch == '\\') {
213U218U        if ((sc.chNext == '\r') && (sc.GetRelative(2) == '\n')) {
48 skipped lines
262U267U        sc.SetState(SCE_P_OPERATOR);
263U268U        } else if (sc.ch == '#') {
264U269U        sc.SetState(sc.chNext == '#' ? SCE_P_COMMENTBLOCK : SCE_P_COMMENTLINE);
  270A        } else if (sc.ch == '@') {
  271A        sc.SetState(SCE_P_DECORATOR);
265U272U        } else if (IsPyStringStart(sc.ch, sc.chNext, sc.GetRelative(2))) {
266U273U        unsigned int nextIndex = 0;
267U274U        sc.SetState(GetPyStringState(styler, sc.currentPos, &nextIndex));
164 skipped lines
432U439U 
433U440Ustatic const char * const pythonWordListDesc[] = {
434U441U    "Keywords",
  442A    "Highlighted identifiers",
435U443U    0
436U444U};
437U445U 
3 skipped lines

   Text comparison Options  

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  

UExample of unchanged line
CExample of modified line
AExample of added line
RExample of removed line
IExample of ignored line
Modified text
Added text
Removed text

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