Renamed ColouriseContext to StyleContext and moved out to own files.

2 files changed, 154 insertions, 372 deletions

diff --git a/src/LexCPP.cxx b/src/LexCPP.cxx
index 8bed66c3d..8227b2db2 100644
--- a/src/LexCPP.cxx
+++ b/src/LexCPP.cxx
@@ -15,6 +15,7 @@
 
 #include "PropSet.h"
 #include "Accessor.h"
+#include "StyleContext.h"
 #include "KeyWords.h"
 #include "Scintilla.h"
 #include "SciLexer.h"
@@ -23,23 +24,6 @@ static bool IsOKBeforeRE(int ch) {
 	return (ch == '(') || (ch == '=') || (ch == ',');
 }
 
-static void getRange(unsigned int start,
-		unsigned int end,
-		Accessor &styler,
-		char *s,
-		unsigned int len) {
-	unsigned int i = 0;
-	while ((i < end - start + 1) && (i < len-1)) {
-		s[i] = styler[start + i];
-		i++;
-	}
-	s[i] = '\0';
-}
-
-inline bool IsASpace(int ch) {
-    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
-}
-
 inline bool IsAWordChar(int  ch) {
 	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
 }
@@ -48,117 +32,6 @@ inline bool IsAWordStart(int ch) {
 	return (ch < 0x80) && (isalnum(ch) || ch == '_');
 }
 
-inline bool IsADigit(int ch) {
-	return (ch >= '0') && (ch <= '9');
-}
-
-// All languages handled so far can treat all characters >= 0x80 as one class
-// which just continues the current token or starts an identifier if in default.
-// DBCS treated specially as the second character can be < 0x80 and hence 
-// syntactically significant. UTF-8 avoids this as all trail bytes are >= 0x80
-class ColouriseContext {
-	Accessor &styler;
-	int lengthDoc;
-	int currentPos;
-	ColouriseContext& operator=(const ColouriseContext&) {
-		return *this;
-	}
-public:
-	bool atEOL;
-	int state;
-	int chPrev;
-	int ch;
-	int chNext;
-
-	ColouriseContext(unsigned int startPos, int length,
-                        int initStyle, Accessor &styler_) : 
-		styler(styler_),
-		lengthDoc(startPos + length),
-		currentPos(startPos), 
-		atEOL(false),
-		state(initStyle), 
-		chPrev(0),
-		ch(0), 
-		chNext(0) {
-		styler.StartAt(startPos);
-		styler.StartSegment(startPos);
-		int pos = currentPos;
-		ch = static_cast<unsigned char>(styler.SafeGetCharAt(pos));
-		if (styler.IsLeadByte(static_cast<char>(ch))) {
-			pos++;
-			ch = ch << 8;
-			ch |= static_cast<unsigned char>(styler.SafeGetCharAt(pos));
-		}
-		chNext = static_cast<unsigned char>(styler.SafeGetCharAt(pos+1));
-		if (styler.IsLeadByte(static_cast<char>(chNext))) {
-			chNext = chNext << 8;
-			chNext |= static_cast<unsigned char>(styler.SafeGetCharAt(pos+2));
-		}
-		atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-	}
-	void Complete() {
-		styler.ColourTo(currentPos - 1, state);
-	}
-	bool More() {
-		return currentPos <= lengthDoc;
-	}
-	void Forward() {
-		// A lot of this is repeated from the constructor - TODO: merge code
-		chPrev = ch;
-		currentPos++;
-		if (ch >= 0x100)
-			currentPos++;
-		ch = chNext;
-		chNext = static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+1));
-		if (styler.IsLeadByte(static_cast<char>(chNext))) {
-			chNext = chNext << 8;
-			chNext |= static_cast<unsigned char>(styler.SafeGetCharAt(currentPos + 2));
-		}
-		// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
-		// Avoid triggering two times on Dos/Win
-		// End of line
-		atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
-	}
-	void ChangeState(int state_) {
-		state = state_;
-	}
-	void SetState(int state_) {
-		styler.ColourTo(currentPos - 1, state);
-		state = state_;
-	}
-	void ForwardSetState(int state_) {
-		Forward();
-		styler.ColourTo(currentPos - 1, state);
-		state = state_;
-	}
-	void GetCurrent(char *s, int len) {
-		getRange(styler.GetStartSegment(), currentPos - 1, styler, s, len);
-	}
-	int LengthCurrent() {
-		return currentPos - styler.GetStartSegment();
-	}
-	bool Match(char ch0) {
-		return ch == ch0;
-	}
-	bool Match(char ch0, char ch1) {
-		return (ch == ch0) && (chNext == ch1);
-	}
-	bool Match(const char *s) {
-		if (ch != *s)
-			return false;
-		s++;
-		if (chNext != *s)
-			return false;
-		s++;
-		for (int n=2; *s; n++) {
-			if (*s != styler.SafeGetCharAt(currentPos+n))
-				return false;
-			s++;
-		}
-		return true;
-	}
-};
-
 static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
                             Accessor &styler) {
 
@@ -175,175 +48,175 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 	int visibleChars = 0;
 	bool lastWordWasUUID = false;
 
-	ColouriseContext cc(startPos, length, initStyle, styler);
+	StyleContext sc(startPos, length, initStyle, styler);
 
-	for (; cc.More(); cc.Forward()) {
-		if (cc.ch == '\\') {
-			if (cc.Match("\\\n")) {
-				cc.Forward();
-				cc.Forward();
+	for (; sc.More(); sc.Forward()) {
+		if (sc.ch == '\\') {
+			if (sc.Match("\\\n")) {
+				sc.Forward();
+				sc.Forward();
 				continue;
 			}
-			if (cc.Match("\\\r\n")) {
-				cc.Forward();
-				cc.Forward();
-				cc.Forward();
+			if (sc.Match("\\\r\n")) {
+				sc.Forward();
+				sc.Forward();
+				sc.Forward();
 				continue;
 			}
 		}
 
-		if (cc.state == SCE_C_OPERATOR) {
-			cc.SetState(SCE_C_DEFAULT);
-		} else if (cc.state == SCE_C_NUMBER) {
-			if (!IsAWordChar(cc.ch)) {
-				cc.SetState(SCE_C_DEFAULT);
+		if (sc.state == SCE_C_OPERATOR) {
+			sc.SetState(SCE_C_DEFAULT);
+		} else if (sc.state == SCE_C_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_C_DEFAULT);
 			}
-		} else if (cc.state == SCE_C_IDENTIFIER) {
-			if (!IsAWordChar(cc.ch) || (cc.ch == '.')) {
+		} else if (sc.state == SCE_C_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
 				char s[100];
-				cc.GetCurrent(s, sizeof(s));
+				sc.GetCurrent(s, sizeof(s));
 				if (keywords.InList(s)) {
 					lastWordWasUUID = strcmp(s, "uuid") == 0;
-					cc.ChangeState(SCE_C_WORD);
+					sc.ChangeState(SCE_C_WORD);
 				} else if (keywords2.InList(s)) {
-					cc.ChangeState(SCE_C_WORD2);
+					sc.ChangeState(SCE_C_WORD2);
 				}
-				cc.SetState(SCE_C_DEFAULT);
+				sc.SetState(SCE_C_DEFAULT);
 			}
-		} if (cc.state == SCE_C_PREPROCESSOR) {
+		} if (sc.state == SCE_C_PREPROCESSOR) {
 			if (stylingWithinPreprocessor) {
-				if (IsASpace(cc.ch)) {
-					cc.SetState(SCE_C_DEFAULT);
+				if (IsASpace(sc.ch)) {
+					sc.SetState(SCE_C_DEFAULT);
 				}
 			} else {
-				if (cc.atEOL) {
-					cc.SetState(SCE_C_DEFAULT);
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_C_DEFAULT);
 				}
 			}
-		} else if (cc.state == SCE_C_COMMENT) {
-			if (cc.Match('*', '/')) {
-				cc.Forward();
-				cc.ForwardSetState(SCE_C_DEFAULT);
+		} else if (sc.state == SCE_C_COMMENT) {
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_C_DEFAULT);
 			}
-		} else if (cc.state == SCE_C_COMMENTDOC) {
-			if (cc.Match('*', '/')) {
-				cc.Forward();
-				cc.ForwardSetState(SCE_C_DEFAULT);
+		} else if (sc.state == SCE_C_COMMENTDOC) {
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_C_DEFAULT);
 			}
-		} else if (cc.state == SCE_C_COMMENTLINE || cc.state == SCE_C_COMMENTLINEDOC) {
-			if (cc.atEOL) {
-				cc.SetState(SCE_C_DEFAULT);
+		} else if (sc.state == SCE_C_COMMENTLINE || sc.state == SCE_C_COMMENTLINEDOC) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_C_DEFAULT);
 				visibleChars = 0;
 			}
-		} else if (cc.state == SCE_C_STRING) {
-			if (cc.ch == '\\') {
-				if (cc.chNext == '\"' || cc.chNext == '\'' || cc.chNext == '\\') {
-					cc.Forward();
+		} else if (sc.state == SCE_C_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
 				}
-			} else if (cc.ch == '\"') {
-				cc.ForwardSetState(SCE_C_DEFAULT);
-			} else if (cc.atEOL) {
-				cc.ChangeState(SCE_C_STRINGEOL);
-				cc.ForwardSetState(SCE_C_DEFAULT);
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_C_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_C_STRINGEOL);
+				sc.ForwardSetState(SCE_C_DEFAULT);
 				visibleChars = 0;
 			}
-		} else if (cc.state == SCE_C_CHARACTER) {
-			if (cc.atEOL) {
-				cc.ChangeState(SCE_C_STRINGEOL);
-				cc.ForwardSetState(SCE_C_DEFAULT);
+		} else if (sc.state == SCE_C_CHARACTER) {
+			if (sc.atLineEnd) {
+				sc.ChangeState(SCE_C_STRINGEOL);
+				sc.ForwardSetState(SCE_C_DEFAULT);
 				visibleChars = 0;
-			} else if (cc.ch == '\\') {
-				if (cc.chNext == '\"' || cc.chNext == '\'' || cc.chNext == '\\') {
-					cc.Forward();
+			} else if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
 				}
-			} else if (cc.ch == '\'') {
-				cc.ForwardSetState(SCE_C_DEFAULT);
+			} else if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_C_DEFAULT);
 			}
-		} else if (cc.state == SCE_C_REGEX) {
-			if (cc.ch == '\r' || cc.ch == '\n' || cc.ch == '/') {
-				cc.ForwardSetState(SCE_C_DEFAULT);
-			} else if (cc.ch == '\\') {
+		} else if (sc.state == SCE_C_REGEX) {
+			if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == '/') {
+				sc.ForwardSetState(SCE_C_DEFAULT);
+			} else if (sc.ch == '\\') {
 				// Gobble up the quoted character
-				if (cc.chNext == '\\' || cc.chNext == '/') {
-					cc.Forward();
+				if (sc.chNext == '\\' || sc.chNext == '/') {
+					sc.Forward();
 				}
 			}
-		} else if (cc.state == SCE_C_VERBATIM) {
-			if (cc.ch == '\"') {
-				if (cc.chNext == '\"') {
-					cc.Forward();
+		} else if (sc.state == SCE_C_VERBATIM) {
+			if (sc.ch == '\"') {
+				if (sc.chNext == '\"') {
+					sc.Forward();
 				} else {
-					cc.ForwardSetState(SCE_C_DEFAULT);
+					sc.ForwardSetState(SCE_C_DEFAULT);
 				}
 			}
-		} else if (cc.state == SCE_C_UUID) {
-			if (cc.ch == '\r' || cc.ch == '\n' || cc.ch == ')') {
-				cc.SetState(SCE_C_DEFAULT);
+		} else if (sc.state == SCE_C_UUID) {
+			if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ')') {
+				sc.SetState(SCE_C_DEFAULT);
 			}
 		}
 
-		if (cc.state == SCE_C_DEFAULT) {
-			if (cc.Match('@', '\"')) {
-				cc.SetState(SCE_C_VERBATIM);
-				cc.Forward();
-			} else if (IsADigit(cc.ch) || (cc.ch == '.' && IsADigit(cc.chNext))) {
+		if (sc.state == SCE_C_DEFAULT) {
+			if (sc.Match('@', '\"')) {
+				sc.SetState(SCE_C_VERBATIM);
+				sc.Forward();
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
 				if (lastWordWasUUID) {
-					cc.SetState(SCE_C_UUID);
+					sc.SetState(SCE_C_UUID);
 					lastWordWasUUID = false;
 				} else {
-					cc.SetState(SCE_C_NUMBER);
+					sc.SetState(SCE_C_NUMBER);
 				}
-			} else if (IsAWordStart(cc.ch) || (cc.ch == '@')) {
+			} else if (IsAWordStart(sc.ch) || (sc.ch == '@')) {
 				if (lastWordWasUUID) {
-					cc.SetState(SCE_C_UUID);
+					sc.SetState(SCE_C_UUID);
 					lastWordWasUUID = false;
 				} else {
-					cc.SetState(SCE_C_IDENTIFIER);
+					sc.SetState(SCE_C_IDENTIFIER);
 				}
-			} else if (cc.Match('/', '*')) {
-				if (cc.Match("/**") || cc.Match("/*!"))	// Support of Qt/Doxygen doc. style
-					cc.SetState(SCE_C_COMMENTDOC);
+			} else if (sc.Match('/', '*')) {
+				if (sc.Match("/**") || sc.Match("/*!"))	// Support of Qt/Doxygen doc. style
+					sc.SetState(SCE_C_COMMENTDOC);
 				else
-					cc.SetState(SCE_C_COMMENT);
-				cc.Forward();	// Eat the * so it isn't used for the end of the comment
-			} else if (cc.Match('/', '/')) {
-				if (cc.Match("///") || cc.Match("//!"))	// Support of Qt/Doxygen doc. style
-					cc.SetState(SCE_C_COMMENTLINEDOC);
+					sc.SetState(SCE_C_COMMENT);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				if (sc.Match("///") || sc.Match("//!"))	// Support of Qt/Doxygen doc. style
+					sc.SetState(SCE_C_COMMENTLINEDOC);
 				else
-					cc.SetState(SCE_C_COMMENTLINE);
-			} else if (cc.ch == '/' && IsOKBeforeRE(chPrevNonWhite)) {
-				cc.SetState(SCE_C_REGEX);
-			} else if (cc.ch == '\"') {
-				cc.SetState(SCE_C_STRING);
-			} else if (cc.ch == '\'') {
-				cc.SetState(SCE_C_CHARACTER);
-			} else if (cc.ch == '#' && visibleChars == 0) {
+					sc.SetState(SCE_C_COMMENTLINE);
+			} else if (sc.ch == '/' && IsOKBeforeRE(chPrevNonWhite)) {
+				sc.SetState(SCE_C_REGEX);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_C_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_C_CHARACTER);
+			} else if (sc.ch == '#' && visibleChars == 0) {
 				// Preprocessor commands are alone on their line
-				cc.SetState(SCE_C_PREPROCESSOR);
+				sc.SetState(SCE_C_PREPROCESSOR);
 				// Skip whitespace between # and preprocessor word
 				do {
-					cc.Forward();
-				} while ((cc.ch == ' ') && (cc.ch == '\t') && cc.More());
-				if (cc.atEOL) {
-					cc.SetState(SCE_C_DEFAULT);
+					sc.Forward();
+				} while ((sc.ch == ' ') && (sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_C_DEFAULT);
 				}
-			} else if (isoperator(static_cast<char>(cc.ch))) {
-				cc.SetState(SCE_C_OPERATOR);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_C_OPERATOR);
 			}
 		}
-		if (cc.atEOL) {
+		if (sc.atLineEnd) {
 			// Reset states to begining of colourise so no surprises 
 			// if different sets of lines lexed.
 			chPrevNonWhite = ' ';
 			visibleChars = 0;
 			lastWordWasUUID = false;
 		}
-		if (!IsASpace(cc.ch)) {
-			chPrevNonWhite = cc.ch;
+		if (!IsASpace(sc.ch)) {
+			chPrevNonWhite = sc.ch;
 			visibleChars++;
 		}
 	}
-	cc.Complete();
+	sc.Complete();
 }
 
 static void FoldCppDoc(unsigned int startPos, int length, int initStyle, WordList *[],
diff --git a/src/LexEiffel.cxx b/src/LexEiffel.cxx
index 1296fb245..647094320 100644
--- a/src/LexEiffel.cxx
+++ b/src/LexEiffel.cxx
@@ -16,6 +16,7 @@
 
 #include "PropSet.h"
 #include "Accessor.h"
+#include "StyleContext.h"
 #include "KeyWords.h"
 #include "Scintilla.h"
 #include "SciLexer.h"
@@ -31,23 +32,6 @@ inline bool isEiffelOperator(unsigned int ch) {
 		ch == '!' || ch == '@' || ch == '?';
 }
 
-static void getRangeLowered(unsigned int start,
-		unsigned int end,
-		Accessor &styler,
-		char *s,
-		unsigned int len) {
-	unsigned int i = 0;
-	while ((i < end - start + 1) && (i < len-1)) {
-		s[i] = static_cast<char>(tolower(styler[start + i]));
-		i++;
-	}
-	s[i] = '\0';
-}
-
-inline bool IsASpace(unsigned int ch) {
-    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
-}
-
 inline bool IsAWordChar(unsigned int  ch) {
 	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
 }
@@ -56,81 +40,6 @@ inline bool IsAWordStart(unsigned int ch) {
 	return (ch < 0x80) && (isalnum(ch) || ch == '_');
 }
 
-inline bool IsADigit(unsigned int ch) {
-	return (ch >= '0') && (ch <= '9');
-}
-
-// All languages handled so far can treat all characters >= 0x80 as one class
-// which just continues the current token or starts an identifier if in default.
-// DBCS treated specially as the second character can be < 0x80 and hence 
-// syntactically significant. UTF-8 avoids this as all trail bytes are >= 0x80
-class xColouriseContext {
-	Accessor &styler;
-	int lengthDoc;
-	int currentPos;
-	xColouriseContext& operator=(const xColouriseContext&) {
-		return *this;
-	}
-public:
-	int state;
-	unsigned int chPrev;
-	unsigned int ch;
-	unsigned int chNext;
-
-	xColouriseContext(unsigned int startPos, int length,
-                        int initStyle, Accessor &styler_) : 
-		styler(styler_),
-		lengthDoc(startPos + length),
-		currentPos(startPos), 
-		state(initStyle), 
-		chPrev(0),
-		ch(0), 
-		chNext(0) {
-		styler.StartAt(startPos);
-		styler.StartSegment(startPos);
-		int pos = currentPos;
-		ch = static_cast<unsigned char>(styler.SafeGetCharAt(pos));
-		if (styler.IsLeadByte(static_cast<char>(ch))) {
-			pos++;
-			ch = ch << 8;
-			ch |= static_cast<unsigned char>(styler.SafeGetCharAt(pos));
-		}
-		chNext = static_cast<unsigned char>(styler.SafeGetCharAt(pos+1));
-		if (styler.IsLeadByte(static_cast<char>(chNext))) {
-			chNext = chNext << 8;
-			chNext |= static_cast<unsigned char>(styler.SafeGetCharAt(pos+2));
-		}
-	}
-	void Complete() {
-		styler.ColourTo(currentPos - 1, state);
-	}
-	bool More() {
-		return currentPos <= lengthDoc;
-	}
-	void Forward() {
-		chPrev = ch;
-		currentPos++;
-		if (ch >= 0x100)
-			currentPos++;
-		ch = chNext;
-		chNext = static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+1));
-		if (styler.IsLeadByte(static_cast<char>(chNext))) {
-			chNext = chNext << 8;
-			chNext |= static_cast<unsigned char>(styler.SafeGetCharAt(currentPos + 2));
-		}
-	}
-	void ChangeState(int state_) {
-		state = state_;
-	}
-	void SetState(int state_) {
-		styler.ColourTo(currentPos - 1, state);
-		state = state_;
-	}
-	void GetCurrentLowered(char *s, int len) {
-		getRangeLowered(styler.GetStartSegment(), currentPos - 1, styler, s, len);
-	}
-};
-
 static void ColouriseEiffelDoc(unsigned int startPos,
                             int length,
                             int initStyle,
@@ -139,68 +48,68 @@ static void ColouriseEiffelDoc(unsigned int startPos,
 
 	WordList &keywords = *keywordlists[0];
 
-	xColouriseContext lc(startPos, length, initStyle, styler);
+	StyleContext sc(startPos, length, initStyle, styler);
 
-	for (; lc.More(); lc.Forward()) {
+	for (; sc.More(); sc.Forward()) {
 
-		if (lc.state == SCE_EIFFEL_STRINGEOL) {
-			if (lc.ch != '\r' && lc.ch != '\n') {
-				lc.SetState(SCE_EIFFEL_DEFAULT);
+		if (sc.state == SCE_EIFFEL_STRINGEOL) {
+			if (sc.ch != '\r' && sc.ch != '\n') {
+				sc.SetState(SCE_EIFFEL_DEFAULT);
 			}
-		} else if (lc.state == SCE_EIFFEL_OPERATOR) {
-			lc.SetState(SCE_EIFFEL_DEFAULT);
-		} else if (lc.state == SCE_EIFFEL_WORD) {
-			if (!IsAWordChar(lc.ch)) {
+		} else if (sc.state == SCE_EIFFEL_OPERATOR) {
+			sc.SetState(SCE_EIFFEL_DEFAULT);
+		} else if (sc.state == SCE_EIFFEL_WORD) {
+			if (!IsAWordChar(sc.ch)) {
 				char s[100];
-				lc.GetCurrentLowered(s, sizeof(s));
+				sc.GetCurrentLowered(s, sizeof(s));
 				if (!keywords.InList(s)) {
-					lc.ChangeState(SCE_EIFFEL_IDENTIFIER);
+					sc.ChangeState(SCE_EIFFEL_IDENTIFIER);
 				}
-				lc.SetState(SCE_EIFFEL_DEFAULT);
+				sc.SetState(SCE_EIFFEL_DEFAULT);
 			}
-		} else if (lc.state == SCE_EIFFEL_NUMBER) {
-			if (!IsAWordChar(lc.ch)) {
-				lc.SetState(SCE_EIFFEL_DEFAULT);
+		} else if (sc.state == SCE_EIFFEL_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_EIFFEL_DEFAULT);
 			}
-		} else if (lc.state == SCE_EIFFEL_COMMENTLINE) {
-			if (lc.ch == '\r' || lc.ch == '\n') {
-				lc.SetState(SCE_EIFFEL_DEFAULT);
+		} else if (sc.state == SCE_EIFFEL_COMMENTLINE) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_EIFFEL_DEFAULT);
 			}
-		} else if (lc.state == SCE_EIFFEL_STRING) {
-			if (lc.ch == '%') {
-				lc.Forward();
-			} else if (lc.ch == '\"') {
-				lc.Forward();
-				lc.SetState(SCE_EIFFEL_DEFAULT);
+		} else if (sc.state == SCE_EIFFEL_STRING) {
+			if (sc.ch == '%') {
+				sc.Forward();
+			} else if (sc.ch == '\"') {
+				sc.Forward();
+				sc.SetState(SCE_EIFFEL_DEFAULT);
 			}
-		} else if (lc.state == SCE_EIFFEL_CHARACTER) {
-			if (lc.ch == '\r' || lc.ch == '\n') {
-				lc.SetState(SCE_EIFFEL_STRINGEOL);
-			} else if (lc.ch == '%') {
-				lc.Forward();
-			} else if (lc.ch == '\'') {
-				lc.Forward();
-				lc.SetState(SCE_EIFFEL_DEFAULT);
+		} else if (sc.state == SCE_EIFFEL_CHARACTER) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_EIFFEL_STRINGEOL);
+			} else if (sc.ch == '%') {
+				sc.Forward();
+			} else if (sc.ch == '\'') {
+				sc.Forward();
+				sc.SetState(SCE_EIFFEL_DEFAULT);
 			}
 		}
 
-		if (lc.state == SCE_EIFFEL_DEFAULT) {
-			if (lc.ch == '-' && lc.chNext == '-') {
-				lc.SetState(SCE_EIFFEL_COMMENTLINE);
-			} else if (lc.ch == '\"') {
-				lc.SetState(SCE_EIFFEL_STRING);
-			} else if (lc.ch == '\'') {
-				lc.SetState(SCE_EIFFEL_CHARACTER);
-			} else if (IsADigit(lc.ch) || (lc.ch == '.')) {
-				lc.SetState(SCE_EIFFEL_NUMBER);
-			} else if (IsAWordStart(lc.ch)) {
-				lc.SetState(SCE_EIFFEL_WORD);
-			} else if (isEiffelOperator(lc.ch)) {
-				lc.SetState(SCE_EIFFEL_OPERATOR);
+		if (sc.state == SCE_EIFFEL_DEFAULT) {
+			if (sc.ch == '-' && sc.chNext == '-') {
+				sc.SetState(SCE_EIFFEL_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_EIFFEL_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_EIFFEL_CHARACTER);
+			} else if (IsADigit(sc.ch) || (sc.ch == '.')) {
+				sc.SetState(SCE_EIFFEL_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_EIFFEL_WORD);
+			} else if (isEiffelOperator(sc.ch)) {
+				sc.SetState(SCE_EIFFEL_OPERATOR);
 			}
 		}
 	}
-	lc.Complete();
+	sc.Complete();
 }
 
 static bool IsEiffelComment(Accessor &styler, int pos, int len) {