Add final and override for c++ 11 in fuctionList (closes #790)

, see:
- http://en.cppreference.com/w/cpp/language/final
- http://en.cppreference.com/w/cpp/language/override
This commit is contained in:
Christian Grasser 2015-08-23 14:29:16 +02:00 committed by Don Ho
parent 429dfb0ab8
commit d8acff80d0

View File

@ -121,7 +121,7 @@ http://notepad-plus-plus.org/features/function-list.html
<parser id="c_cpp_function" displayName="C++ Class" commentExpr="((/\*.*?\*)/|(//.*?$))"> <parser id="c_cpp_function" displayName="C++ Class" commentExpr="((/\*.*?\*)/|(//.*?$))">
<classRange <classRange
mainExpr="^[\t ]*(class|struct)[\t ]+[\w]+[\s]*(:[\s]*(public|protected|private)[\s]+[\w]+[\s]*)?\{" mainExpr="^[\t ]*(class|struct)[\t ]+[\w]+[\s]*(final)?[\s]*(:[\s]*(public|protected|private)[\s]+[\w]+[\s]*)?\{"
openSymbole = "\{" openSymbole = "\{"
closeSymbole = "\}" closeSymbole = "\}"
displayMode="node"> displayMode="node">
@ -131,7 +131,7 @@ http://notepad-plus-plus.org/features/function-list.html
<nameExpr expr="[\w]+"/> <nameExpr expr="[\w]+"/>
</className> </className>
<function <function
mainExpr="^[\t ]*((static|const|virtual)[\s]+)?([\w]+([\s]+[\w]+)?([\s]+|(\*|\*\*|&amp;)[\s]+|[\s]+(\*|\*\*|&amp;)|[\s]+(\*|\*\*|&amp;)[\s]+))?([\w_]+[\s]*::)?(?!(if|while|for|switch))[\w_~]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{"> mainExpr="^[\t ]*((static|const|virtual)[\s]+)?([\w]+([\s]+[\w]+)?([\s]+|(\*|\*\*|&amp;)[\s]+|[\s]+(\*|\*\*|&amp;)|[\s]+(\*|\*\*|&amp;)[\s]+))?([\w_]+[\s]*::)?(?!(if|while|for|switch))[\w_~]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?([\s]*(final|override|final[\s]*override|override[\s]*final)[\s]*)?[\n\s]*\{">
<functionName> <functionName>
<funcNameExpr expr="(?!(if|while|for|switch))[\w_~]+[\s]*\("/> <funcNameExpr expr="(?!(if|while|for|switch))[\w_~]+[\s]*\("/>
<funcNameExpr expr="(?!(if|while|for|switch))[\w_~]+"/> <funcNameExpr expr="(?!(if|while|for|switch))[\w_~]+"/>