From 64408b8fd13e17cafa47a38c10fff8a93de70b24 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Thu, 30 Mar 2023 05:36:21 -0700 Subject: [PATCH] Scripting: Tidy up public headers --- include/mgba/script.h | 16 ++++++++++++++ include/mgba/script/base.h | 21 +++++++++++++++++++ include/mgba/script/context.h | 2 -- .../qt/scripting/ScriptingController.cpp | 3 +-- src/script/docgen.c | 1 + src/script/stdlib.c | 3 ++- src/script/test/classes.c | 4 +--- src/script/test/context.c | 4 +--- src/script/test/input.c | 4 +--- src/script/test/stdlib.c | 4 +--- src/script/test/storage.c | 3 +-- src/script/test/types.c | 4 +--- 12 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 include/mgba/script.h create mode 100644 include/mgba/script/base.h diff --git a/include/mgba/script.h b/include/mgba/script.h new file mode 100644 index 000000000..3497cd0d0 --- /dev/null +++ b/include/mgba/script.h @@ -0,0 +1,16 @@ +/* Copyright (c) 2013-2023 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef M_SCRIPT_H +#define M_SCRIPT_H + +#include +#include +#include +#include +#include +#include + +#endif diff --git a/include/mgba/script/base.h b/include/mgba/script/base.h new file mode 100644 index 000000000..de8eef033 --- /dev/null +++ b/include/mgba/script/base.h @@ -0,0 +1,21 @@ +/* Copyright (c) 2013-2023 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef M_SCRIPT_BASE_H +#define M_SCRIPT_BASE_H + +#include + +CXX_GUARD_START + +#include + +struct mScriptContext; +void mScriptContextAttachStdlib(struct mScriptContext* context); +void mScriptContextAttachSocket(struct mScriptContext* context); + +CXX_GUARD_END + +#endif diff --git a/include/mgba/script/context.h b/include/mgba/script/context.h index 9e8e5ec23..435277323 100644 --- a/include/mgba/script/context.h +++ b/include/mgba/script/context.h @@ -91,8 +91,6 @@ struct mScriptValue* mScriptContextAccessWeakref(struct mScriptContext*, struct void mScriptContextClearWeakref(struct mScriptContext*, uint32_t weakref); void mScriptContextDisownWeakref(struct mScriptContext*, uint32_t weakref); -void mScriptContextAttachStdlib(struct mScriptContext* context); -void mScriptContextAttachSocket(struct mScriptContext* context); void mScriptContextExportConstants(struct mScriptContext* context, const char* nspace, struct mScriptKVPair* constants); void mScriptContextExportNamespace(struct mScriptContext* context, const char* nspace, struct mScriptKVPair* value); diff --git a/src/platform/qt/scripting/ScriptingController.cpp b/src/platform/qt/scripting/ScriptingController.cpp index 990cbca9b..3062dc96a 100644 --- a/src/platform/qt/scripting/ScriptingController.cpp +++ b/src/platform/qt/scripting/ScriptingController.cpp @@ -19,8 +19,7 @@ #include "scripting/ScriptingTextBuffer.h" #include "scripting/ScriptingTextBufferModel.h" -#include -#include +#include #include #include diff --git a/src/script/docgen.c b/src/script/docgen.c index 6c5d553df..a81e59422 100644 --- a/src/script/docgen.c +++ b/src/script/docgen.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/src/script/stdlib.c b/src/script/stdlib.c index 7397bb09e..ee6ebfd93 100644 --- a/src/script/stdlib.c +++ b/src/script/stdlib.c @@ -3,10 +3,11 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include #include #include +#include #include #ifdef M_CORE_GBA #include diff --git a/src/script/test/classes.c b/src/script/test/classes.c index ac25ec279..f7c5eb128 100644 --- a/src/script/test/classes.c +++ b/src/script/test/classes.c @@ -5,9 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "util/test/suite.h" -#include -#include -#include +#include struct TestA { int32_t i; diff --git a/src/script/test/context.c b/src/script/test/context.c index 178dc25a7..da3ff7ea8 100644 --- a/src/script/test/context.c +++ b/src/script/test/context.c @@ -5,9 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "util/test/suite.h" -#include -#include -#include +#include M_TEST_DEFINE(weakrefBasic) { struct mScriptContext context; diff --git a/src/script/test/input.c b/src/script/test/input.c index 825e005dd..4c689a6ef 100644 --- a/src/script/test/input.c +++ b/src/script/test/input.c @@ -6,9 +6,7 @@ #include "util/test/suite.h" #include -#include -#include -#include +#include #include "script/test.h" diff --git a/src/script/test/stdlib.c b/src/script/test/stdlib.c index 0f821dbb4..852894a34 100644 --- a/src/script/test/stdlib.c +++ b/src/script/test/stdlib.c @@ -6,9 +6,7 @@ #include "util/test/suite.h" #include -#include -#include -#include +#include #include "script/test.h" diff --git a/src/script/test/storage.c b/src/script/test/storage.c index e9bb535ba..14851318a 100644 --- a/src/script/test/storage.c +++ b/src/script/test/storage.c @@ -6,8 +6,7 @@ #include "util/test/suite.h" #include -#include -#include +#include #include "script/test.h" diff --git a/src/script/test/types.c b/src/script/test/types.c index ae1df5ba0..d5e7834b4 100644 --- a/src/script/test/types.c +++ b/src/script/test/types.c @@ -5,9 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "util/test/suite.h" -#include -#include -#include +#include struct Test { int32_t a;