From 9dc109f5990a707ca69235608fa2f1fbd223ea82 Mon Sep 17 00:00:00 2001 From: MAPJe Date: Thu, 24 Nov 2016 07:46:54 +0100 Subject: [PATCH] FunctionList Update 2 * Implemented XML Schema for functionList.xml. * functionList.xml: 1. new layout of association map; 2. placed `displayName` before `id` attribute where applicable; 3. utilize inline comments; 4. parsers added: 'XML for FunctionList', Assembly, AutoIt3, InnoSetup, PowerShell, KRL, Sinumerik and UniVerse BASIC; 5. parsers improved: C, Java, Batch, Bash, XML and NSIS; 6. replaced `[\t\x20]` with `\h` where possible; 7. using upper case notation for hexadecimal values e.g. `\x7F-\xFF`; Closes #2602 --- PowerEditor/src/functionList.xml | 1535 ++++++++++++++++++++++------ Test/FunctionList/functionList.xsd | 117 +++ 2 files changed, 1344 insertions(+), 308 deletions(-) create mode 100644 Test/FunctionList/functionList.xsd diff --git a/PowerEditor/src/functionList.xml b/PowerEditor/src/functionList.xml index c9b677ac..6ce3a447 100644 --- a/PowerEditor/src/functionList.xml +++ b/PowerEditor/src/functionList.xml @@ -1,15 +1,19 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - + + + Note(s): + Not required, just a guide. + Suffix Indicates + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + _class parser has a class part only + _function parser has a function part only + _syntax parser has both a class and function part + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + commentExpr="(?s:/\*.*?\*/)|(?m-s://.*?$)" + > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + closeSymbole="\}" + > + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + mainExpr="^\s*((static|public|protected|private|final)*(\s+(static|public|protected|private|final))+\s+)?(function\s+)+(\w+(\s+\w+)?(\s+|\*\s+|\s+\*|\s+\*\s+))?(\w+\s*::)?(?!(if|while|for|switch))[\w~]+\s*\([^\{]*\{" + > + + + + + + - - - - - - + mainExpr="^\s*function\s+\w+\(" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Test/FunctionList/functionList.xsd b/Test/FunctionList/functionList.xsd new file mode 100644 index 00000000..40db0474 --- /dev/null +++ b/Test/FunctionList/functionList.xsd @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +