From 77a6d256a6463e0444cf77ce5541b496097c6662 Mon Sep 17 00:00:00 2001 From: Tobias Hienzsch Date: Fri, 20 Oct 2023 09:38:06 +0200 Subject: [PATCH] [gui_extra] Disable code tokenisers. Broken on MSVC --- module/lua_juce/lua_juce.cpp | 8 ++--- .../lua_juce_gui_extra/lua_juce_gui_extra.cpp | 11 +++--- .../lua_juce_gui_extra/lua_juce_gui_extra.hpp | 8 ++--- tool/jml-docgen/README.md | 34 ------------------- tool/jml-docgen/main.lua | 8 +---- 5 files changed, 15 insertions(+), 54 deletions(-) diff --git a/module/lua_juce/lua_juce.cpp b/module/lua_juce/lua_juce.cpp index a73bba4..deb2575 100644 --- a/module/lua_juce/lua_juce.cpp +++ b/module/lua_juce/lua_juce.cpp @@ -92,10 +92,10 @@ auto allModules(sol::state& lua) -> void // juce_gui_extra juce_CodeDocument(table); - juce_CodeTokeniser(table); - juce_CPlusPlusCodeTokeniser(table); - juce_LuaTokeniser(table); - juce_XmlTokeniser(table); + // juce_CodeTokeniser(table); + // juce_CPlusPlusCodeTokeniser(table); + // juce_LuaTokeniser(table); + // juce_XmlTokeniser(table); // juce_audio_processors juce_AudioProcessor(table); diff --git a/module/lua_juce_gui_extra/lua_juce_gui_extra.cpp b/module/lua_juce_gui_extra/lua_juce_gui_extra.cpp index d619ef8..d563bfa 100644 --- a/module/lua_juce_gui_extra/lua_juce_gui_extra.cpp +++ b/module/lua_juce_gui_extra/lua_juce_gui_extra.cpp @@ -1,7 +1,8 @@ #include -#include "code_editor/CPlusPlusCodeTokeniser.cpp" // NOLINT -#include "code_editor/CodeDocument.cpp" // NOLINT -#include "code_editor/CodeTokeniser.cpp" // NOLINT -#include "code_editor/LuaTokeniser.cpp" // NOLINT -#include "code_editor/XmlTokeniser.cpp" // NOLINT +#include "code_editor/CodeDocument.cpp" // NOLINT + +// #include "code_editor/CPlusPlusCodeTokeniser.cpp" // NOLINT +// #include "code_editor/CodeTokeniser.cpp" // NOLINT +// #include "code_editor/LuaTokeniser.cpp" // NOLINT +// #include "code_editor/XmlTokeniser.cpp" // NOLINT diff --git a/module/lua_juce_gui_extra/lua_juce_gui_extra.hpp b/module/lua_juce_gui_extra/lua_juce_gui_extra.hpp index afafec4..d6faf29 100644 --- a/module/lua_juce_gui_extra/lua_juce_gui_extra.hpp +++ b/module/lua_juce_gui_extra/lua_juce_gui_extra.hpp @@ -25,8 +25,8 @@ END_JUCE_MODULE_DECLARATION namespace lua_juce { auto juce_CodeDocument(sol::table& state) -> void; -auto juce_CodeTokeniser(sol::table& state) -> void; -auto juce_CPlusPlusCodeTokeniser(sol::table& state) -> void; -auto juce_LuaTokeniser(sol::table& state) -> void; -auto juce_XmlTokeniser(sol::table& state) -> void; +// auto juce_CodeTokeniser(sol::table& state) -> void; +// auto juce_CPlusPlusCodeTokeniser(sol::table& state) -> void; +// auto juce_LuaTokeniser(sol::table& state) -> void; +// auto juce_XmlTokeniser(sol::table& state) -> void; } // namespace lua_juce diff --git a/tool/jml-docgen/README.md b/tool/jml-docgen/README.md index 955da8b..a14a5c9 100644 --- a/tool/jml-docgen/README.md +++ b/tool/jml-docgen/README.md @@ -71,11 +71,7 @@ - [ToggleButton](#ToggleButton) - [TreeView](#TreeView) - [juce_gui_extra](#juce_gui_extra) - - [CPlusPlusCodeTokeniser](#CPlusPlusCodeTokeniser) - [CodeDocument](#CodeDocument) - - [CodeTokeniser](#CodeTokeniser) - - [LuaTokeniser](#LuaTokeniser) - - [XmlTokeniser](#XmlTokeniser) ## juce_audio_basics @@ -1793,14 +1789,6 @@ juce.TreeView.setRootItemVisible(...) ## juce_gui_extra -## CPlusPlusCodeTokeniser - -```lua -juce.CPlusPlusCodeTokeniser.__eq(...) -juce.CPlusPlusCodeTokeniser.isReservedKeyword(...) -juce.CPlusPlusCodeTokeniser.new(...) -``` - ## CodeDocument ```lua @@ -1832,25 +1820,3 @@ juce.CodeDocument.setSavePoint(...) juce.CodeDocument.undo(...) juce.CodeDocument.writeToStream(...) ``` - -## CodeTokeniser - -```lua -juce.CodeTokeniser.__eq(...) -juce.CodeTokeniser.getDefaultColourScheme(...) -juce.CodeTokeniser.new(...) -``` - -## LuaTokeniser - -```lua -juce.LuaTokeniser.__eq(...) -juce.LuaTokeniser.new(...) -``` - -## XmlTokeniser - -```lua -juce.XmlTokeniser.__eq(...) -juce.XmlTokeniser.new(...) -``` diff --git a/tool/jml-docgen/main.lua b/tool/jml-docgen/main.lua index c718335..c024142 100644 --- a/tool/jml-docgen/main.lua +++ b/tool/jml-docgen/main.lua @@ -72,13 +72,7 @@ local classes = { juce.ToggleButton.new(juce.String.new("")), juce.TreeView.new(juce.String.new("")), }, - juce_gui_extra = { - juce.CodeDocument.new(), - juce.abstract.CodeTokeniser, - juce.CPlusPlusCodeTokeniser.new(), - juce.LuaTokeniser.new(), - juce.XmlTokeniser.new(), - }, + juce_gui_extra = {juce.CodeDocument.new()}, juce_audio_processors = {juce.abstract.AudioProcessor}, }