Skip to content

Commit 1b6ca61

Browse files
committed
Fix includes
1 parent b0e10fc commit 1b6ca61

File tree

28 files changed

+37
-34
lines changed

28 files changed

+37
-34
lines changed

include/deemon/alloc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@
5252

5353
#include "api.h"
5454

55-
#include "types.h" /* Dee_AsObject, Dee_funptr_t */
56-
#include "util/slab-config.h"
55+
#include "types.h" /* Dee_AsObject, Dee_funptr_t */
56+
#include "util/slab-config.h" /* Dee_SLAB_CHUNKSIZE_FOREACH, Dee_SLAB_CHUNKSIZE_MAX */
5757

5858
#ifdef __CC__
5959
#include <hybrid/__debug-alignment.h> /* __NO_hybrid_dbg_alignment, __hybrid_dbg_alignment_disable, __hybrid_dbg_alignment_enable */
6060
#include <hybrid/__overflow.h> /* __hybrid_overflow_uadd, __hybrid_overflow_umul */
61-
#include <hybrid/host.h> /* __linux__, __pic__, __unix__ */
61+
#include <hybrid/host.h> /* __linux__, __unix__ */
6262
#include <hybrid/typecore.h> /* __BYTE_TYPE__, __SIZEOF_POINTER__ */
6363

6464
/*!fixincludes fake_include "system-features.h" // _alloca, _msize, malloc, malloc_usable_size */
65-
/*!fixincludes fake_include "type.h" // Dee_TYPE_CONSTRUCTOR_INIT_* */
65+
/*!fixincludes fake_include "type.h" // CONFIG_FIXED_ALLOCATOR_S_IS_AUTO, Dee_TYPE_CONSTRUCTOR_INIT_* */
6666

6767
#include <stdbool.h> /* bool */
6868
#include <stddef.h> /* NULL, size_t */

include/deemon/gc.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,18 @@
3535

3636
#include <hybrid/typecore.h> /* __BYTE_TYPE__, __SIZEOF_POINTER__ */
3737

38-
#include "types.h" /* DREF, DeeObject, Dee_AsObject */
39-
#include "util/slab-config.h" /* DREF, DeeObject, Dee_AsObject */
38+
#include "types.h" /* DREF, DeeObject, Dee_AsObject, Dee_funptr_t */
39+
#include "util/slab-config.h" /* Dee_SLAB_CHUNKSIZE_GC_FOREACH, Dee_SLAB_CHUNKSIZE_MAX */
4040

4141
#include <stdbool.h> /* bool */
4242
#include <stddef.h> /* NULL, size_t */
4343
#include <stdint.h> /* UINT32_C, UINT64_C, uintptr_t */
4444

45+
/* To satisfy "fixincludes" (these includes are intentionally missing) */
46+
/*!fixincludes fake_include "type.h" // CONFIG_FIXED_ALLOCATOR_S_IS_AUTO, Dee_TYPE_CONSTRUCTOR_INIT_ALLOC, Dee_TYPE_CONSTRUCTOR_INIT_ALLOC_AUTO */
47+
4548
#ifndef __INTELLISENSE__
46-
#include "alloc.h" /* CONFIG_FIXED_ALLOCATOR_S_IS_AUTO, DeeSlab_ENUMERATE, DeeSlab_Invoke */
49+
#include "alloc.h" /* DeeSlab_ENUMERATE, DeeSlab_Invoke */
4750
#else /* !__INTELLISENSE__ */
4851
DECL_BEGIN
4952
#define _Dee_MalloccBufsize(elem_count, elem_size) ((elem_count) * (elem_size)) /*!export-*/

include/deemon/thread.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include <stdint.h> /* uint16_t, uint32_t, uint64_t, uintptr_t */
4343

4444
#ifndef __INTELLISENSE__
45-
#include "alloc.h" /* DeeSlab_* */
45+
#include "alloc.h" /* DeeObject_* */
4646
#include "object.h" /* DeeObject_NewPack, _DeeRefcnt_* */
4747
#endif /* !__INTELLISENSE__ */
4848

include/deemon/type.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
#include <stdint.h> /* UINTn_C, int32_t, int64_t, uint16_t, uint32_t, uint64_t, uintptr_t */
7979

8080
/* To satisfy "fixincludes" (these includes are intentionally missing) */
81-
/*!fixincludes fake_include "alloc.h" // CONFIG_FIXED_ALLOCATOR_S_IS_AUTO, DeeObject_Free, DeeObject_Malloc, DeeSlab_Invoke */
82-
/*!fixincludes fake_include "gc.h" // DeeGCObject_Free, DeeGCObject_Malloc */
81+
/*!fixincludes fake_include "alloc.h" // DeeObject_Free, DeeObject_Malloc, DeeSlab_* */
82+
/*!fixincludes fake_include "gc.h" // DeeGCObject_Free, DeeGCObject_Malloc, DeeGCSlab_GetFree, DeeGCSlab_GetMalloc */
8383
/*!fixincludes fake_include "object.h" // DeeAssert_BadObjectType, DeeAssert_BadObjectTypeOpt, DeeObject_Check, Dee_Incref */
8484
/*!fixincludes fake_include "string.h" // DeeString_Hash, DeeString_STR */
8585
/*!fixincludes fake_include "tuple.h" // DeeTuple_ELEM, DeeTuple_SIZE */

