From 8f3df2258e3eaa62b69d80b2196bcc0555611cc4 Mon Sep 17 00:00:00 2001 From: iahung2 <156915310+iahung2@users.noreply.github.com> Date: Thu, 7 Mar 2024 20:25:14 +0700 Subject: [PATCH 1/4] Update syntaxdefinitionmanager.cpp --- src/eepp/ui/doc/syntaxdefinitionmanager.cpp | 127 +++++++++++++++++++- 1 file changed, 126 insertions(+), 1 deletion(-) diff --git a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp index 654a36411..4588aea20 100644 --- a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp +++ b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp @@ -775,6 +775,130 @@ static void addGo() { "//" } ); } +static void addAdept() { + SyntaxDefinitionManager::instance()->add( + { "Adept", + { "%.adept$" }, + { + { { "//.-\n" }, "comment" }, + { { "/%*", "%*/" }, "comment" }, + { { "\"", "\"", "\\" }, "string" }, + { { "'", "'ub", "\\" }, "string" }, + { { "'", "'", "\\" }, "string" }, + { { "0[oO_][0-7]+" }, "number" }, + { { "-?0x[%x_]+" }, "number" }, + { { "-?%d+_%d" }, "number" }, + { { "-?%d+[%d%.eE]*f?" }, "number" }, + { { "-?%.?%d+f?" }, "number" }, + { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, + { { ":=" }, "operator" }, + { { "[%a_][%w_]*%f[(]" }, "function" }, + { { "[%a_][%w_]*" }, "symbol" }, + }, + { + { "POD", "keyword" }, + { "alias", "keyword" }, + { "and", "keyword" }, + { "as", "keyword" }, + { "at", "keyword" }, + { "break", "keyword" }, + { "case", "keyword" }, + { "cast", "keyword" }, + { "continue", "keyword" }, + { "def", "keyword" }, + { "default", "keyword" }, + { "defer", "keyword" }, + { "delete", "keyword" }, + { "each", "keyword" }, + { "else", "keyword" }, + { "enum", "keyword" }, + { "external", "keyword" }, + { "fallthrough", "keyword" }, + { "for", "keyword" }, + { "foreign", "keyword" }, + { "func", "keyword" }, + { "funcptr", "keyword" }, + { "global", "keyword" }, + { "if", "keyword" }, + { "import", "keyword" }, + { "in", "keyword" }, + { "inout", "keyword" }, + { "new", "keyword" }, + { "or", "keyword" }, + { "out", "keyword" }, + { "packed", "keyword" }, + { "private", "keyword" }, + { "public", "keyword" }, + { "repeat", "keyword" }, + { "return", "keyword" }, + { "sizeof", "keyword" }, + { "static", "keyword" }, + { "stdcall", "keyword" }, + { "struct", "keyword" }, + { "switch", "keyword" }, + { "typeinfo", "keyword" }, + { "unless", "keyword" }, + { "until", "keyword" }, + { "while", "keyword" }, + { "va_start", "keyword" }, + { "va_end", "keyword" }, + { "va_copy", "keyword" }, + { "va_arg", "keyword" }, + { "verbatim", "keyword" }, + { "void", "keyword" }, + { "union", "keyword" }, + { "exhaustive", "keyword" }, + { "const", "keyword" }, + { "define", "keyword" }, + { "namespace", "keyword" }, + { "using", "keyword" }, + { "implicit", "keyword" }, + { "pragma", "keyword" }, + { "elif", "keyword" }, + { "llvm_asm", "keyword" }, + { "thread_local", "keyword" }, + { "typenameof", "keyword" }, + { "embed", "keyword" }, + { "alignof", "keyword" }, + { "record", "keyword" }, + { "constructor", "keyword" }, + { "class", "keyword" }, + { "virtual", "keyword" }, + { "override", "keyword" }, + { "extends", "keyword" }, + { "assert", "keyword" }, + { "undef", "keyword" }, + { "this", "keyword" }, + { "it", "keyword" }, + { "idx", "keyword" }, + { "bool", "keyword2" }, + { "ptr", "keyword2" }, + { "byte", "keyword2" }, + { "ubyte", "keyword2" }, + { "short", "keyword2" }, + { "ushort", "keyword2" }, + { "int", "keyword2" }, + { "uint", "keyword2" }, + { "long", "keyword2" }, + { "ulong", "keyword2" }, + { "usize", "keyword2" }, + { "double", "keyword2" }, + { "float", "keyword2" }, + { "String", "keyword2" }, + { "List", "keyword2" }, + { "Array", "keyword2" }, + { "Matrix4f", "keyword2" }, + { "Vector3f", "keyword2" }, + { "FILE", "keyword2" }, + { "va_list", "keyword2" }, + { "successful", "keyword2" }, + { "true", "literal" }, + { "false", "literal" }, + { "null", "literal" }, + }, + "//" } ); +} + static void addHaskell() { SyntaxDefinitionManager::instance()->add( { "Haskell", @@ -1683,7 +1807,7 @@ SyntaxDefinitionManager::SyntaxDefinitionManager() { if ( ms_singleton == nullptr ) ms_singleton = this; - mDefinitions.reserve( 84 ); + mDefinitions.reserve( 85 ); // Register some languages support. addPlainText(); @@ -1708,6 +1832,7 @@ SyntaxDefinitionManager::SyntaxDefinitionManager() { addGDScript(); addGLSL(); addGo(); + addAdept(); addGraphQL(); addHaskell(); addHare(); From 7e61e83088f40ed1be893e715e510d269a95ac98 Mon Sep 17 00:00:00 2001 From: iahung2 <156915310+iahung2@users.noreply.github.com> Date: Fri, 8 Mar 2024 00:34:42 +0700 Subject: [PATCH 2/4] Update syntaxdefinitionmanager.cpp --- src/eepp/ui/doc/syntaxdefinitionmanager.cpp | 127 +------------------- 1 file changed, 2 insertions(+), 125 deletions(-) diff --git a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp index 4588aea20..96e220616 100644 --- a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp +++ b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -775,130 +776,6 @@ static void addGo() { "//" } ); } -static void addAdept() { - SyntaxDefinitionManager::instance()->add( - { "Adept", - { "%.adept$" }, - { - { { "//.-\n" }, "comment" }, - { { "/%*", "%*/" }, "comment" }, - { { "\"", "\"", "\\" }, "string" }, - { { "'", "'ub", "\\" }, "string" }, - { { "'", "'", "\\" }, "string" }, - { { "0[oO_][0-7]+" }, "number" }, - { { "-?0x[%x_]+" }, "number" }, - { { "-?%d+_%d" }, "number" }, - { { "-?%d+[%d%.eE]*f?" }, "number" }, - { { "-?%.?%d+f?" }, "number" }, - { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, - { { ":=" }, "operator" }, - { { "[%a_][%w_]*%f[(]" }, "function" }, - { { "[%a_][%w_]*" }, "symbol" }, - }, - { - { "POD", "keyword" }, - { "alias", "keyword" }, - { "and", "keyword" }, - { "as", "keyword" }, - { "at", "keyword" }, - { "break", "keyword" }, - { "case", "keyword" }, - { "cast", "keyword" }, - { "continue", "keyword" }, - { "def", "keyword" }, - { "default", "keyword" }, - { "defer", "keyword" }, - { "delete", "keyword" }, - { "each", "keyword" }, - { "else", "keyword" }, - { "enum", "keyword" }, - { "external", "keyword" }, - { "fallthrough", "keyword" }, - { "for", "keyword" }, - { "foreign", "keyword" }, - { "func", "keyword" }, - { "funcptr", "keyword" }, - { "global", "keyword" }, - { "if", "keyword" }, - { "import", "keyword" }, - { "in", "keyword" }, - { "inout", "keyword" }, - { "new", "keyword" }, - { "or", "keyword" }, - { "out", "keyword" }, - { "packed", "keyword" }, - { "private", "keyword" }, - { "public", "keyword" }, - { "repeat", "keyword" }, - { "return", "keyword" }, - { "sizeof", "keyword" }, - { "static", "keyword" }, - { "stdcall", "keyword" }, - { "struct", "keyword" }, - { "switch", "keyword" }, - { "typeinfo", "keyword" }, - { "unless", "keyword" }, - { "until", "keyword" }, - { "while", "keyword" }, - { "va_start", "keyword" }, - { "va_end", "keyword" }, - { "va_copy", "keyword" }, - { "va_arg", "keyword" }, - { "verbatim", "keyword" }, - { "void", "keyword" }, - { "union", "keyword" }, - { "exhaustive", "keyword" }, - { "const", "keyword" }, - { "define", "keyword" }, - { "namespace", "keyword" }, - { "using", "keyword" }, - { "implicit", "keyword" }, - { "pragma", "keyword" }, - { "elif", "keyword" }, - { "llvm_asm", "keyword" }, - { "thread_local", "keyword" }, - { "typenameof", "keyword" }, - { "embed", "keyword" }, - { "alignof", "keyword" }, - { "record", "keyword" }, - { "constructor", "keyword" }, - { "class", "keyword" }, - { "virtual", "keyword" }, - { "override", "keyword" }, - { "extends", "keyword" }, - { "assert", "keyword" }, - { "undef", "keyword" }, - { "this", "keyword" }, - { "it", "keyword" }, - { "idx", "keyword" }, - { "bool", "keyword2" }, - { "ptr", "keyword2" }, - { "byte", "keyword2" }, - { "ubyte", "keyword2" }, - { "short", "keyword2" }, - { "ushort", "keyword2" }, - { "int", "keyword2" }, - { "uint", "keyword2" }, - { "long", "keyword2" }, - { "ulong", "keyword2" }, - { "usize", "keyword2" }, - { "double", "keyword2" }, - { "float", "keyword2" }, - { "String", "keyword2" }, - { "List", "keyword2" }, - { "Array", "keyword2" }, - { "Matrix4f", "keyword2" }, - { "Vector3f", "keyword2" }, - { "FILE", "keyword2" }, - { "va_list", "keyword2" }, - { "successful", "keyword2" }, - { "true", "literal" }, - { "false", "literal" }, - { "null", "literal" }, - }, - "//" } ); -} - static void addHaskell() { SyntaxDefinitionManager::instance()->add( { "Haskell", @@ -1811,6 +1688,7 @@ SyntaxDefinitionManager::SyntaxDefinitionManager() { // Register some languages support. addPlainText(); + addAdept(); addAngelScript(); addBash(); addBatchScript(); @@ -1832,7 +1710,6 @@ SyntaxDefinitionManager::SyntaxDefinitionManager() { addGDScript(); addGLSL(); addGo(); - addAdept(); addGraphQL(); addHaskell(); addHare(); From 0c185d913234ff68106732d6938e36a4ec9a70c7 Mon Sep 17 00:00:00 2001 From: iahung2 <156915310+iahung2@users.noreply.github.com> Date: Fri, 8 Mar 2024 00:35:51 +0700 Subject: [PATCH 3/4] Move it to its own files --- src/eepp/ui/doc/languages/adept.cpp | 130 ++++++++++++++++++++++++++++ src/eepp/ui/doc/languages/adept.hpp | 10 +++ 2 files changed, 140 insertions(+) create mode 100644 src/eepp/ui/doc/languages/adept.cpp create mode 100644 src/eepp/ui/doc/languages/adept.hpp diff --git a/src/eepp/ui/doc/languages/adept.cpp b/src/eepp/ui/doc/languages/adept.cpp new file mode 100644 index 000000000..f3bb47931 --- /dev/null +++ b/src/eepp/ui/doc/languages/adept.cpp @@ -0,0 +1,130 @@ +#include +#include + +namespace EE { namespace UI { namespace Doc { namespace Language { + +void addAdept() { + SyntaxDefinitionManager::instance()->add( + { "Adept", + { "%.adept$" }, + { + { { "//.-\n" }, "comment" }, + { { "/%*", "%*/" }, "comment" }, + { { "\"", "\"", "\\" }, "string" }, + { { "'", "'ub", "\\" }, "string" }, + { { "'", "'", "\\" }, "string" }, + { { "0[oO_][0-7]+" }, "number" }, + { { "-?0x[%x_]+" }, "number" }, + { { "-?%d+_%d" }, "number" }, + { { "-?%d+[%d%.eE]*f?" }, "number" }, + { { "-?%.?%d+f?" }, "number" }, + { { "[%+%-=/%*%^%%<>!~|&]" }, "operator" }, + { { ":=" }, "operator" }, + { { "[%a_][%w_]*%f[(]" }, "function" }, + { { "[%a_][%w_]*" }, "symbol" }, + }, + { + { "POD", "keyword" }, + { "alias", "keyword" }, + { "and", "keyword" }, + { "as", "keyword" }, + { "at", "keyword" }, + { "break", "keyword" }, + { "case", "keyword" }, + { "cast", "keyword" }, + { "continue", "keyword" }, + { "def", "keyword" }, + { "default", "keyword" }, + { "defer", "keyword" }, + { "delete", "keyword" }, + { "each", "keyword" }, + { "else", "keyword" }, + { "enum", "keyword" }, + { "external", "keyword" }, + { "fallthrough", "keyword" }, + { "for", "keyword" }, + { "foreign", "keyword" }, + { "func", "keyword" }, + { "funcptr", "keyword" }, + { "global", "keyword" }, + { "if", "keyword" }, + { "import", "keyword" }, + { "in", "keyword" }, + { "inout", "keyword" }, + { "new", "keyword" }, + { "or", "keyword" }, + { "out", "keyword" }, + { "packed", "keyword" }, + { "private", "keyword" }, + { "public", "keyword" }, + { "repeat", "keyword" }, + { "return", "keyword" }, + { "sizeof", "keyword" }, + { "static", "keyword" }, + { "stdcall", "keyword" }, + { "struct", "keyword" }, + { "switch", "keyword" }, + { "typeinfo", "keyword" }, + { "unless", "keyword" }, + { "until", "keyword" }, + { "while", "keyword" }, + { "va_start", "keyword" }, + { "va_end", "keyword" }, + { "va_copy", "keyword" }, + { "va_arg", "keyword" }, + { "verbatim", "keyword" }, + { "void", "keyword" }, + { "union", "keyword" }, + { "exhaustive", "keyword" }, + { "const", "keyword" }, + { "define", "keyword" }, + { "namespace", "keyword" }, + { "using", "keyword" }, + { "implicit", "keyword" }, + { "pragma", "keyword" }, + { "elif", "keyword" }, + { "llvm_asm", "keyword" }, + { "thread_local", "keyword" }, + { "typenameof", "keyword" }, + { "embed", "keyword" }, + { "alignof", "keyword" }, + { "record", "keyword" }, + { "constructor", "keyword" }, + { "class", "keyword" }, + { "virtual", "keyword" }, + { "override", "keyword" }, + { "extends", "keyword" }, + { "assert", "keyword" }, + { "undef", "keyword" }, + { "this", "keyword" }, + { "it", "keyword" }, + { "idx", "keyword" }, + { "bool", "keyword2" }, + { "ptr", "keyword2" }, + { "byte", "keyword2" }, + { "ubyte", "keyword2" }, + { "short", "keyword2" }, + { "ushort", "keyword2" }, + { "int", "keyword2" }, + { "uint", "keyword2" }, + { "long", "keyword2" }, + { "ulong", "keyword2" }, + { "usize", "keyword2" }, + { "double", "keyword2" }, + { "float", "keyword2" }, + { "String", "keyword2" }, + { "List", "keyword2" }, + { "Array", "keyword2" }, + { "Matrix4f", "keyword2" }, + { "Vector3f", "keyword2" }, + { "FILE", "keyword2" }, + { "va_list", "keyword2" }, + { "successful", "keyword2" }, + { "true", "literal" }, + { "false", "literal" }, + { "null", "literal" }, + }, + "//" } ); +} + +}}}} // namespace EE::UI::Doc::Language diff --git a/src/eepp/ui/doc/languages/adept.hpp b/src/eepp/ui/doc/languages/adept.hpp new file mode 100644 index 000000000..2927f487f --- /dev/null +++ b/src/eepp/ui/doc/languages/adept.hpp @@ -0,0 +1,10 @@ +#ifndef EE_UI_DOC_ADEPT +#define EE_UI_DOC_ADEPT + +namespace EE { namespace UI { namespace Doc { namespace Language { + +extern void addAdept(); + +}}}} + +#endif From e9d0f432496cb557a199a02f17bea14c42c81b55 Mon Sep 17 00:00:00 2001 From: iahung2 <156915310+iahung2@users.noreply.github.com> Date: Fri, 8 Mar 2024 00:37:24 +0700 Subject: [PATCH 4/4] Update syntaxdefinitionmanager.cpp --- src/eepp/ui/doc/syntaxdefinitionmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp index 96e220616..20c46f545 100644 --- a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp +++ b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp @@ -1684,7 +1684,7 @@ SyntaxDefinitionManager::SyntaxDefinitionManager() { if ( ms_singleton == nullptr ) ms_singleton = this; - mDefinitions.reserve( 85 ); + mDefinitions.reserve( 86 ); // Register some languages support. addPlainText();