diff options
| -rw-r--r-- | lexers/LexCoffeeScript.cxx | 142 | 
1 files changed, 71 insertions, 71 deletions
diff --git a/lexers/LexCoffeeScript.cxx b/lexers/LexCoffeeScript.cxx index d6e0ea2a1..c0faea386 100644 --- a/lexers/LexCoffeeScript.cxx +++ b/lexers/LexCoffeeScript.cxx @@ -31,16 +31,16 @@ using namespace Scintilla;  #endif  static bool IsSpaceEquiv(int state) { -	return (state <= SCE_C_COMMENTDOC -	    // including SCE_C_DEFAULT, SCE_C_COMMENT, SCE_C_COMMENTLINE -	    || state == SCE_C_COMMENTLINEDOC -	    || state == SCE_C_COMMENTDOCKEYWORD -	    || state == SCE_C_COMMENTDOCKEYWORDERROR +	return (state <= SCE_COFFEESCRIPT_COMMENTDOC +	    // including SCE_COFFEESCRIPT_DEFAULT, SCE_COFFEESCRIPT_COMMENT, SCE_COFFEESCRIPT_COMMENTLINE +	    || state == SCE_COFFEESCRIPT_COMMENTLINEDOC +	    || state == SCE_COFFEESCRIPT_COMMENTDOCKEYWORD +	    || state == SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR  	    || state == SCE_COFFEESCRIPT_COMMENTBLOCK  	    || state == SCE_COFFEESCRIPT_VERBOSE_REGEX  	    || state == SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT -	    || state == SCE_C_WORD -	    || state == SCE_C_REGEX); +	    || state == SCE_COFFEESCRIPT_WORD +	    || state == SCE_COFFEESCRIPT_REGEX);  }  // Preconditions: sc.currentPos points to a character after '+' or '-'. @@ -115,11 +115,11 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init  	int chPrevNonWhite = ' ';  	int visibleChars = 0;  	bool lastWordWasUUID = false; -	int styleBeforeDCKeyword = SCE_C_DEFAULT; +	int styleBeforeDCKeyword = SCE_COFFEESCRIPT_DEFAULT;  	bool continuationLine = false;  	bool isIncludePreprocessor = false; -	if (initStyle == SCE_C_PREPROCESSOR) { +	if (initStyle == SCE_COFFEESCRIPT_PREPROCESSOR) {  		// Set continuationLine if last character of previous line is '\'  		int lineCurrent = styler.GetLine(startPos);  		if (lineCurrent > 0) { @@ -142,13 +142,13 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init  		styler.Flush();  		while (back > 0 && IsSpaceEquiv(styler.StyleAt(--back)))  			; -		if (styler.StyleAt(back) == SCE_C_OPERATOR) { +		if (styler.StyleAt(back) == SCE_COFFEESCRIPT_OPERATOR) {  			chPrevNonWhite = styler.SafeGetCharAt(back);  		}  		if (startPos != back) {  			initStyle = styler.StyleAt(back);  			if (IsSpaceEquiv(initStyle)) { -				initStyle = SCE_C_DEFAULT; +				initStyle = SCE_COFFEESCRIPT_DEFAULT;  			}  		}  		startPos = back; @@ -180,95 +180,95 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init  		// Determine if the current state should terminate.  		switch (sc.state) { -			case SCE_C_OPERATOR: -				sc.SetState(SCE_C_DEFAULT); +			case SCE_COFFEESCRIPT_OPERATOR: +				sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  				break; -			case SCE_C_NUMBER: +			case SCE_COFFEESCRIPT_NUMBER:  				// We accept almost anything because of hex. and number suffixes  				if (!setWord.Contains(sc.ch)) { -					sc.SetState(SCE_C_DEFAULT); +					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  				}  				break; -			case SCE_C_IDENTIFIER: +			case SCE_COFFEESCRIPT_IDENTIFIER:  				if (!setWord.Contains(sc.ch) || (sc.ch == '.') || (sc.ch == '$')) {  					char s[1000];  					sc.GetCurrent(s, sizeof(s));  					if (keywords.InList(s)) {  						lastWordWasUUID = strcmp(s, "uuid") == 0; -						sc.ChangeState(SCE_C_WORD); +						sc.ChangeState(SCE_COFFEESCRIPT_WORD);  					} else if (keywords2.InList(s)) { -						sc.ChangeState(SCE_C_WORD2); +						sc.ChangeState(SCE_COFFEESCRIPT_WORD2);  					} else if (keywords4.InList(s)) { -						sc.ChangeState(SCE_C_GLOBALCLASS); +						sc.ChangeState(SCE_COFFEESCRIPT_GLOBALCLASS);  					} -					sc.SetState(SCE_C_DEFAULT); +					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  				}  				break; -			case SCE_C_PREPROCESSOR: +			case SCE_COFFEESCRIPT_PREPROCESSOR:  				if (sc.atLineStart && !continuationLine) { -					sc.SetState(SCE_C_DEFAULT); +					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  				} else if (stylingWithinPreprocessor) {  					if (IsASpace(sc.ch)) { -						sc.SetState(SCE_C_DEFAULT); +						sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  					}  				} else {  					if (sc.Match('/', '*') || sc.Match('/', '/')) { -						sc.SetState(SCE_C_DEFAULT); +						sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  					}  				}  				break; -			case SCE_C_COMMENT: +			case SCE_COFFEESCRIPT_COMMENT:  				if (sc.Match('*', '/')) {  					sc.Forward(); -					sc.ForwardSetState(SCE_C_DEFAULT); +					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);  				}  				break; -			case SCE_C_COMMENTDOC: +			case SCE_COFFEESCRIPT_COMMENTDOC:  				if (sc.Match('*', '/')) {  					sc.Forward(); -					sc.ForwardSetState(SCE_C_DEFAULT); +					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);  				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support  					// Verify that we have the conditions to mark a comment-doc-keyword  					if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) { -						styleBeforeDCKeyword = SCE_C_COMMENTDOC; -						sc.SetState(SCE_C_COMMENTDOCKEYWORD); +						styleBeforeDCKeyword = SCE_COFFEESCRIPT_COMMENTDOC; +						sc.SetState(SCE_COFFEESCRIPT_COMMENTDOCKEYWORD);  					}  				}  				break; -			case SCE_C_COMMENTLINE: +			case SCE_COFFEESCRIPT_COMMENTLINE:  				if (sc.atLineStart) { -					sc.SetState(SCE_C_DEFAULT); +					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  				}  				break; -			case SCE_C_COMMENTLINEDOC: +			case SCE_COFFEESCRIPT_COMMENTLINEDOC:  				if (sc.atLineStart) { -					sc.SetState(SCE_C_DEFAULT); +					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support  					// Verify that we have the conditions to mark a comment-doc-keyword  					if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) { -						styleBeforeDCKeyword = SCE_C_COMMENTLINEDOC; -						sc.SetState(SCE_C_COMMENTDOCKEYWORD); +						styleBeforeDCKeyword = SCE_COFFEESCRIPT_COMMENTLINEDOC; +						sc.SetState(SCE_COFFEESCRIPT_COMMENTDOCKEYWORD);  					}  				}  				break; -			case SCE_C_COMMENTDOCKEYWORD: -				if ((styleBeforeDCKeyword == SCE_C_COMMENTDOC) && sc.Match('*', '/')) { -					sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR); +			case SCE_COFFEESCRIPT_COMMENTDOCKEYWORD: +				if ((styleBeforeDCKeyword == SCE_COFFEESCRIPT_COMMENTDOC) && sc.Match('*', '/')) { +					sc.ChangeState(SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR);  					sc.Forward(); -					sc.ForwardSetState(SCE_C_DEFAULT); +					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);  				} else if (!setDoxygen.Contains(sc.ch)) {  					char s[100];  					sc.GetCurrent(s, sizeof(s));  					if (!IsASpace(sc.ch) || !keywords3.InList(s + 1)) { -						sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR); +						sc.ChangeState(SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR);  					}  					sc.SetState(styleBeforeDCKeyword);  				}  				break; -			case SCE_C_STRING: +			case SCE_COFFEESCRIPT_STRING:  				if (isIncludePreprocessor) {  					if (sc.ch == '>') { -						sc.ForwardSetState(SCE_C_DEFAULT); +						sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);  						isIncludePreprocessor = false;  					}  				} else if (sc.ch == '\\') { @@ -276,26 +276,26 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init  						sc.Forward();  					}  				} else if (sc.ch == '\"') { -					sc.ForwardSetState(SCE_C_DEFAULT); +					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);  				}  				break; -			case SCE_C_CHARACTER: +			case SCE_COFFEESCRIPT_CHARACTER:  				if (sc.ch == '\\') {  					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {  						sc.Forward();  					}  				} else if (sc.ch == '\'') { -					sc.ForwardSetState(SCE_C_DEFAULT); +					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);  				}  				break; -			case SCE_C_REGEX: +			case SCE_COFFEESCRIPT_REGEX:  				if (sc.atLineStart) { -					sc.SetState(SCE_C_DEFAULT); +					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  				} else if (sc.ch == '/') {  					sc.Forward();  					while ((sc.ch < 0x80) && islower(sc.ch))  						sc.Forward();    // gobble regex flags -					sc.SetState(SCE_C_DEFAULT); +					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  				} else if (sc.ch == '\\') {  					// Gobble up the quoted character  					if (sc.chNext == '\\' || sc.chNext == '/') { @@ -303,30 +303,30 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init  					}  				}  				break; -			case SCE_C_STRINGEOL: +			case SCE_COFFEESCRIPT_STRINGEOL:  				if (sc.atLineStart) { -					sc.SetState(SCE_C_DEFAULT); +					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  				}  				break; -			case SCE_C_VERBATIM: +			case SCE_COFFEESCRIPT_VERBATIM:  				if (sc.ch == '\"') {  					if (sc.chNext == '\"') {  						sc.Forward();  					} else { -						sc.ForwardSetState(SCE_C_DEFAULT); +						sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);  					}  				}  				break; -			case SCE_C_UUID: +			case SCE_COFFEESCRIPT_UUID:  				if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ')') { -					sc.SetState(SCE_C_DEFAULT); +					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);  				}  				break;  			case SCE_COFFEESCRIPT_COMMENTBLOCK:  				if (sc.Match("###")) {  					sc.Forward();  					sc.Forward(); -					sc.ForwardSetState(SCE_C_DEFAULT); +					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);  				} else if (sc.ch == '\\') {  					sc.Forward();  				} @@ -335,7 +335,7 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init  				if (sc.Match("///")) {  					sc.Forward();  					sc.Forward(); -					sc.ForwardSetState(SCE_C_DEFAULT); +					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);  				} else if (sc.Match('#')) {  					sc.SetState(SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT);  				} else if (sc.ch == '\\') { @@ -350,29 +350,29 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init  		}  		// Determine if a new state should be entered. -		if (sc.state == SCE_C_DEFAULT) { +		if (sc.state == SCE_COFFEESCRIPT_DEFAULT) {  			if (sc.Match('@', '\"')) { -				sc.SetState(SCE_C_VERBATIM); +				sc.SetState(SCE_COFFEESCRIPT_VERBATIM);  				sc.Forward();  			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {  				if (lastWordWasUUID) { -					sc.SetState(SCE_C_UUID); +					sc.SetState(SCE_COFFEESCRIPT_UUID);  					lastWordWasUUID = false;  				} else { -					sc.SetState(SCE_C_NUMBER); +					sc.SetState(SCE_COFFEESCRIPT_NUMBER);  				}  			} else if (setWordStart.Contains(sc.ch) || (sc.ch == '@') || (sc.ch == '$')) {  				if (lastWordWasUUID) { -					sc.SetState(SCE_C_UUID); +					sc.SetState(SCE_COFFEESCRIPT_UUID);  					lastWordWasUUID = false;  				} else { -					sc.SetState(SCE_C_IDENTIFIER); +					sc.SetState(SCE_COFFEESCRIPT_IDENTIFIER);  				}  			} else if (sc.Match('/', '*')) {  				if (sc.Match("/**") || sc.Match("/*!")) {	// Support of Qt/Doxygen doc. style -					sc.SetState(SCE_C_COMMENTDOC); +					sc.SetState(SCE_COFFEESCRIPT_COMMENTDOC);  				} else { -					sc.SetState(SCE_C_COMMENT); +					sc.SetState(SCE_COFFEESCRIPT_COMMENT);  				}  				sc.Forward();	// Eat the * so it isn't used for the end of the comment  			} else if (sc.Match("///")) { @@ -384,14 +384,14 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init  				       || followsReturnKeyword(sc, styler))  				   && (!setCouldBePostOp.Contains(chPrevNonWhite)  				       || !FollowsPostfixOperator(sc, styler))) { -				sc.SetState(SCE_C_REGEX);	// JavaScript's RegEx +				sc.SetState(SCE_COFFEESCRIPT_REGEX);	// JavaScript's RegEx  			} else if (sc.ch == '\"') { -				sc.SetState(SCE_C_STRING); +				sc.SetState(SCE_COFFEESCRIPT_STRING);  				isIncludePreprocessor = false;	// ensure that '>' won't end the string  			} else if (isIncludePreprocessor && sc.ch == '<') { -				sc.SetState(SCE_C_STRING); +				sc.SetState(SCE_COFFEESCRIPT_STRING);  			} else if (sc.ch == '\'') { -				sc.SetState(SCE_C_CHARACTER); +				sc.SetState(SCE_COFFEESCRIPT_CHARACTER);  			} else if (sc.ch == '#') {  				if (sc.Match("###")) {  					sc.SetState(SCE_COFFEESCRIPT_COMMENTBLOCK); @@ -399,10 +399,10 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init  					sc.Forward();  				} else { -					sc.SetState(SCE_C_COMMENTLINE); +					sc.SetState(SCE_COFFEESCRIPT_COMMENTLINE);  				}  			} else if (isoperator(static_cast<char>(sc.ch))) { -				sc.SetState(SCE_C_OPERATOR); +				sc.SetState(SCE_COFFEESCRIPT_OPERATOR);  			}  		}  | 
