Some untangling of %sys-ext.h

The dependencies of %sys-ext.h were a bit unclear.  This moves the
builtin extensions table--as well as the API table--into their own
.c files so that what #includes they use can be just what's needed
for the table and not get mixed up with the file they're .inc'd into.

It also makes the ExtensionCollator definition part of %sys-core.h
since in general extensions shouldn't need to define that or the
IDX_ values.

Author: hostilefork

configs/emscripten.r

@@ -219,7 +219,7 @@ ldflags: compose [
         {-s ERROR_ON_UNDEFINED_SYMBOLS=0}
     ])
 
-    ; Generated by %make-reb-lib.r, see notes there.  Pertains to this:
+    ; Generated by %make-librebol.r, see notes there.  Pertains to this:
     ; https://github.com/emscripten-core/emscripten/issues/4240
     ;
     (if host = #node [
@@ -280,7 +280,7 @@ ldflags: compose [
     ;
     (if debug-javascript-extension [{--minify 0}])
 
-    ; %reb-lib.js is produced by %make-reb-lib.js - It contains the wrapper
+    ; %reb-lib.js is produced by %make-librebol.js - It contains the wrapper
     ; code that proxies JavaScript calls to `rebElide(...)` etc. into calls
     ; to the functions that take a `va_list` pointer, e.g. `_RL_rebElide()`.
     ;

extensions/javascript/mod-javascript.c

@@ -327,7 +327,7 @@ enum Reb_Native_State {
 // The resolve will be called if it reaches the end of the input and the
 // reject if there is a failure.
 //
-// Note: See %make-reb-lib.r for code that produces the `rebPromise(...)` API,
+// Note: See %make-librebol.r for code that produces the `rebPromise(...)` API,
 // which ties the returned integer into the resolve and reject branches of an
 // actual JavaScript ES6 Promise.
 //

extensions/javascript/tools/prep-libr3-js.reb

@@ -26,13 +26,13 @@ REBOL [
 ]
 
 ; Note: There are no `import` statements here because this is run via DO LOAD
-; within the %make-reb-lib.r script's context.  This is done in order to
+; within the %make-librebol.r script's context.  This is done in order to
 ; inherit the `api` object, and the `for-each-api` enumerator.  As a result
 ; it also inherits access to CWRAP and other tools.  Review.
 
 
 e-cwrap: make-emitter "JavaScript C Wrapper functions" (
-    join output-dir %reb-lib.js
+    join prep-dir %include/reb-lib.js
 )
 
 === "ASYNCIFY_BLACKLIST TOLERANT CWRAP" ===
@@ -912,7 +912,7 @@ json-collect: func [
     }]
 ]
 
-write (join output-dir %libr3.exports.json) json-collect [
+write (join prep-dir %include/libr3.exports.json) json-collect [
     for-each-api [keep unspaced ["RL_" name]]
     keep "malloc"  ; !!! Started requiring, did not before (?)
 ]
@@ -944,7 +944,7 @@ write (join output-dir %libr3.exports.json) json-collect [
 ; the final return value of a JS-AWAITER can be returned with it.
 ; </review>
 
-write (join output-dir %asyncify-blacklist.json) delimit newline collect [
+write (join prep-dir %include/asyncify-blacklist.json) delimit newline collect [
     keep "["
     for-next names load %../asyncify-blacklist.r [
         keep unspaced [_ _ _ _ {"} names/1 {"} if not last? names [","]]
@@ -968,7 +968,7 @@ write (join output-dir %asyncify-blacklist.json) delimit newline collect [
 ;
 
 e-node-preload: make-emitter "Emterpreter Preload for Node.js" (
-    join output-dir %node-preload.js
+    join prep-dir %include/node-preload.js
 )
 
 e-node-preload/emit {

extensions/tcc/tools/prep-libr3-tcc.reb

@@ -29,13 +29,13 @@ REBOL [
 ]
 
 ; Note: There are no `import` statements here because this is run via DO LOAD
-; within the %make-reb-lib.r script's context.  This is done in order to
+; within the %make-librebol.r script's context.  This is done in order to
 ; inherit the `api` object, and the `for-each-api` enumerator.  As a result
 ; it also inherits access to CWRAP and other tools.  Review.
 
 
 e: make-emitter "libRebol exports for tcc_add_symbol()" (
-    join output-dir %tmp-librebol-symbols.inc
+    join prep-dir %include/tmp-librebol-symbols.inc
 )
 
 for-each-api [

make.r

@@ -1930,7 +1930,7 @@ prep: make rebmake/entry-class [
             "GIT_COMMIT=$(GIT_COMMIT)"
         ]
         keep [
-            "$(REBOL)" join tools-dir %make-reb-lib.r
+            "$(REBOL)" join tools-dir %make-librebol.r
             unspaced ["OS_ID=" platform-config/id]
         ]
 
@@ -1969,7 +1969,7 @@ prep: make rebmake/entry-class [
         ]
 
         keep [
-            "$(REBOL)" join tools-dir %make-boot-ext-header.r
+            "$(REBOL)" join tools-dir %make-extensions-table.r
             unspaced [
                 "EXTENSIONS=" delimit ":" map-each ext extensions [
                     if ext/mode = <builtin> [to text! ext/name]

src/core/a-lib.c

@@ -22,7 +22,7 @@
 //=////////////////////////////////////////////////////////////////////////=//
 //
 // This is the "external" API, and %rebol.h contains its exported
-// definitions.  That file (and %make-reb-lib.r which generates it) contains
+// definitions.  That file (and %make-librebol.r which generates it) contains
 // comments and notes which will help understand it.
 //
 // What characterizes the external API is that it is not necessary to #include
@@ -2845,8 +2845,6 @@ DECLARE_NATIVE(api_transient)
 }
 
 
-#include "sys-ext.h"
-
 //
 //  rebCollateExtension_internal: RL_API
 //

src/core/f-extension.c

@@ -32,25 +32,6 @@
 #include "sys-core.h"
 
 
-// We wish to define a table of API functions to pass to extensions.  The way
-// functions like `rebValue()` work when called from an extension is to
-// delegate to a function from this table.  (When called from the core, they
-//
-#include "tmp-reb-lib-table.inc"  // declares g_librebol
-
-
-// Building Rebol as a library may still entail a desire to ship that library
-// with built-in extensions (e.g. building libr3.js wants to have JavaScript
-// natives as an extension).  So there is no meaning to "built-in extensions"
-// for a library otherwise...as every client will be making their own EXE, and
-// there's no way to control their build process from Rebol's build process.
-//
-// Hence, the generated header for boot extensions is included here--to allow
-// clients to get access to those extensions through an API.
-//
-#include "tmp-boot-extensions.inc"
-
-
 //
 //  Startup_Extension_Loader: C
 //
@@ -91,20 +72,24 @@ DECLARE_NATIVE(builtin_extensions)
 //    (`-`): Don't build at all
 //
 // Command-line processing or other code that uses Rebol may need to make
-// decisions on when to initialize these built-in extensions.  So rebStartup()
-// does initialize them automatically.  Instead, this merely returns the
-// list of descriptions of the extensions, which can then be loaded with the
-// LOAD-EXTENSION function.
+// decisions on when to initialize these built-in extensions.  Also, building
+// Rebol as a library may still entail a desire to ship that library with
+// built-in extensions (e.g. building libr3.js wants to have JavaScript
+// natives as an extension).
+//
+// So rebStartup() doesn't initialize extensions automatically.  Instead, this
+// merely returns the list of descriptions of the extensions, which can then
+// be loaded with the LOAD-EXTENSION function.
 //
 // 1. Built-in extensions do not receive the RebolApiTable, because they are
 //    able to use direct calls to the RL_Xxx() versions, which is faster.
 {
     INCLUDE_PARAMS_OF_BUILTIN_EXTENSIONS;
 
-    Array* list = Make_Array(NUM_BUILTIN_EXTENSIONS);
+    Array* list = Make_Array(g_num_builtin_extensions);
     REBLEN i;
-    for (i = 0; i != NUM_BUILTIN_EXTENSIONS; ++i) {
-        RebolExtensionCollator* collator = g_builtin_collators[i];
+    for (i = 0; i != g_num_builtin_extensions; ++i) {
+        ExtensionCollator* collator = g_builtin_collators[i];
 
         Value* details = (*collator)(nullptr);  // don't pass g_librebol [1]
         assert(Is_Block(details));

src/include/sys-ext.h

@@ -51,27 +51,8 @@
     #define RX_COLLATE_NAME(ext_name) RX_Collate_##ext_name
 #endif
 
-// The init function does not actually decompress any of the script or spec
-// code, make any natives, or run any startup.  It just returns an aggregate
-// of all the information that would be needed to make the extension module.
-//
-// !!! This aggregate may become an ACTION! as opposed to an array of handle
-// values, but this is a work in progress.
-//
-#if defined(_WIN32)
-    typedef RebolValue* (__cdecl RebolExtensionCollator)(RebolApiTable*);
-#else
-    typedef RebolValue* (RebolExtensionCollator)(RebolApiTable*);
-#endif
 
 //=//// EXTENSION MACROS //////////////////////////////////////////////////=//
 
-#define DECLARE_EXT_COLLATE(ext_name) \
+#define DECLARE_EXTENSION_COLLATOR(ext_name) \
     EXT_API RebolValue* RX_COLLATE_NAME(ext_name)(RebolApiTable* api)
-
-// !!! Currently used for just a BLOCK!, but may become Phase_Details()
-//
-#define IDX_COLLATOR_SCRIPT 0
-#define IDX_COLLATOR_SCRIPT_NUM_CODEPOINTS 1
-#define IDX_COLLATOR_CFUNCS 2
-#define IDX_COLLATOR_MAX 3

src/include/sys-hooks.h

@@ -51,6 +51,30 @@ typedef REBINT (COMPARE_HOOK)(
     void N_##n(Atom* out, Phase* phase, Value* arg)
 
 
+//
+// EXTENSION COLLATOR FUNCTION DEFINITION
+//
+// Rebol Extensions generate DLLs (or embed into the EXE) with a function
+// that does initialization.  But that init function does not actually
+// decompress any of the script or spec code, make any natives, or run
+// any startup.  It just returns an aggregate of all the information that
+// would be needed to make the extension module.  So it is called a
+// "collator", and it calls the API `rebExtensionCollate_internal()`
+//
+// !!! The result may become an ACTION! as opposed to a BLOCK! of handle
+// values, but this is a work in progress.
+//
+#if defined(_WIN32)
+    typedef Value* (__cdecl ExtensionCollator)(RebolApiTable*);
+#else
+    typedef Value* (ExtensionCollator)(RebolApiTable*);
+#endif
+#define IDX_COLLATOR_SCRIPT 0
+#define IDX_COLLATOR_SCRIPT_NUM_CODEPOINTS 1
+#define IDX_COLLATOR_CFUNCS 2
+#define IDX_COLLATOR_MAX 3
+
+
 // PER-TYPE MAKE HOOKS: for `make datatype def`
 //
 // These functions must return a Value* to the type they are making

tools/file-base.r

@@ -222,14 +222,19 @@ generated: [
     tmp-boot-block.c
     tmp-type-hooks.c
     tmp-typesets.c
+    tmp-builtin-extension-table.c
+    tmp-rebol-api-table.c
 ]
 
 made: [
-    make-boot.r         core/tmp-boot-block.c
-    make-headers.r      include/tmp-internals.h
+    make-boot.r                 core/tmp-boot-block.c
+    make-extension-table.r      core/tmp-builtin-extension-table.c
+    make-librebol.r             core/tmp-rebol-api-table.c
 
-    make-host-init.r    include/host-init.h
-    make-reb-lib.r      include/rebol.h
+    make-headers.r              include/tmp-internals.h
+
+    make-host-init.r            include/host-init.h
+    make-librebol.r             include/rebol.h
 ]
 
 main: 'main.c

tools/make-boot.r

@@ -1117,6 +1117,13 @@ e-boot/emit [fields {
     EXTERN_C const REBLEN g_num_core_natives;
     EXTERN_C CFunction* const g_core_native_cfuncs[];
 
+    /*
+     * Builtin Extensions
+     */
+    EXTERN_C const unsigned int g_num_builtin_extensions;
+    EXTERN_C ExtensionCollator* const g_builtin_collators[];
+
+
     typedef struct REBOL_Boot_Block {
         $[Fields];
     } BOOT_BLK;

tools/make-boot-ext-header.r renamed to tools/make-extensions-table.r

@@ -1,10 +1,10 @@
 REBOL [
     System: "REBOL [R3] Language Interpreter and Run-time Environment"
-    Title: "Generate extention native header files"
-    File: %make-boot-ext-header.r  ; EMIT-HEADER uses to note emitting script
+    Title: "Generate table of ExtensionCollators for all built-in extensions"
+    File: %make-extensions-table.r  ; EMIT-HEADER uses this filename
     Rights: {
         Copyright 2017 Atronix Engineering
-        Copyright 2017-2018 Ren-C Open Source Contributors
+        Copyright 2017-2024 Ren-C Open Source Contributors
         REBOL is a trademark of REBOL Technologies
     }
     License: {
@@ -30,10 +30,10 @@ REBOL [
         be gathered in a table to be gathered up so the system can find them.
 
         This script gets the list of *only* the built-in extensions on the
-        command line, then builds that table.  It is included as part of
-        %a-lib.h, which exposes it via the rebBuiltinExtensions() API to
-        whatever client (C, JavaScript, etc.) that may want to start them
-        up selectively...which must be at some point *after* rebStartup().
+        command line, then builds that table.  It is exposed via the
+        rebBuiltinExtensions() API to whatever client (C, JavaScript, etc.)
+        that may want to start them up selectively...which must be at some
+        point *after* rebStartup().
     }
 ]
 
@@ -46,37 +46,48 @@ import <bootstrap-shim.r>
 import <common.r>
 import <common-emitter.r>
 
-r3: system/version > 2.100.0
-
 args: parse-args system/script/args  ; either from command line or DO/ARGS
 output-dir: join system/options/path %prep/
-mkdir/deep (join output-dir %include/)
 
 extensions: map-each e (split args/EXTENSIONS #":") [
     to-c-name e  ; so SOME-EXTENSION becomes SOME_EXTENSION for C macros
 ]
 
-e: make-emitter "Boot Modules" (
-    join output-dir %include/tmp-boot-extensions.inc
+e: make-emitter "Built-in Extensions" (
+    join output-dir %core/tmp-builtin-extension-table.c
 )
 
 e/emit [extensions {
-    #include "sys-ext.h"
+    #include "sys-core.h"  /* ExtensionCollator type, Value*, etc. */
+    #include "sys-ext.h"   /* DECLARE_EXTENSION_COLLATOR(), etc. */
+
+    #ifdef __cplusplus
+        extern "C" {
+    #endif
 
-    DECLARE_EXT_COLLATE($[Extensions]);
+    DECLARE_EXTENSION_COLLATOR($[Extensions]);
 
     #define NUM_BUILTIN_EXTENSIONS $<length of extensions>
 
+    /*
+     * NUM_BUILTIN_EXTENSIONS macro not visible outside this file, export
+     */
+    const unsigned int g_num_builtin_extensions = NUM_BUILTIN_EXTENSIONS;
+
     /*
      * List of C functions that can be called to fetch the collated info that
      * the system needs to bring an extension into being.  No startup or
      * decompression code is run when these functions are called...they just
      * return information needed for later reifying those extensions.
      */
-    static RebolExtensionCollator *g_builtin_collators[] = {
+    ExtensionCollator* const g_builtin_collators[] = {
         RX_COLLATE_NAME($[Extensions]),
         nullptr  /* Just for guaranteeing length > 0, as C++ requires it */
     };
+
+    #ifdef __cplusplus
+        }  /* end extern "C" */
+    #endif
 }]
 
 e/write-emitted

tools/make-headers.r

@@ -81,7 +81,7 @@ emit-proto: func [
     switch header/2 [
         'RL_API [
             ; Currently the RL_API entries should only occur in %a-lib.c, and
-            ; are processed by %make-reb-lib.r.  Their RL_XxxYyy() forms are
+            ; are processed by %make-librebol.r.  Their RL_XxxYyy() forms are
             ; not in the %tmp-internals.h file, but core includes %rebol.h
             ; and considers itself to have "non-extension linkage" to the API,
             ; so the calls can be directly linked without a struct.