phase: 20.49 COMPLETE; 20.50 Flow+String minimal reps; 20.51 selfhost v0/v1 minimal (Option A/B); hv1-inline binop/unop/copy; docs + run_all + CURRENT_TASK -> 21.0
This commit is contained in:
@ -287,7 +287,7 @@ def combine(entry: str, fix_braces: bool, dedup_box: bool, dedup_fn: bool, seam_
|
||||
return modules[ns]
|
||||
# try using paths as base dirs
|
||||
for base in using_paths or []:
|
||||
cand = os.path.join(base, *(ns.split('.'))) + '.nyash'
|
||||
cand = os.path.join(base, *(ns.split('.'))) + '.hako'
|
||||
if os.path.exists(cand):
|
||||
return cand
|
||||
return None
|
||||
@ -315,7 +315,7 @@ def combine(entry: str, fix_braces: bool, dedup_box: bool, dedup_fn: bool, seam_
|
||||
else:
|
||||
tgt, alias = rest, None
|
||||
# path vs ns
|
||||
is_path = tgt.startswith('"') or tgt.startswith('./') or tgt.startswith('/') or tgt.endswith('.nyash')
|
||||
is_path = tgt.startswith('"') or tgt.startswith('./') or tgt.startswith('/') or tgt.endswith('.hako')
|
||||
if is_path:
|
||||
path_tgt = tgt.strip('"')
|
||||
name = alias or os.path.splitext(os.path.basename(path_tgt))[0]
|
||||
@ -328,7 +328,7 @@ def combine(entry: str, fix_braces: bool, dedup_box: bool, dedup_fn: bool, seam_
|
||||
prelude = []
|
||||
for ns, alias in used:
|
||||
path_tgt = None
|
||||
if alias is not None and (ns.startswith('/') or ns.startswith('./') or ns.endswith('.nyash')):
|
||||
if alias is not None and (ns.startswith('/') or ns.startswith('./') or ns.endswith('.hako')):
|
||||
path_tgt = ns
|
||||
else:
|
||||
if alias is None:
|
||||
|
||||
Reference in New Issue
Block a user