Move MakeLowerCase into CharacterSet.h as that is where MakeUpperCase is.

Change the argument and return type of MakeUpperCase to match MakeLowerCase.
Move StyleContext::MatchIgnoreCase into StyleContext.cxx as the change of
header for MakeLowerCase couldn't be reconciled easily.
Add casts as needed.

1 files changed, 1 insertions, 22 deletions

diff --git a/lexlib/StyleContext.h b/lexlib/StyleContext.h
index c8aa4ab02..6cbda358e 100644
--- a/lexlib/StyleContext.h
+++ b/lexlib/StyleContext.h
@@ -12,13 +12,6 @@
 namespace Scintilla {
 #endif
 
-static inline int MakeLowerCase(int ch) {
-	if (ch < 'A' || ch > 'Z')
-		return ch;
-	else
-		return ch - 'A' + 'a';
-}
-
 // 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
@@ -204,22 +197,8 @@ public:
 		}
 		return true;
 	}
-	bool MatchIgnoreCase(const char *s) {
-		if (MakeLowerCase(ch) != static_cast<unsigned char>(*s))
-			return false;
-		s++;
-		if (MakeLowerCase(chNext) != static_cast<unsigned char>(*s))
-			return false;
-		s++;
-		for (int n=2; *s; n++) {
-			if (static_cast<unsigned char>(*s) !=
-				MakeLowerCase(static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+n, 0))))
-				return false;
-			s++;
-		}
-		return true;
-	}
 	// Non-inline
+	bool MatchIgnoreCase(const char *s);
 	void GetCurrent(char *s, Sci_PositionU len);
 	void GetCurrentLowered(char *s, Sci_PositionU len);
 };