Skip to content

fix(MESHAGEN-002): CU-86akhf8u3 Non-ILibDuktape_-prefixed helper functions in a microscript binding file #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
flamingo wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −17
Draft

fix(MESHAGEN-002): CU-86akhf8u3 Non-ILibDuktape_-prefixed helper functions in a microscript binding file #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions microscript/ILibDuktapeModSearch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ limitations under the License.

int ILibDuktape_ModSearch_ShowNames = 0;

duk_ret_t ModSearchTable_Get(duk_context *ctx, duk_idx_t table, char *key, char *id)

@flamingo flamingo Bot Sep 14, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🦩 🟠 Non-ILibDuktape_-prefixed helper functions in a microscript binding file

Renamed the four file-local helper functions to carry the ILibDuktape_ prefix per MESHAGEN-002: ModSearchTable_Get -> ILibDuktape_ModSearchTable_Get, ModSearchTable_Put -> ILibDuktape_ModSearchTable_Put, mod_Search -> ILibDuktape_ModSearch_Search, mod_Search_Files -> ILibDuktape_ModSearch_Search_Files. Updated every call site within this file (in ILibDuktape_ModSearch_GetJSModuleDate, ILibDuktape_ModSearch_IsRequired, ILibDuktape_ModSearch_GetJSModule, ILibDuktape_ModSearch_AddModuleObject, ILibDuktape_ModSearch_AddModuleEx, ILibDuktape_ModSearch_AddHandler, and ILibDuktape_ModSearch_Init where mod_Search is registered via duk_push_c_function) to use the new names. These functions were not declared in the header (only visible in this .c file), so no other files reference the old names; risk is limited to unseen forward declarations elsewhere in the repo, which I could not inspect.

🤖 Prompt for AI agents 
In microscript/ILibDuktapeModSearch.c around line 44, review and complete this code-review fix: Non-ILibDuktape_-prefixed helper functions in a microscript binding file.
What the draft fix changed: Renamed the four file-local helper functions to carry the ILibDuktape_ prefix per MESHAGEN-002: `ModSearchTable_Get` -> `ILibDuktape_ModSearchTable_Get`, `ModSearchTable_Put` -> `ILibDuktape_ModSearchTable_Put`, `mod_Search` -> `ILibDuktape_ModSearch_Search`, `mod_Search_Files` -> `ILibDuktape_ModSearch_Search_Files`. Updated every call site within this file (in `ILibDuktape_ModSearch_GetJSModuleDate`, `ILibDuktape_ModSearch_IsRequired`, `ILibDuktape_ModSearch_GetJSModule`, `ILibDuktape_ModSearch_AddModuleObject`, `ILibDuktape_ModSearch_AddModuleEx`, `ILibDuktape_ModSearch_AddHandler`, and `ILibDuktape_ModSearch_Init` where `mod_Search` is registered via `duk_push_c_function`) to use the new names. These functions were not declared in the header (only visible in this .c file), so no other files reference the old names; risk is limited to unseen forward declarations elsewhere in the repo, which I could not inspect.
Verify the change is correct and complete; do not refactor unrelated code.

fix confidence: 🟡 85 medium — react 👍/👎 to teach the reviewer