include/deemon/util/slab-config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#ifdef CONFIG_EXPERIMENTAL_REWORKED_SLAB_ALLOCATOR
2727

28-
#include <hybrid/typecore.h>
28+
#include <hybrid/typecore.h> /* __SIZEOF_POINTER__ */
2929

3030
#if __SIZEOF_POINTER__ == 4
3131
#define Dee_SLAB_CHUNKSIZE_MIN 12

src/deemon/compiler/asm/assembler.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <deemon/api.h>
2525

26-
#include <deemon/alloc.h> /* DeeObject_Free, DeeObject_MALLOC, DeeObject_FREE, Dee_*alloc*, Dee_CollectMemory*, Dee_Free, Dee_TYPE_CONSTRUCTOR_INIT_FIXED */
26+
#include <deemon/alloc.h> /* DeeDbgObject_MALLOC, DeeObject_*, Dee_*alloc*, Dee_CollectMemory*, Dee_Free, Dee_TYPE_CONSTRUCTOR_INIT_FIXED */
2727
#include <deemon/asm.h> /* ASM16_*, ASM32_JMP, ASM_*, DeeAsm_NextInstr, instruction_t */
2828
#include <deemon/code.h> /* DeeCodeObject, DeeCode_*, DeeDDIObject, Dee_CODE_*, Dee_EXCEPTION_HANDLER_FFINALLY, Dee_code_metrics_init, Dee_except_handler, Dee_hostasm_code_init, code_addr_t, code_size_t, instruction_t */
2929
#include <deemon/compiler/assembler.h> /* ASM_*, CONFIG_SIZEOF_ASM_EXC_MATCHES_SIZEOF_EXCEPT_HANDLER, DeeRelIntObject, RELINT_MODE_FADDR, RELINT_MODE_FSTCK, REL_HASSYM, R_DMN_*, SECTION_*, asm_*, assembler, ast_genasm, ast_genasm_one, ddi_*, handler_frame, userassembler_fini, userassembler_init */

src/deemon/execute/dex.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <deemon/computed-operators.h> /* DEFIMPL, DEFIMPL_UNSUPPORTED */
3535
#include <deemon/error.h> /* DeeError_*, Dee_ERROR_HANDLED_RESTORE */
3636
#include <deemon/format.h> /* Dee_sprintf, PRFuSIZ */
37-
#include <deemon/gc.h> /* DeeGCObject_CALLOC, DeeGC_Track */
37+
#include <deemon/gc.h> /* DeeGCObject_CALLOC, DeeGC_Track, Dee_TYPE_CONSTRUCTOR_INIT_FIXED_GC */
3838
#include <deemon/string.h> /* DeeString* */
3939
#include <deemon/system-features.h> /* CONFIG_HAVE_*, DeeSystem_DlOpen_USE_LoadLibrary, DeeSystem_DlOpen_USE_dlopen, dl*, memcpyc, strcmp, strlen */
4040
#include <deemon/system.h> /* DeeSystem_DlClose, DeeSystem_DlSym */

src/deemon/execute/function.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <deemon/error-rt.h> /* DeeRT_ErrUnboundAttr, DeeRT_ErrUnboundAttrCStr */
3333
#include <deemon/error.h> /* DeeError_*, ERROR_PRINT_DOHANDLE */
3434
#include <deemon/format.h> /* DeeFormat_*, PRFu16 */
35-
#include <deemon/gc.h> /* DeeGCObject_*alloc*, DeeGCObject_FREE, DeeGCObject_MALLOC, DeeGC_TRACK */
35+
#include <deemon/gc.h> /* DeeGCObject_*alloc*, DeeGCObject_FREE, DeeGCObject_MALLOC, DeeGC_TRACK, Dee_TYPE_CONSTRUCTOR_INIT_FIXED_GC */
3636
#include <deemon/int.h> /* DeeInt_* */
3737
#include <deemon/kwds.h> /* DeeKwBlackList_Decref */
3838
#include <deemon/module.h> /* DeeInteractiveModule_Check, DeeModule*, Dee_module_* */

