From afd5f32e56d3d30bfa98fb35deff51febf50e594 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Tue, 11 Apr 2023 19:09:36 +0300 Subject: Improve extension --- src/asm_pass0.py | 4 +++- src/asm_pass1.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/asm_pass0.py b/src/asm_pass0.py index be6c46a..a0ae56d 100644 --- a/src/asm_pass0.py +++ b/src/asm_pass0.py @@ -1,4 +1,5 @@ from dataclasses import dataclass +import os.path from asm_ops import * from asm_eval import * @@ -26,7 +27,8 @@ def pass_0(lines: list[str], file_name: str) -> Result0: match keyword: case "@include": asm_file_name = args[0] - with open(asm_file_name, "r") as f: + path = os.path.join(os.path.dirname(file_name), asm_file_name + ".atk16") + with open(path, "r") as f: for incl_line in f.readlines(): result_lines.append(Result0Line( src_file=asm_file_name, diff --git a/src/asm_pass1.py b/src/asm_pass1.py index fee72ff..d462526 100644 --- a/src/asm_pass1.py +++ b/src/asm_pass1.py @@ -1,4 +1,6 @@ import importlib +import sys +import os.path from dataclasses import dataclass from asm_ops import * from asm_eval import * @@ -33,6 +35,7 @@ def pass_1(result0: Result0) -> Result1: case "@use": module_name, ops = args[0].split(":") ops_split = ops.split(",") + sys.path.append(os.path.dirname(line.src_file)) module = importlib.import_module(module_name) mod_expansions: OpExpansionDict = module.expansions for op in mod_expansions: -- cgit v1.3