From 703d89a9acc3784ca732bf9e0185400cb1b5a176 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Wed, 14 Oct 2026 13:05:06 -0500 Subject: [PATCH] Consistency pass: fix util/memory.h include ordering, drop stray comment and unused include util/memory.h had landed as the very first #include in ~30 files from the mechanical memcpy/memcmp conversion, ahead of each file's own umbrella type header - moves it back after, matching the rest of the codebase's ordering. Also updates a scriptplatform.h comment left over from the int/fixed/bignum split, and drops an unused util/string.h include in scriptcompile.c. Co-Authored-By: Claude Sonnet 5 --- src/dusk/script/core/array/scriptarraymodify.c | 2 +- src/dusk/script/core/array/scriptarraysort.c | 2 +- src/dusk/script/core/builtin/core/scriptbconvert.c | 2 +- src/dusk/script/core/builtin/scriptbuiltinregister.c | 2 +- src/dusk/script/core/builtin/scriptintrinsic.c | 2 +- src/dusk/script/core/builtin/string/scriptbstringsearch.c | 2 +- src/dusk/script/core/builtin/string/scriptbstringsplit.c | 2 +- src/dusk/script/core/core/scriptplatform.h | 3 ++- src/dusk/script/core/runtime/scriptruntimeload.c | 2 +- src/dusk/script/core/scope/scriptscopefind.c | 2 +- src/dusk/script/core/scope/scriptscopeset.c | 2 +- src/dusk/script/core/string/scriptbuf.c | 2 +- src/dusk/script/core/string/scriptstringconcat.c | 2 +- src/dusk/script/core/string/scriptstringnew.c | 2 +- src/dusk/script/core/string/scriptstringsearch.c | 2 +- src/dusk/script/core/struct/scriptstruct.c | 2 +- src/dusk/script/core/value/scriptvaluecompare.c | 2 +- src/dusk/script/vm/execute/scriptvmcode.c | 2 +- src/dusk/script/vm/image/scriptvmload.c | 2 +- src/dusk/script/vm/image/scriptvmmap.c | 2 +- src/dusk/script/vm/ops/scriptvmopconst.c | 2 +- src/duskscriptcc/compile/builder/scriptbuildernative.c | 2 +- src/duskscriptcc/compile/builder/scriptbuilderstring.c | 2 +- src/duskscriptcc/compile/expression/scriptcompilecall.c | 2 +- src/duskscriptcc/compile/expression/scriptcompileliteral.c | 2 +- src/duskscriptcc/compile/expression/scriptcompilevalue.c | 2 +- src/duskscriptcc/compile/scriptcompile.c | 1 - src/duskscriptcc/parse/lexer/scriptlexadd.c | 2 +- src/duskscriptcc/parse/lexer/scriptlexkeyword.c | 2 +- src/duskscriptcc/parse/parser/scriptparsedeclare.c | 2 +- src/duskscriptcc/parse/parser/scriptparsernode.c | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/dusk/script/core/array/scriptarraymodify.c b/src/dusk/script/core/array/scriptarraymodify.c index 2cd24396..2a7c3539 100644 --- a/src/dusk/script/core/array/scriptarraymodify.c +++ b/src/dusk/script/core/array/scriptarraymodify.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "array/scriptarraymodify.h" #include "value/scriptalloc.h" #include "array/scriptarraynew.h" diff --git a/src/dusk/script/core/array/scriptarraysort.c b/src/dusk/script/core/array/scriptarraysort.c index 7598e600..d6f29770 100644 --- a/src/dusk/script/core/array/scriptarraysort.c +++ b/src/dusk/script/core/array/scriptarraysort.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "array/scriptarraysort.h" #include "value/scriptalloc.h" #include "call/scriptcall.h" diff --git a/src/dusk/script/core/builtin/core/scriptbconvert.c b/src/dusk/script/core/builtin/core/scriptbconvert.c index fe358245..ccba3def 100644 --- a/src/dusk/script/core/builtin/core/scriptbconvert.c +++ b/src/dusk/script/core/builtin/core/scriptbconvert.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "builtin/core/scriptbconvert.h" #include "builtin/scriptarg.h" #include "value/scriptvalueprimitive.h" diff --git a/src/dusk/script/core/builtin/scriptbuiltinregister.c b/src/dusk/script/core/builtin/scriptbuiltinregister.c index b5beb80d..65083850 100644 --- a/src/dusk/script/core/builtin/scriptbuiltinregister.c +++ b/src/dusk/script/core/builtin/scriptbuiltinregister.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "value/scriptvalueprimitive.h" #include "builtin/scriptbuiltinregister.h" #include "value/scriptalloc.h" diff --git a/src/dusk/script/core/builtin/scriptintrinsic.c b/src/dusk/script/core/builtin/scriptintrinsic.c index 14c615a8..06ba9663 100644 --- a/src/dusk/script/core/builtin/scriptintrinsic.c +++ b/src/dusk/script/core/builtin/scriptintrinsic.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "builtin/scriptintrinsic.h" #include "builtin/core/scriptbtype.h" #include "builtin/array/scriptbarraybasic.h" diff --git a/src/dusk/script/core/builtin/string/scriptbstringsearch.c b/src/dusk/script/core/builtin/string/scriptbstringsearch.c index b65242ed..51d411ef 100644 --- a/src/dusk/script/core/builtin/string/scriptbstringsearch.c +++ b/src/dusk/script/core/builtin/string/scriptbstringsearch.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "builtin/string/scriptbstringsearch.h" #include "builtin/scriptarg.h" #include "value/scriptvalueprimitive.h" diff --git a/src/dusk/script/core/builtin/string/scriptbstringsplit.c b/src/dusk/script/core/builtin/string/scriptbstringsplit.c index 072386ab..f3e2a3d5 100644 --- a/src/dusk/script/core/builtin/string/scriptbstringsplit.c +++ b/src/dusk/script/core/builtin/string/scriptbstringsplit.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "builtin/string/scriptbstringsplit.h" #include "builtin/scriptarg.h" #include "array/scriptarraynew.h" diff --git a/src/dusk/script/core/core/scriptplatform.h b/src/dusk/script/core/core/scriptplatform.h index 8d120aab..a880c868 100644 --- a/src/dusk/script/core/core/scriptplatform.h +++ b/src/dusk/script/core/core/scriptplatform.h @@ -43,7 +43,8 @@ #define SCRIPT_FEATURE_TRUST_BYTECODE 1 #endif - // The widest numbers there are. A bignum on this platform only has 32 bits. + // The widest whole number arithmetic (bitwise ops) and the union's raw copy + // field use, 32 bits on this platform. typedef int32_t scriptwide_t; typedef uint32_t scriptuwide_t; diff --git a/src/dusk/script/core/runtime/scriptruntimeload.c b/src/dusk/script/core/runtime/scriptruntimeload.c index e573ee12..7057b592 100644 --- a/src/dusk/script/core/runtime/scriptruntimeload.c +++ b/src/dusk/script/core/runtime/scriptruntimeload.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/string.h" #include "util/memory.h" +#include "util/string.h" #include "scripttypes.h" #include "runtime/scriptruntimeload.h" #include "value/scriptalloc.h" diff --git a/src/dusk/script/core/scope/scriptscopefind.c b/src/dusk/script/core/scope/scriptscopefind.c index b28c18d7..9c2112fb 100644 --- a/src/dusk/script/core/scope/scriptscopefind.c +++ b/src/dusk/script/core/scope/scriptscopefind.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/string.h" #include "scripttypes.h" +#include "util/string.h" #include "scope/scriptscopefind.h" #include diff --git a/src/dusk/script/core/scope/scriptscopeset.c b/src/dusk/script/core/scope/scriptscopeset.c index 2fcbde83..7b481b7a 100644 --- a/src/dusk/script/core/scope/scriptscopeset.c +++ b/src/dusk/script/core/scope/scriptscopeset.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "scope/scriptscopeset.h" #include "value/scriptalloc.h" #include "error/scriptraise.h" diff --git a/src/dusk/script/core/string/scriptbuf.c b/src/dusk/script/core/string/scriptbuf.c index 9bad46a4..65bda1ea 100644 --- a/src/dusk/script/core/string/scriptbuf.c +++ b/src/dusk/script/core/string/scriptbuf.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "string/scriptbuf.h" #include "value/scriptalloc.h" #include diff --git a/src/dusk/script/core/string/scriptstringconcat.c b/src/dusk/script/core/string/scriptstringconcat.c index 0d419fe1..224edc23 100644 --- a/src/dusk/script/core/string/scriptstringconcat.c +++ b/src/dusk/script/core/string/scriptstringconcat.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "string/scriptstringconcat.h" #include "value/scriptalloc.h" #include "error/scriptraise.h" diff --git a/src/dusk/script/core/string/scriptstringnew.c b/src/dusk/script/core/string/scriptstringnew.c index 94fd541a..2c47d6b3 100644 --- a/src/dusk/script/core/string/scriptstringnew.c +++ b/src/dusk/script/core/string/scriptstringnew.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "string/scriptstringnew.h" #include "value/scriptalloc.h" #include "error/scriptraise.h" diff --git a/src/dusk/script/core/string/scriptstringsearch.c b/src/dusk/script/core/string/scriptstringsearch.c index 587a0be0..2688c0e5 100644 --- a/src/dusk/script/core/string/scriptstringsearch.c +++ b/src/dusk/script/core/string/scriptstringsearch.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "string/scriptstringsearch.h" #include diff --git a/src/dusk/script/core/struct/scriptstruct.c b/src/dusk/script/core/struct/scriptstruct.c index 59a1497e..54838c12 100644 --- a/src/dusk/script/core/struct/scriptstruct.c +++ b/src/dusk/script/core/struct/scriptstruct.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "struct/scriptstruct.h" #include "value/scriptalloc.h" #include "error/scriptraise.h" diff --git a/src/dusk/script/core/value/scriptvaluecompare.c b/src/dusk/script/core/value/scriptvaluecompare.c index 180345d6..c91d1a26 100644 --- a/src/dusk/script/core/value/scriptvaluecompare.c +++ b/src/dusk/script/core/value/scriptvaluecompare.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scripttypes.h" +#include "util/memory.h" #include "value/scriptvaluecompare.h" #include "value/scriptvalueprimitive.h" #include "number/scriptnumberunary.h" diff --git a/src/dusk/script/vm/execute/scriptvmcode.c b/src/dusk/script/vm/execute/scriptvmcode.c index 7de2ba52..d5c4e9e2 100644 --- a/src/dusk/script/vm/execute/scriptvmcode.c +++ b/src/dusk/script/vm/execute/scriptvmcode.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptvmtypes.h" +#include "util/memory.h" #include "execute/scriptvmcode.h" #include "error/scriptraise.h" #include "value/scriptfunction.h" diff --git a/src/dusk/script/vm/image/scriptvmload.c b/src/dusk/script/vm/image/scriptvmload.c index 5fc20f0c..25ca2bf8 100644 --- a/src/dusk/script/vm/image/scriptvmload.c +++ b/src/dusk/script/vm/image/scriptvmload.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptvmtypes.h" +#include "util/memory.h" #include "image/scriptvmload.h" #include "image/scriptvmreader.h" #include "execute/scriptvmfunction.h" diff --git a/src/dusk/script/vm/image/scriptvmmap.c b/src/dusk/script/vm/image/scriptvmmap.c index 9dca2767..92636269 100644 --- a/src/dusk/script/vm/image/scriptvmmap.c +++ b/src/dusk/script/vm/image/scriptvmmap.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptvmtypes.h" +#include "util/memory.h" #include "image/scriptvmmap.h" #include "image/scriptvmreader.h" #include "value/scriptalloc.h" diff --git a/src/dusk/script/vm/ops/scriptvmopconst.c b/src/dusk/script/vm/ops/scriptvmopconst.c index 12eb4676..44227ff3 100644 --- a/src/dusk/script/vm/ops/scriptvmopconst.c +++ b/src/dusk/script/vm/ops/scriptvmopconst.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptvmtypes.h" +#include "util/memory.h" #include "ops/scriptvmopconst.h" #include "execute/scriptvmcode.h" #include "error/scriptraise.h" diff --git a/src/duskscriptcc/compile/builder/scriptbuildernative.c b/src/duskscriptcc/compile/builder/scriptbuildernative.c index 597080ce..a747b661 100644 --- a/src/duskscriptcc/compile/builder/scriptbuildernative.c +++ b/src/duskscriptcc/compile/builder/scriptbuildernative.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptcompiletypes.h" +#include "util/memory.h" #include "builder/scriptbuildernative.h" #include "builder/scriptbuilderstring.h" #include "builder/scriptbuilderlocal.h" diff --git a/src/duskscriptcc/compile/builder/scriptbuilderstring.c b/src/duskscriptcc/compile/builder/scriptbuilderstring.c index fa56f1a7..0f15b1c3 100644 --- a/src/duskscriptcc/compile/builder/scriptbuilderstring.c +++ b/src/duskscriptcc/compile/builder/scriptbuilderstring.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptcompiletypes.h" +#include "util/memory.h" #include "builder/scriptbuilderstring.h" #include "builder/scriptbuilderemit.h" #include diff --git a/src/duskscriptcc/compile/expression/scriptcompilecall.c b/src/duskscriptcc/compile/expression/scriptcompilecall.c index 07d4fc39..efb3fc7a 100644 --- a/src/duskscriptcc/compile/expression/scriptcompilecall.c +++ b/src/duskscriptcc/compile/expression/scriptcompilecall.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptcompiletypes.h" +#include "util/memory.h" #include "expression/scriptcompilecall.h" #include "builder/scriptbuilderemit.h" #include "builder/scriptbuilderlabel.h" diff --git a/src/duskscriptcc/compile/expression/scriptcompileliteral.c b/src/duskscriptcc/compile/expression/scriptcompileliteral.c index 70895abc..d70a2b5f 100644 --- a/src/duskscriptcc/compile/expression/scriptcompileliteral.c +++ b/src/duskscriptcc/compile/expression/scriptcompileliteral.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptcompiletypes.h" +#include "util/memory.h" #include "expression/scriptcompileliteral.h" #include "builder/scriptbuilderemit.h" #include "builder/scriptbuilderstring.h" diff --git a/src/duskscriptcc/compile/expression/scriptcompilevalue.c b/src/duskscriptcc/compile/expression/scriptcompilevalue.c index ddb5d5e8..9408d03f 100644 --- a/src/duskscriptcc/compile/expression/scriptcompilevalue.c +++ b/src/duskscriptcc/compile/expression/scriptcompilevalue.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptcompiletypes.h" +#include "util/memory.h" #include #include "expression/scriptcompilevalue.h" #include "builder/scriptbuilderemit.h" diff --git a/src/duskscriptcc/compile/scriptcompile.c b/src/duskscriptcc/compile/scriptcompile.c index f19e67fc..5ed5e7ef 100644 --- a/src/duskscriptcc/compile/scriptcompile.c +++ b/src/duskscriptcc/compile/scriptcompile.c @@ -18,7 +18,6 @@ #include "parser/scriptparse.h" #include "text/scripttext.h" #include "util/memory.h" -#include "util/string.h" #include "assert/assert.h" #include #include diff --git a/src/duskscriptcc/parse/lexer/scriptlexadd.c b/src/duskscriptcc/parse/lexer/scriptlexadd.c index 20a2b9ff..2d8786ba 100644 --- a/src/duskscriptcc/parse/lexer/scriptlexadd.c +++ b/src/duskscriptcc/parse/lexer/scriptlexadd.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptparsetypes.h" +#include "util/memory.h" #include "lexer/scriptlexadd.h" #include "value/scriptalloc.h" #include diff --git a/src/duskscriptcc/parse/lexer/scriptlexkeyword.c b/src/duskscriptcc/parse/lexer/scriptlexkeyword.c index a757cb31..091ce4ec 100644 --- a/src/duskscriptcc/parse/lexer/scriptlexkeyword.c +++ b/src/duskscriptcc/parse/lexer/scriptlexkeyword.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptparsetypes.h" +#include "util/memory.h" #include "lexer/scriptlexkeyword.h" #include diff --git a/src/duskscriptcc/parse/parser/scriptparsedeclare.c b/src/duskscriptcc/parse/parser/scriptparsedeclare.c index de3fdd0c..0f5ab3f4 100644 --- a/src/duskscriptcc/parse/parser/scriptparsedeclare.c +++ b/src/duskscriptcc/parse/parser/scriptparsedeclare.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptparsetypes.h" +#include "util/memory.h" #include "parser/scriptparsedeclare.h" #include "value/scriptalloc.h" #include "parser/scriptparseexpression.h" diff --git a/src/duskscriptcc/parse/parser/scriptparsernode.c b/src/duskscriptcc/parse/parser/scriptparsernode.c index 4539ca91..dc2a1d7e 100644 --- a/src/duskscriptcc/parse/parser/scriptparsernode.c +++ b/src/duskscriptcc/parse/parser/scriptparsernode.c @@ -5,8 +5,8 @@ * https://opensource.org/licenses/MIT */ -#include "util/memory.h" #include "scriptparsetypes.h" +#include "util/memory.h" #include "parser/scriptparsernode.h" #include "value/scriptalloc.h" #include "parser/scriptparserstream.h"