[[ Module Lcext ]] Allow module section to be a module name to resolve

montegoulding · montegoulding · commit 503345df8475 · 2019-04-23T11:58:02.000+10:00
This patch changes the deploy capsule for module files to permit either the data
of a module file or the name of a module to lookup. If it is a name then the module
should be included in the standalone as a builtin.
diff --git a/engine/src/mode_standalone.cpp b/engine/src/mode_standalone.cpp
@@ -389,28 +389,56 @@ bool MCStandaloneCapsuleCallback(void *p_self, const uint8_t *p_digest, MCCapsul
             return false;
         }
         
-        MCAutoValueRefBase<MCStreamRef> t_stream;
-        if (!MCMemoryInputStreamCreate(t_module_data.Bytes(),
-                                       p_length, &t_stream))
+        // This section is raw file data either a module or a name to resolve which should
+        // have been added as a builtin
+        bool t_is_module = true;
+        if (p_length >= 4 &&
+            !(t_module_data.Bytes()[0] == 'L' &&
+            t_module_data.Bytes()[1] == 'C' &&
+            t_module_data.Bytes()[2] == ((kMCScriptCurrentModuleVersion >> 0) & 0xFF) &&
+            t_module_data.Bytes()[3] == ((kMCScriptCurrentModuleVersion >> 8) & 0xFF)))
         {
-            MCresult -> sets("out of memory");
-            return false;
+            t_is_module = false;
         }
         
         MCAutoScriptModuleRefArray t_modules;
-        if (!MCScriptCreateModulesFromStream(*t_stream, t_modules))
+        MCScriptModuleRef t_main;
+        
+        if (t_is_module)
         {
-            MCAutoErrorRef t_error;
-            if (MCErrorCatch(&t_error))
-                MCresult->setvalueref(MCErrorGetMessage(*t_error));
-            else
-                MCresult->sets("out of memory");
+            MCAutoValueRefBase<MCStreamRef> t_stream;
+            if (!MCMemoryInputStreamCreate(t_module_data.Bytes(),
+                                           p_length, &t_stream))
+            {
+                MCresult -> sets("out of memory");
+                return false;
+            }
             
-            return false;
+            if (!MCScriptCreateModulesFromStream(*t_stream, t_modules))
+            {
+                MCAutoErrorRef t_error;
+                if (MCErrorCatch(&t_error))
+                    MCresult->setvalueref(MCErrorGetMessage(*t_error));
+                else
+                    MCresult->sets("out of memory");
+                
+                return false;
+            }
+            
+            t_main = t_modules[0];
+        }
+        else
+        {
+            MCNewAutoNameRef t_name;
+            if (!MCNameCreateWithNativeChars(t_module_data.Bytes(), p_length, &t_name) ||
+                !MCScriptLookupModule(*t_name, t_main) ||
+                !t_modules.Push(t_main))
+            {
+                MCresult->sets("out of memory");
+                return false;
+            }
         }
         
-        MCScriptModuleRef t_main = t_modules[0];
-
         MCAutoStringRef t_module_resources;
         if (!MCStringFormat(&t_module_resources, "%@/resources",
                             MCScriptGetNameOfModule(t_main)))
diff --git a/libscript/include/libscript/script.h b/libscript/include/libscript/script.h
@@ -582,6 +582,29 @@ typedef struct MCScriptForeignHandlerInfo *MCScriptForeignHandlerInfoRef;
 bool MCScriptForeignHandlerInfoParse(MCStringRef p_binding, MCScriptForeignHandlerInfoRef& r_info);
 void MCScriptForeignHandlerInfoRelease(MCScriptForeignHandlerInfoRef p_info);
 
+////////////////////////////////////////////////////////////////////////////////
+// Compiled modules are serialized to disk in the following format:
+//
+//   byte       magic[0] = 'L'
+//   byte       magic[1] = 'C'
+//   byte        version[0]
+//   byte       version[1]
+//   <pickle of module struct>
+
+// The module version will be incremented for every public release of the libscript
+// which occurs in which the module binary format changes.
+//
+// We will only aim to support module formats which have been released as final and
+// stable.
+//
+// The following constants keep track of, and should be updated to reflect the meaning
+// of each module version.
+
+#define kMCScriptModuleVersion_8_0_0_DP_1 0
+#define kMCScriptModuleVersion_8_1_0_DP_2 1
+#define kMCScriptModuleVersion_9_0_0_DP_4 2
+#define kMCScriptCurrentModuleVersion kMCScriptModuleVersion_9_0_0_DP_4
+
 ////////////////////////////////////////////////////////////////////////////////
 
 #endif
diff --git a/libscript/src/script-private.h b/libscript/src/script-private.h
@@ -896,28 +896,4 @@ MCScriptBytecodeDecodeSignedArgument(uindex_t p_original_value)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-// Compiled modules are serialized to disk in the following format:
-//
-//   byte       magic[0] = 'L'
-//   byte       magic[1] = 'C'
-//   byte    	version[0]
-//   byte       version[1]
-//   <pickle of module struct>
-
-// The module version will be incremented for every public release of the libscript
-// which occurs in which the module binary format changes.
-//
-// We will only aim to support module formats which have been released as final and
-// stable.
-//
-// The following constants keep track of, and should be updated to reflect the meaning
-// of each module version.
-
-#define kMCScriptModuleVersion_8_0_0_DP_1 0
-#define kMCScriptModuleVersion_8_1_0_DP_2 1
-#define kMCScriptModuleVersion_9_0_0_DP_4 2
-#define kMCScriptCurrentModuleVersion kMCScriptModuleVersion_9_0_0_DP_4
-
-////////////////////////////////////////////////////////////////////////////////
-
 #endif
