Update Scintilla to v3.3.5.

1 files changed, 10 insertions, 9 deletions

diff --git a/scintilla/lexers/LexHTML.cxx b/scintilla/lexers/LexHTML.cxx
index 3acb896..1b855e4 100644
--- a/scintilla/lexers/LexHTML.cxx
+++ b/scintilla/lexers/LexHTML.cxx
@@ -43,7 +43,7 @@ static inline bool IsAWordStart(const int ch) {
 }

 

 inline bool IsOperator(int ch) {

-	if (isascii(ch) && isalnum(ch))

+	if (IsASCII(ch) && isalnum(ch))

 		return false;

 	// '.' left out as it is used to make up numbers

 	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||

@@ -446,12 +446,12 @@ static int StateForScript(script_type scriptLanguage) {
 }

 

 static inline bool issgmlwordchar(int ch) {

-	return !isascii(ch) ||

+	return !IsASCII(ch) ||

 		(isalnum(ch) || ch == '.' || ch == '_' || ch == ':' || ch == '!' || ch == '#' || ch == '[');

 }

 

 static inline bool IsPhpWordStart(int ch) {

-	return (isascii(ch) && (isalpha(ch) || (ch == '_'))) || (ch >= 0x7f);

+	return (IsASCII(ch) && (isalpha(ch) || (ch == '_'))) || (ch >= 0x7f);

 }

 

 static inline bool IsPhpWordChar(int ch) {

@@ -1233,7 +1233,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 					styler.ColourTo(i - 2, StateToPrint);

 				}

 				state = SCE_H_SGML_COMMENT;

-			} else if (isascii(ch) && isalpha(ch) && (chPrev == '%')) {

+			} else if (IsASCII(ch) && isalpha(ch) && (chPrev == '%')) {

 				styler.ColourTo(i - 2, StateToPrint);

 				state = SCE_H_SGML_ENTITY;

 			} else if (ch == '#') {

@@ -1312,6 +1312,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 				styler.ColourTo(i - 2, StateToPrint);

 				state = SCE_H_SGML_COMMENT;

 			}

+			break;

 		case SCE_H_SGML_DOUBLESTRING:

 			if (ch == '\"') {

 				styler.ColourTo(i, StateToPrint);

@@ -1351,7 +1352,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 			}

 			break;

 		case SCE_H_SGML_SPECIAL:

-			if (!(isascii(ch) && isupper(ch))) {

+			if (!(IsASCII(ch) && isupper(ch))) {

 				styler.ColourTo(i - 1, StateToPrint);

 				if (isalnum(ch)) {

 					state = SCE_H_SGML_ERROR;

@@ -1364,7 +1365,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 			if (ch == ';') {

 				styler.ColourTo(i, StateToPrint);

 				state = SCE_H_SGML_DEFAULT;

-			} else if (!(isascii(ch) && isalnum(ch)) && ch != '-' && ch != '.') {

+			} else if (!(IsASCII(ch) && isalnum(ch)) && ch != '-' && ch != '.') {

 				styler.ColourTo(i, SCE_H_SGML_ERROR);

 				state = SCE_H_SGML_DEFAULT;

 			}

@@ -1374,9 +1375,9 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 				styler.ColourTo(i, StateToPrint);

 				state = SCE_H_DEFAULT;

 			}

-			if (ch != '#' && !(isascii(ch) && isalnum(ch))	// Should check that '#' follows '&', but it is unlikely anyway...

+			if (ch != '#' && !(IsASCII(ch) && isalnum(ch))	// Should check that '#' follows '&', but it is unlikely anyway...

 				&& ch != '.' && ch != '-' && ch != '_' && ch != ':') { // valid in XML

-				if (!isascii(ch))	// Possibly start of a multibyte character so don't allow this byte to be in entity style

+				if (!IsASCII(ch))	// Possibly start of a multibyte character so don't allow this byte to be in entity style

 					styler.ColourTo(i-1, SCE_H_TAGUNKNOWN);

 				else

 					styler.ColourTo(i, SCE_H_TAGUNKNOWN);

@@ -1702,7 +1703,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
 		case SCE_HJ_REGEX:

 			if (ch == '\r' || ch == '\n' || ch == '/') {

 				if (ch == '/') {

-					while (isascii(chNext) && islower(chNext)) {   // gobble regex flags

+					while (IsASCII(chNext) && islower(chNext)) {   // gobble regex flags

 						i++;

 						ch = chNext;

 						chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));