Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\LexMSSQL.cxx
Last modified2004-09-27 22:29:20.000 +0200
Size10.1 Kb (330 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\LexMSSQL.cxx
Last modified2006-03-16 13:07:08.000 +0100
Size11 Kb (360 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged7295
Inserted163
Deleted333
Ignored00
Changed24



   Comparison Details  

1 skipped line
2U2U/** @file LexMSSQL.cxx
3U3U ** Lexer for MSSQL.
4U4U **/
5C// Copyright 1998-2002 by Filip Yaghob <fy@eg.cz> 5C// By Filip Yaghob <fyaghob@gmail.com>
6U6U 
7U7U 
8U8U#include <stdlib.h>
18 skipped lines
27U27U#define KW_MSSQL_STORED_PROCEDURES  5
28U28U#define KW_MSSQL_OPERATORS          6
29U29U 
30R//~ val SCE_MSSQL_DEFAULT=0  
31R//~ val SCE_MSSQL_COMMENT=1  
32R//~ val SCE_MSSQL_LINE_COMMENT=2  
33R//~ val SCE_MSSQL_NUMBER=3  
34R//~ val SCE_MSSQL_STRING=4  
8 skipped lines
43R//~ val SCE_MSSQL_FUNCTION=13  
44R//~ val SCE_MSSQL_STORED_PROCEDURE=14  
45R//~ val SCE_MSSQL_DEFAULT_PREF_DATATYPE 15  
46R//~ val SCE_MSSQL_COLUMN_NAME_2 16  
47R   
48U30Ustatic bool isMSSQLOperator(char ch) {
49U31U    if (isascii(ch) && isalnum(ch))
50U32U        return false;
82 skipped lines
133U115U    bool fold = styler.GetPropertyInt("fold") != 0;
134U116U    int lineCurrent = styler.GetLine(startPos);
135U117U    int spaceFlags = 0;
136R/*  
137R    WordList &kwStatements          = *keywordlists[KW_MSSQL_STATEMENTS];  
138R    WordList &kwDataTypes           = *keywordlists[KW_MSSQL_DATA_TYPES];  
139R    WordList &kwSystemTables        = *keywordlists[KW_MSSQL_SYSTEM_TABLES];  
140R    WordList &kwGlobalVariables     = *keywordlists[KW_MSSQL_GLOBAL_VARIABLES];  
141R    WordList &kwFunctions           = *keywordlists[KW_MSSQL_FUNCTIONS];  
142U118U 
143R    char s[100];  
144R    int iixx = 0;  
145R    s[0] = 's';   s[1] = 'e'; s[2] = 'l'; s[3] = 'e'; s[4] = 'c'; s[5] = 't'; s[6] = 0;  
146R    if (kwStatements.InList(s))  
147R        iixx = 1;  
148R    s[0] = 's';   s[1] = 'e'; s[2] = 'r'; s[3] = 'v'; s[4] = 'e'; s[5] = 'r'; s[6] = 'n'; s[7] = 'a'; s[8] = 'm'; s[9] = 'e'; s[10] = 0;  
149R    if (kwGlobalVariables.InList(s))  
150R        iixx += 2;  
151R*/  
152U119U    int state = initStyle;
153U120U    int prevState = initStyle;
154U121U    char chPrev = ' ';
160 skipped lines
315U282U    styler.ColourTo(lengthDoc - 1, state);
316U283U}
317U284U 
  285Astatic void FoldMSSQLDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
  286A    bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
  287A    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
  288A    unsigned int endPos = startPos + length;
  289A    int visibleChars = 0;
53 skipped lines
  343A    // Fill in the real level of the next line, keeping the current flags as they will be filled in later
  344A    int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
  345A    styler.SetLevel(lineCurrent, levelPrev | flagsNext);
  346A}
  347A 
318U348Ustatic const char * const sqlWordListDesc[] = {
319U349U    "Statements",
320U350U    "Data Types",
5 skipped lines
326U356U    0,
327U357U};
328U358U 
329CLexerModule lmMSSQL(SCLEX_MSSQL, ColouriseMSSQLDoc, "mssql", 0, sqlWordListDesc); 359CLexerModule lmMSSQL(SCLEX_MSSQL, ColouriseMSSQLDoc, "mssql", FoldMSSQLDoc, sqlWordListDesc);
330U360U 

   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:39.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.