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
107 107         if (lastState == SCE_CSS_DEFAULT)
108 108         sc.SetState(SCE_CSS_DIRECTIVE);
109 109         break;
  110         case '*':
  111         if (lastState == SCE_CSS_DEFAULT)
  112         sc.SetState(SCE_CSS_TAG);
  113         break;
  114         case '>':
9 skipped lines
  124         break;
  125         case ']':
  126         if (lastState == SCE_CSS_ATTRIBUTE)
  127         sc.SetState(SCE_CSS_TAG);
  128         break;
110 129         case '{':
111 130         if (lastState == SCE_CSS_DIRECTIVE)
112 131         sc.SetState(SCE_CSS_DEFAULT);
13 skipped lines
126 145         sc.SetState(SCE_CSS_VALUE);
127 146         break;
128 147         case '.':
129         if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT) 148         if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_DEFAULT ||
  149         lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
130 150         sc.SetState(SCE_CSS_CLASS);
131 151         break;
132 152         case '#':
133         if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT) 153         if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_DEFAULT ||
  154         lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
134 155         sc.SetState(SCE_CSS_ID);
135 156         break;
136 157         case ',':
71 skipped lines
208 229         } else if (sc.state == SCE_CSS_VALUE && (sc.ch == '\"' || sc.ch == '\'')) {
209 230         sc.SetState((sc.ch == '\"' ? SCE_CSS_DOUBLESTRING : SCE_CSS_SINGLESTRING));
210 231         } else if (IsCssOperator(static_cast<char>(sc.ch))
  232         && (sc.state != SCE_CSS_ATTRIBUTE || sc.ch == ']')
211 233         && (sc.state != SCE_CSS_VALUE || sc.ch == ';' || sc.ch == '}' || sc.ch == '!')
212 234         && (sc.state != SCE_CSS_DIRECTIVE || sc.ch == ';' || sc.ch == '{')
213 235         ) {
69 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:22.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.