Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\LexPOV.cxx
Last modified2004-02-18 17:28:54.001 +0100
Size9.1 Kb (311 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\LexPOV.cxx
Last modified2006-03-16 13:07:08.000 +0100
Size9.1 Kb (313 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged10303
Inserted12
Deleted11
Ignored00
Changed715



   Comparison Details  

2 skipped lines
3U3U ** Lexer for POV-Ray SDL (Persistance of Vision Raytracer, Scene Description Language).
4U4U ** Written by Philippe Lhoste but this is mostly a derivative of LexCPP...
5U5U **/
6C// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org> 6C// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
7U7U// The License.txt file describes the conditions under which this software may be distributed.
8U8U 
9U9U// Some points that distinguish from a simple C lexer:
19 skipped lines
29U29U#include "Scintilla.h"
30U30U#include "SciLexer.h"
31U31U 
32Cstatic inline bool IsAWordChar(const int ch) { 32Cstatic inline bool IsAWordChar(int ch) {
33U33U    return ch < 0x80 && (isalnum(ch) || ch == '_');
34U34U}
35U35U 
36Cstatic inline bool IsAWordStart(consint ch) { 36Cstatic inline bool IsAWordStart(int ch) {
37U37U    return ch < 0x80 && isalpha(ch);
38U38U}
39U39U 
40Cstatic inline bool IsANumberChar(const int ch) { 40Cstatic inline bool IsANumberChar(int ch) {
41U41U    // Not exactly following number definition (several dots are seen as OK, etc.)
42U42U    // but probably enough in most cases.
43U43U    return (ch < 0x80) &&
25 skipped lines
69U69U    }
70U70U 
71U71U    // Do not leak onto next line
72C    if (initStyle == SCE_POV_STRINGEOL) { 72C    if (initStyle == SCE_POV_STRINGEOL || initStyle == SCE_POV_COMMENTLINE) {
73U73U        initStyle = SCE_POV_DEFAULT;
74U74U    }
75U75U 
76R    StyleContext sc(startPos, length, initStyle, styler);  
77U76U    short stringLen = 0;
78U77U 
  78A    StyleContext sc(startPos, length, initStyle, styler);
  79A 
79U80U    for (; sc.More(); sc.Forward()) {
80U81U        if (sc.atLineEnd) {
81U82U        // Update the line state, so it can be seen by next line
43 skipped lines
125U126U        }
126U127U        } else if (sc.state == SCE_POV_DIRECTIVE) {
127U128U        if (!IsAWordChar(sc.ch)) {
128C        char s[100], *p; 129C        char s[100];
  130C        char *p;
129U131U        sc.GetCurrent(s, sizeof(s));
130U132U        p = s;
131U133U        // Skip # and whitespace between # and directive word
18 skipped lines
150U152U        }
151U153U        } else if (sc.state == SCE_POV_COMMENTLINE) {
152U154U        if (sc.atLineEnd) {
153C        sc.SetState(SCE_POV_DEFAULT); 155C        sc.ForwardSetState(SCE_POV_DEFAULT);
154U156U        }
155U157U        } else if (sc.state == SCE_POV_STRING) {
156U158U        if (sc.ch == '\\') {
155 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:41.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.