From ac4712ff5859bc3db5e86c90885059fa7a818d55 Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Fri, 19 Jun 2020 17:21:45 -0700 Subject: [PATCH] Fixed module parse error --- meshcore/agentcore.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c index 2f18069..d65141b 100644 --- a/meshcore/agentcore.c +++ b/meshcore/agentcore.c @@ -4690,19 +4690,11 @@ duk_ret_t MeshAgent_ScriptMode_ZipSink2(duk_context *ctx) } else { - // Load as a module // [array][obj][name][tokens][filename][boolean] - duk_string_split(ctx, -2, "\\"); // [toks] - duk_array_pop(ctx, -1); // [toks][string] - duk_remove(ctx, -2); // [string] - duk_string_split(ctx, -1, "/"); // [string][toks] - duk_array_pop(ctx, -1); // [string][toks][string] - duk_remove(ctx, -2); // [toks][string] - duk_remove(ctx, -2); // [string] - - duk_string_split(ctx, -1, ".js"); // [array][obj][name][tokens][filename][boolean][string][tokens] - duk_array_shift(ctx, -1); // [array][obj][name][tokens][filename][boolean][string][tokens][name] - duk_get_prop_string(ctx, -8, "buffer"); // [array][obj][name][tokens][filename][boolean][string][tokens][name][buffer] - tmp = (char*)duk_to_lstring(ctx, -1, &tmpLen); + // Load as a module // [array][obj][name][tokens][filename][tokens][filename][boolean] + duk_string_split(ctx, -2, ".js"); // [array][obj][name][tokens][filename][tokens][filename][boolean][tokens] + duk_array_shift(ctx, -1); // [array][obj][name][tokens][filename][tokens][filename][boolean][tokens][name] + duk_get_prop_string(ctx, -9, "buffer"); // [array][obj][name][tokens][filename][tokens][filename][boolean][tokens][name][buffer] + tmp = (char*)Duktape_GetBuffer(ctx, -1, &tmpLen); ILibDuktape_ModSearch_AddModule(ctx, (char*)duk_get_string(ctx, -2), tmp, (int)tmpLen); } }