Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\LexCSS.cxx
Last modified2005-03-21 12:17:54.000 +0100
Size8.4 Kb (282 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\LexCSS.cxx
Last modified2006-03-16 13:07:08.000 +0100
Size9.5 Kb (304 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged5280
Inserted220
Deleted00
Ignored00
Changed26



   Comparison Details  

106 skipped lines
107U107U        if (lastState == SCE_CSS_DEFAULT)
108U108U        sc.SetState(SCE_CSS_DIRECTIVE);
109U109U        break;
  110A        case '*':
  111A        if (lastState == SCE_CSS_DEFAULT)
  112A        sc.SetState(SCE_CSS_TAG);
  113A        break;
  114A        case '>':
9 skipped lines
  124A        break;
  125A        case ']':
  126A        if (lastState == SCE_CSS_ATTRIBUTE)
  127A        sc.SetState(SCE_CSS_TAG);
  128A        break;
110U129U        case '{':
111U130U        if (lastState == SCE_CSS_DIRECTIVE)
112U131U        sc.SetState(SCE_CSS_DEFAULT);
13 skipped lines
126U145U        sc.SetState(SCE_CSS_VALUE);
127U146U        break;
128U147U        case '.':
129C        if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT) 148C        if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_DEFAULT ||
  149C        lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
130U150U        sc.SetState(SCE_CSS_CLASS);
131U151U        break;
132U152U        case '#':
133C        if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT) 153C        if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_DEFAULT ||
  154C        lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
134U155U        sc.SetState(SCE_CSS_ID);
135U156U        break;
136U157U        case ',':
71 skipped lines
208U229U        } else if (sc.state == SCE_CSS_VALUE && (sc.ch == '\"' || sc.ch == '\'')) {
209U230U        sc.SetState((sc.ch == '\"' ? SCE_CSS_DOUBLESTRING : SCE_CSS_SINGLESTRING));
210U231U        } else if (IsCssOperator(static_cast<char>(sc.ch))
  232A        && (sc.state != SCE_CSS_ATTRIBUTE || sc.ch == ']')
211U233U        && (sc.state != SCE_CSS_VALUE || sc.ch == ';' || sc.ch == '}' || sc.ch == '!')
212U234U        && (sc.state != SCE_CSS_DIRECTIVE || sc.ch == ';' || sc.ch == '{')
213U235U        ) {
69 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:36.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.