Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\KeyWords.cxx
Last modified2005-03-21 12:17:52.000 +0100
Size4.7 Kb (200 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\KeyWords.cxx
Last modified2006-03-16 13:07:06.001 +0100
Size5 Kb (219 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged31181
Inserted2128
Deleted411
Ignored00
Changed518



   Comparison Details  

21 skipped lines
22U22Uconst LexerModule *LexerModule::base = 0;
23U23Uint LexerModule::nextLanguage = SCLEX_AUTOMATIC+1;
24U24U 
25CLexerModule::LexerModule(int language_, LexerFunction fnLexer_, 25CLexerModule::LexerModule(int language_,
  26C    LexerFunction fnLexer_,
  27C    const char *languageName_,
26C    const char *languageName_, LexerFunction fnFolder_, 28C    LexerFunction fnFolder_,
27C    const char * const wordListDescriptions_[]) : 29C    const char * const wordListDescriptions_[],
  30C    int styleBits_) :
28U31U    language(language_),
29U32U    fnLexer(fnLexer_),
30U33U    fnFolder(fnFolder_),
31U34U    wordListDescriptions(wordListDescriptions_),
  35A    styleBits(styleBits_),
32U36U    languageName(languageName_) {
33U37U    next = base;
34U38U    base = this;
17 skipped lines
52U56U    }
53U57U}
54U58U 
55Cconst char * LexerModule::GetWordListDescription(int index) const { 59Cconst char *LexerModule::GetWordListDescription(int index) const {
56U60U    static const char *emptyStr = "";
57U61U 
58U62U    PLATFORM_ASSERT(index < GetNumWordLists());
4 skipped lines
63U67U     }
64U68U}
65U69U 
  70Aint LexerModule::GetStyleBitsNeeded() const {
  71A    return styleBits;
  72A}
  73A 
66U74Uconst LexerModule *LexerModule::Find(int language) {
67U75U    const LexerModule *lm = base;
68U76U    while (lm) {
61 skipped lines
130U138U//++Autogenerated -- run src/LexGen.py to regenerate
131U139U//**\(\tLINK_LEXER(\*);\n\)
132U140U    LINK_LEXER(lmAda);
  141A    LINK_LEXER(lmAns1);
133U142U    LINK_LEXER(lmAPDL);
134U143U    LINK_LEXER(lmAsm);
135C    LINK_LEXER(lmAsn1); 144C    LINK_LEXER(lmASP);
136U145U    LINK_LEXER(lmAU3);
137U146U    LINK_LEXER(lmAVE);
138U147U    LINK_LEXER(lmBaan);
139U148U    LINK_LEXER(lmBash);
  149A    LINK_LEXER(lmBatch);
  150A    LINK_LEXER(lmBlitzBasic);
140U151U    LINK_LEXER(lmBullant);
  152A    LINK_LEXER(lmCaml);
141U153U    LINK_LEXER(lmClw);
142U154U    LINK_LEXER(lmClwNoCase);
143U155U    LINK_LEXER(lmConf);
144U156U    LINK_LEXER(lmCPP);
145U157U    LINK_LEXER(lmCPPNoCase);
146C    LINK_LEXER(lmTCL); 158C    LINK_LEXER(lmCsound);
147C    LINK_LEXER(lmNncrontab);  
148U159U    LINK_LEXER(lmCss);
  160A    LINK_LEXER(lmDiff);
149U161U    LINK_LEXER(lmEiffel);
150U162U    LINK_LEXER(lmEiffelkw);
151U163U    LINK_LEXER(lmErlang);
  164A    LINK_LEXER(lmErrorList);
152U165U    LINK_LEXER(lmESCRIPT);
  166A    LINK_LEXER(lmF77);
  167A    LINK_LEXER(lmFlagShip);
153U168U    LINK_LEXER(lmForth);
154U169U    LINK_LEXER(lmFortran);
155C    LINK_LEXER(lmF77); 170C    LINK_LEXER(lmFreeBasic);
156U171U    LINK_LEXER(lmGui4Cli);
  172A    LINK_LEXER(lmHaskell);
157U173U    LINK_LEXER(lmHTML);
158R    LINK_LEXER(lmXML);  
159R    LINK_LEXER(lmASP);  
160R    LINK_LEXER(lmPHP);  
161U174U    LINK_LEXER(lmKix);
  175A    LINK_LEXER(lmLatex);
162U176U    LINK_LEXER(lmLISP);
  177A    LINK_LEXER(lmLot);
163U178U    LINK_LEXER(lmLout);
164U179U    LINK_LEXER(lmLua);
  180A    LINK_LEXER(lmMake);
165U181U    LINK_LEXER(lmMatlab);
166R    LINK_LEXER(lmOctave);  
167U182U    LINK_LEXER(lmMETAPOST);
168U183U    LINK_LEXER(lmMMIXAL);
169R    LINK_LEXER(lmLot);  
170U184U    LINK_LEXER(lmMSSQL);
  185A    LINK_LEXER(lmNncrontab);
171U186U    LINK_LEXER(lmNsis);
172R    LINK_LEXER(lmBatch);  
173R    LINK_LEXER(lmDiff);  
174R    LINK_LEXER(lmProps);  
175R    LINK_LEXER(lmMake);  
176R    LINK_LEXER(lmErrorList);  
177R    LINK_LEXER(lmLatex);  
178U187U    LINK_LEXER(lmNull);
  188A    LINK_LEXER(lmOctave);
179U189U    LINK_LEXER(lmPascal);
180U190U    LINK_LEXER(lmPB);
181U191U    LINK_LEXER(lmPerl);
  192A    LINK_LEXER(lmPHP);
  193A    LINK_LEXER(lmPHPSCRIPT);
182U194U    LINK_LEXER(lmPOV);
  195A    LINK_LEXER(lmProps);
183U196U    LINK_LEXER(lmPS);
  197A    LINK_LEXER(lmPureBasic);
184U198U    LINK_LEXER(lmPython);
  199A    LINK_LEXER(lmREBOL);
185U200U    LINK_LEXER(lmRuby);
186U201U    LINK_LEXER(lmScriptol);
  202A    LINK_LEXER(lmSmalltalk);
187U203U    LINK_LEXER(lmSpecman);
188U204U    LINK_LEXER(lmSQL);
  205A    LINK_LEXER(lmTADS3);
  206A    LINK_LEXER(lmTCL);
189U207U    LINK_LEXER(lmTeX);
190U208U    LINK_LEXER(lmVB);
191U209U    LINK_LEXER(lmVBScript);
192U210U    LINK_LEXER(lmVerilog);
193U211U    LINK_LEXER(lmVHDL);
  212A    LINK_LEXER(lmXML);
194U213U    LINK_LEXER(lmYAML);
195U214U 
196U215U//--Autogenerated -- end of automatically generated section
4 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:34.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.