duk_ret_t ILibDuktape_ModSearchTable_Get(duk_context *ctx, duk_idx_t table, char *key, char *id)
{
if (!duk_has_prop_string(ctx, table, id))
{
Expand All @@ -57,7 +57,7 @@ duk_ret_t ModSearchTable_Get(duk_context *ctx, duk_idx_t table, char *key, char
duk_remove(ctx, -2); // [table][...][value]
return(1);
}
duk_ret_t ModSearchTable_Put(duk_context *ctx, duk_idx_t table, char *key, char *id)
duk_ret_t ILibDuktape_ModSearchTable_Put(duk_context *ctx, duk_idx_t table, char *key, char *id)
{
if (!duk_has_prop_string(ctx, table, id))
{
Expand Down Expand Up @@ -106,7 +106,7 @@ uint32_t ILibDuktape_ModSearch_GetJSModuleDate(duk_context *ctx, char *id)
// use result from module table
retVal = 0;
duk_get_prop_string(ctx, -3, "ModSearchTable"); // [stash][fileName][result][table]
if (ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleFileDate, id) > 0)
if (ILibDuktape_ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleFileDate, id) > 0)
{
retVal = (uint32_t)duk_get_uint(ctx, -1);
}
Expand All @@ -123,7 +123,7 @@ int ILibDuktape_ModSearch_IsRequired(duk_context *ctx, char *id, size_t idLen)

duk_push_heap_stash(ctx); // [stash]
duk_get_prop_string(ctx, -1, "ModSearchTable"); // [stash][table]
if (ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleRequired, id) > 0)
if (ILibDuktape_ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleRequired, id) > 0)
{
ret = duk_get_boolean(ctx, -1) ? 1 : 0;
}
Expand Down Expand Up @@ -159,7 +159,7 @@ duk_ret_t ILibDuktape_ModSearch_GetJSModule(duk_context *ctx, char *id)
else
{
duk_get_prop_string(ctx, -2, "ModSearchTable"); // [stash][str][table]
if(ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleFile, id)>0)
if(ILibDuktape_ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleFile, id)>0)
{
return(1);
}
Expand All @@ -174,20 +174,20 @@ void ILibDuktape_ModSearch_AddModuleObject(duk_context *ctx, char *id, void *hea
duk_push_heap_stash(ctx); // [stash]
duk_get_prop_string(ctx, -1, "ModSearchTable"); // [stash][table]
duk_push_heapptr(ctx, heapptr); // [stash][table][object]
ModSearchTable_Put(ctx, -2, ILibDuktape_ModSearch_ModuleObject, id);// [stash][table]
ILibDuktape_ModSearchTable_Put(ctx, -2, ILibDuktape_ModSearch_ModuleObject, id);// [stash][table]
duk_pop_2(ctx); // ...
}
int ILibDuktape_ModSearch_AddModuleEx(duk_context *ctx, char *id, char *module, int moduleLen, char *mtime)
{
duk_push_heap_stash(ctx); // [stash]
duk_get_prop_string(ctx, -1, "ModSearchTable"); // [stash][table]
duk_push_lstring(ctx, module, moduleLen); // [stash][table][module]
ModSearchTable_Put(ctx, -2, ILibDuktape_ModSearch_ModuleFile, id); // [stash][table]
ILibDuktape_ModSearchTable_Put(ctx, -2, ILibDuktape_ModSearch_ModuleFile, id); // [stash][table]
if (mtime != NULL)
{
duk_push_sprintf(ctx, "(new Date('%s')).getTime()/1000", mtime); // [stash][table][string]
duk_eval(ctx); // [stash][table][uint]
ModSearchTable_Put(ctx, -2, ILibDuktape_ModSearch_ModuleFileDate, id); // [stash][table]
ILibDuktape_ModSearchTable_Put(ctx, -2, ILibDuktape_ModSearch_ModuleFileDate, id); // [stash][table]
}
duk_pop_2(ctx); // ...
return(0);
Expand All @@ -197,12 +197,12 @@ int ILibDuktape_ModSearch_AddHandler(duk_context *ctx, char *id, ILibDuktape_Mod
duk_push_heap_stash(ctx); // [stash]
duk_get_prop_string(ctx, -1, "ModSearchTable"); // [stash][table]
duk_push_pointer(ctx, (void*)handler); // [stash][table][ptr]
ModSearchTable_Put(ctx, -2, ILibDuktape_ModSearch_ModuleFunc, id); // [stash][table]
ILibDuktape_ModSearchTable_Put(ctx, -2, ILibDuktape_ModSearch_ModuleFunc, id); // [stash][table]
duk_pop_2(ctx); // ...
return(0);
}

duk_ret_t mod_Search_Files(duk_context *ctx, char* id)
duk_ret_t ILibDuktape_ModSearch_Search_Files(duk_context *ctx, char* id)
{
char fileName[255];
char *data;
Expand Down Expand Up @@ -241,7 +241,7 @@ void ILibDuktape_ModSearch_AddHandler_AlsoIncludeJS(duk_context *ctx, char *js,
duk_pop(ctx); // ...
}

duk_ret_t mod_Search(duk_context *ctx)
duk_ret_t ILibDuktape_ModSearch_Search(duk_context *ctx)
{
duk_size_t idLen;
char *id;
Expand All @@ -265,14 +265,14 @@ duk_ret_t mod_Search(duk_context *ctx)
duk_get_prop_string(ctx, -1, "ModSearchTable"); // [func][chain][DB][stash][table]

// First check if there is a JS Object override
if (ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleObject, id) > 0) // [func][chain][DB][stash][table][obj]
if (ILibDuktape_ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleObject, id) > 0) // [func][chain][DB][stash][table][obj]
{
duk_put_prop_string(ctx, 3, "exports"); // [func][chain][DB][stash][table][obj]
return(0);
}

// Check if there is a native handler
if (ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleFunc, id) > 0) // [func][chain][DB][stash][table][ptr]
if (ILibDuktape_ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleFunc, id) > 0) // [func][chain][DB][stash][table][ptr]
{
// Init this temp value, to detect if the module wants to add JS code
duk_del_prop_string(ctx, -3, ILibDuktape_ModSearch_JSInclude);
Expand All @@ -294,18 +294,18 @@ duk_ret_t mod_Search(duk_context *ctx)
else
{ // [func][chain][DB][stash][table]
// Check the local filesystem, becuase if present, those should take precedence
if(mod_Search_Files(ctx, id) == 1)
if(ILibDuktape_ModSearch_Search_Files(ctx, id) == 1)
{
return(1);
}

if (ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleFile, id) > 0)
if (ILibDuktape_ModSearchTable_Get(ctx, -1, ILibDuktape_ModSearch_ModuleFile, id) > 0)
{ // [func][chain][DB][stash][table][string]
//
// Let's mark that this was already "require'ed"
//
duk_push_true(ctx); // [func][chain][DB][stash][table][string][true]
ModSearchTable_Put(ctx, -3, ILibDuktape_ModSearch_ModuleRequired, id); // [func][chain][DB][stash][table][string]
ILibDuktape_ModSearchTable_Put(ctx, -3, ILibDuktape_ModSearch_ModuleRequired, id); // [func][chain][DB][stash][table][string]
return(1);
}
else if (mDS == NULL)
Expand Down Expand Up @@ -361,7 +361,7 @@ void ILibDuktape_ModSearch_Init(duk_context * ctx, void * chain, ILibSimpleDataS
if (duk_ctx_chain(ctx) == NULL) { duk_ctx_context_data(ctx)->chain = chain; }

duk_get_global_string(ctx, "Duktape"); // [globalString]
duk_push_c_function(ctx, mod_Search, 4); // [globalString][func]
duk_push_c_function(ctx, ILibDuktape_ModSearch_Search, 4); // [globalString][func]
duk_push_pointer(ctx, chain); // [globalString][func][chain]
duk_put_prop_string(ctx, -2, "chain"); // [globalString][func]

Expand All @@ -384,3 +384,4 @@ void ILibDuktape_ModSearch_Init(duk_context * ctx, void * chain, ILibSimpleDataS
duk_put_prop_string(ctx, -2, "ModSearchTable"); // [stash]
duk_pop(ctx); // ...
}