diff --git a/PowerEditor/src/functionList.xml b/PowerEditor/src/functionList.xml
index 6ad619ca4..354dfbb34 100644
--- a/PowerEditor/src/functionList.xml
+++ b/PowerEditor/src/functionList.xml
@@ -37,22 +37,22 @@
 						<nameExpr expr="[\w]+"/>
 					</className>
 					<function
-						mainExpr="^[\t ]*((static|const|virtual)[\s]+)?[\w]+([\s]+|\*[\s]+|[\s]+\*|[\s]+\*[\s]+)([\w_]+[\s]*::)?(?!(if|whil|for))[\w_]+[\s]*\([\n\w_,*&amp;\s]*\)([\s]*const[\s]*)?[\n\s]*\{">
+						mainExpr="^[\t ]*((static|const|virtual)[\s]+)?([\w]+([\s]+|\*[\s]+|[\s]+\*|[\s]+\*[\s]+))?([\w_]+[\s]*::)?(?!(if|while|for|switch))[\w_~]+[\s]*\([\n\w_,*&amp;\s]*\)([\s]*const[\s]*)?[\n\s]*\{">
 						<functionName>
-							<funcNameExpr expr="(?!(if|whil|for))[\w_]+[\s]*\("/>
-							<funcNameExpr expr="(?!(if|whil|for))[\w_]+"/>
+							<funcNameExpr expr="(?!(if|while|for|switch))[\w_~]+[\s]*\("/>
+							<funcNameExpr expr="(?!(if|while|for|switch))[\w_~]+"/>
 						</functionName>
 					</function>
 				</classRange>
 			</parser>
 			<parser id="c_function" displayName="C source">
 				<function
-				    mainExpr="^[\t ]*((static|const|virtual)[\s]+)?[\w]+([\s]+|\*[\s]+|[\s]+\*|[\s]+\*[\s]+)([\w_]+[\s]*::)?(?!(if|whil|for))[\w_]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{"
+				    mainExpr="^[\t ]*((static|const|virtual)[\s]+)?[\w]+([\s]+|\*[\s]+|[\s]+\*|[\s]+\*[\s]+)([\w_]+[\s]*::)?(?!(if|while|for|switch))[\w_~]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{"
 					displayMode="$className->$functionName">
 					<comment expr="((/\*.*?\*)/|(//.*?$))" />
 					<functionName>
-						<nameExpr expr="(?!(if|whil|for))[\w_]+[\s]*\("/>
-						<nameExpr expr="(?!(if|whil|for))[\w_]+"/>
+						<nameExpr expr="(?!(if|while|for|switch))[\w_~]+[\s]*\("/>
+						<nameExpr expr="(?!(if|while|for|switch))[\w_~]+"/>
 					</functionName>
 					<className>
 						<nameExpr expr="[\w_]+(?=[\s]*::)"/>
@@ -66,8 +66,8 @@
 				    mainExpr="function[\s]+[\w]*[\s]+\([^\)\(]*\)[\n\s]*\{"
 					displayMode="$className->$functionName">
 					<functionName>
-						<nameExpr expr="(?!(if|whil|for))[\w_]+[\s]*\("/>
-						<nameExpr expr="(?!(if|whil|for))[\w_]+"/>
+						<nameExpr expr="(?!(if|while|for))[\w_]+[\s]*\("/>
+						<nameExpr expr="(?!(if|while|for))[\w_]+"/>
 					</functionName>
 					<className>
 						<nameExpr expr="[\w_]+(?=[\s]*::)"/>
@@ -89,20 +89,20 @@
 						<nameExpr expr="[\w]+"/>
 					</className>
 					<function
-						mainExpr="^[\t ]*((static|const|virtual)[\s]+)?[\w]+([\s]+|\*[\s]+|[\s]+\*|[\s]+\*[\s]+)([\w_]+[\s]*::)?(?!(if|whil|for))[\w_]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{">
+						mainExpr="^[\t ]*((static|const|virtual)[\s]+)?([\w]+([\s]+|\*[\s]+|[\s]+\*|[\s]+\*[\s]+))?([\w_]+[\s]*::)?(?!(if|while|for|switch))[\w_~]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{">
 						<functionName>
-							<funcNameExpr expr="(?!(if|whil|for))[\w_]+[\s]*\("/>
-							<funcNameExpr expr="(?!(if|whil|for))[\w_]+"/>
+							<funcNameExpr expr="(?!(if|while|for|switch))[\w_~]+[\s]*\("/>
+							<funcNameExpr expr="(?!(if|while|for|switch))[\w_~]+"/>
 						</functionName>
 					</function>
 				</classRange>
 				<function
-				    mainExpr="^[\t ]*((static|const|virtual)[\s]+)?[\w]+([\s]+|\*[\s]+|[\s]+\*|[\s]+\*[\s]+)([\w_]+[\s]*::)?(?!(if|whil|for))[\w_]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{"
+				    mainExpr="^[\t ]*((static|const|virtual)[\s]+)?([\w]+([\s]+|(\*|&)[\s]+|[\s]+(\*|&)|[\s]+(\*|&)[\s]+))?([\w_]+[\s]*::)?(?!(if|while|for|switch))[\w_~\+\*\-=\!]+[\s]*\([^\)\(]*\)([\s]*(const|(:[^\{]+))[\s]*)?[\n\s]*\{"
 					displayMode="$className->$functionName">
 					<comment expr="((/\*.*?\*)/|(//.*?$))" />
 					<functionName>
-						<nameExpr expr="(?!(if|whil|for))[\w_]+[\s]*\("/>
-						<nameExpr expr="(?!(if|whil|for))[\w_]+"/>
+						<nameExpr expr="(?!(if|while|for|switch))[\w_~\+\*\-=\!]+[\s]*\("/>
+						<nameExpr expr="(?!(if|while|for|switch))[\w_~\+\*\-=\!]+"/>
 					</functionName>
 					<className>
 						<nameExpr expr="[\w_]+(?=[\s]*::)"/>