src/deemon/execute/interactive-module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <deemon/compiler/symbol.h> /* CONFIG_SYMBOL_HAS_REFCNT, DAST_NONE, DeeBaseScopeObject, DeeRootScopeObject, DeeScopeObject, SYMBOL_*, current_basescope, current_rootscope, current_scope, symbol */
3838
#include <deemon/computed-operators.h> /* DEFIMPL, DEFIMPL_UNSUPPORTED */
3939
#include <deemon/error.h> /* DeeError_*, ERROR_HANDLED_RESTORE */
40-
#include <deemon/gc.h> /* DeeGCObject_FREE, DeeGCObject_MALLOC, DeeGCObject_Malloc, DeeGC_TRACK, DeeGC_Untrack */
40+
#include <deemon/gc.h> /* DeeGCObject_FREE, DeeGCObject_MALLOC, DeeGCObject_Malloc, DeeGC_TRACK, DeeGC_Untrack, Dee_TYPE_CONSTRUCTOR_INIT_FIXED_GC */
4141
#include <deemon/module.h> /* DeeModuleObject, DeeModule_Type, Dee_MODSYM_FDOCOBJ, Dee_MODSYM_FNAMEOBJ, Dee_MODULE_F*, Dee_MODULE_HASHIT, Dee_MODULE_HASHNX, Dee_MODULE_HASHST, Dee_MODULE_INTERACTIVE_MODE_FONLYBASEFILE, Dee_MODULE_INTERACTIVE_MODE_FYIELDROOTEXPR, Dee_MODULE_INTERACTIVE_MODE_FYIELDROOTSTMT, Dee_MODULE_SYMBOL_GETNAMELEN, Dee_MODULE_SYMBOL_GETNAMESTR, Dee_compiler_options, Dee_module_* */
4242
#include <deemon/object.h> /* ASSERT_OBJECT, ASSERT_OBJECT_TYPE_EXACT, ASSERT_OBJECT_TYPE_EXACT_OPT, DREF, DeeObject, DeeObject_*, DeeTypeObject, Dee_AsObject, Dee_Decref*, Dee_Incref, Dee_Movrefv, Dee_TYPE, Dee_WEAKREF_SUPPORT_ADDR, Dee_XDecref, Dee_XDecrefv, Dee_XIncref, Dee_hash_t, Dee_ssize_t, Dee_weakref_support_init, ITER_DONE, OBJECT_HEAD, OBJECT_HEAD_INIT */
4343
#include <deemon/string.h> /* DeeString*, STRING_ERROR_FIGNORE, STRING_ERROR_FSTRICT, WSTR_LENGTH */

src/deemon/execute/module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <deemon/error.h> /* DeeError_* */
3131
#include <deemon/exec.h> /* DeeExec_GetHome, DeeModule_*, Dee_GetArgv */
3232
#include <deemon/format.h> /* DeeFormat_PRINT, DeeFormat_Printf */
33-
#include <deemon/gc.h> /* DeeGCObject_Callocc, DeeGCObject_Free, DeeGCObject_Malloc, DeeGC_TRACK, DeeGC_Untrack, Dee_gc_head, Dee_gc_head_link, _Dee_GC_HEAD_UNTRACKED_INIT */
33+
#include <deemon/gc.h> /* DeeGCObject_Callocc, DeeGCObject_Free, DeeGCObject_Malloc, DeeGC_TRACK, DeeGC_Untrack, Dee_TYPE_CONSTRUCTOR_INIT_FIXED_GC, Dee_gc_head, Dee_gc_head_link, _Dee_GC_HEAD_UNTRACKED_INIT */
3434
#include <deemon/int.h> /* DeeInt_NewUInt128 */
3535
#include <deemon/module.h> /* DeeInteractiveModule_Check, DeeModule*, Dee_MODSYM_F*, Dee_MODULE_F*, Dee_MODULE_HASHIT, Dee_MODULE_HASHNX, Dee_MODULE_HASHST, Dee_MODULE_INIT_INITIALIZED, Dee_MODULE_INIT_UNINITIALIZED, Dee_MODULE_MODDATA_INIT_CODE, Dee_MODULE_PROPERTY_DEL, Dee_MODULE_PROPERTY_GET, Dee_MODULE_PROPERTY_SET, Dee_MODULE_STRUCT_EX, Dee_MODULE_SYMBOL_EQUALS_STR, Dee_MODULE_SYMBOL_GETDOCSTR, Dee_MODULE_SYMBOL_GETNAMELEN, Dee_MODULE_SYMBOL_GETNAMESTR, Dee_module_*, Dee_static_module_struct, _Dee_MODULE_* */
3636
#include <deemon/mro.h> /* DeeObject_GenericFindAttrInfoStringLenHash, DeeObject_TGenericFindAttr, DeeObject_TGenericIterAttr, Dee_ATTRINFO_CUSTOM, Dee_ATTRINFO_MODSYM, Dee_ATTRITER_HEAD, Dee_ATTRPERM_F_*, Dee_attrdesc, Dee_attrhint, Dee_attrinfo, Dee_attriter, Dee_attriter_init, Dee_attriter_type, Dee_attriterchain_builder, Dee_attriterchain_builder_*, Dee_attrperm_t, Dee_attrspec */

0 commit comments

Comments
 (0)