john/cell
1
0
Fork 0
Code Issues 31 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix merge

Browse Source
This commit is contained in:
John Alanbrook
2026-02-10 09:21:33 -06:00
parent fe6033d6cb ded5f7d74b
commit 58f185b379
12 changed files with 1534 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/bootstrap.cm
View File

@@ -1,6 +1,8 @@
// Hidden vars come from env:
// CLI mode (cell_init): os, args, core_path, use_mcode
// Actor spawn (script_startup): os, json, nota, wota, actorsym, init, core_path
// CLI mode (cell_init): os, args, shop_path, use_mcode
// Actor spawn (script_startup): os, json, nota, wota, actorsym, init, shop_path
var core_path = shop_path + '/packages/core'
// args[0] = script name, args[1..] = user args
var load_internal = os.load_internal
function use_embed(name) {
return load_internal("js_" + name + "_use")
@@ -158,7 +160,7 @@ if (args != null) {
// Actor spawn mode — load engine.cm with full actor env
load_engine({
os: os, actorsym: actorsym, init: init,
core_path: core_path, json: json, nota: nota, wota: wota,
shop_path: shop_path, json: json, nota: nota, wota: wota,
analyze: analyze, run_ast_fn: run_ast
})
}

8
internal/engine.cm
View File

@@ -1,4 +1,4 @@
// Hidden vars (os, actorsym, init, core_path, analyze, run_ast_fn, json) come from env
// Hidden vars (os, actorsym, init, shop_path, analyze, run_ast_fn, json) come from env
// In actor spawn mode, also: nota, wota
var ACTORDATA = actorsym
var SYSYM = '__SYSTEM__'
@@ -53,9 +53,9 @@ function ends_with(str, suffix) {
var fd = use_embed('fd')
var js = use_embed('js')
// Derive shop path from core_path (core_path = ~/.cell/packages/core)
var packages_path = core_path + '/..'
var shop_path = packages_path + '/..'
// shop_path comes from env (bootstrap.cm passes it through)
var packages_path = shop_path + '/packages'
var core_path = packages_path + '/core'
var use_cache = {}
use_cache['core/os'] = os