mach loading

internal/engine.cm

@@ -1,4 +1,4 @@
-// Hidden vars (os, actorsym, init, core_path, shop_path, analyze, run_ast_fn, run_ast_noopt_fn, json) come from env
+// Hidden vars (os, actorsym, init, core_path, shop_path, analyze, run_ast_fn, run_ast_noopt_fn, json, use_cache) come from env
 // In actor spawn mode, also: nota, wota
 var ACTORDATA = actorsym
 var SYSYM = '__SYSTEM__'
@@ -53,7 +53,6 @@ var js = use_embed('js')
 // shop_path may be null if --core was used without --shop
 var packages_path = shop_path ? shop_path + '/packages' : null
 
-var use_cache = {}
 use_cache['core/os'] = os
 
 // Extra env properties added as engine initializes (log, runtime fns, etc.)
@@ -70,11 +69,18 @@ function use_core(path) {
   var result = null
   var script = null
   var ast = null
+  var c_cache_key = null
 
-  // Build env: merge core_extras, include C embed as 'native' if available
+  // If C embed exists, register it so .cm modules can use('internal/<name>_c')
+  if (sym) {
+    c_cache_key = 'core/internal/' + path + '_c'
+    if (!use_cache[c_cache_key])
+      use_cache[c_cache_key] = sym
+  }
+
+  // Build env: merge core_extras
   env = {use: use_core}
   arrfor(array(core_extras), function(k) { env[k] = core_extras[k] })
-  if (sym) env.native = sym
 
   // Check for pre-compiled .cm.mach file first
   var mach_path = core_path + '/' + path + '.cm.mach'