From 7d6b6dfc10c549238ceb11b0a01b3e440508cec4 Mon Sep 17 00:00:00 2001 From: Kyle Gunger Date: Sun, 21 Jul 2024 02:53:02 -0400 Subject: semi-broken file imports --- tnslc/parse/ast.tnsl | 58 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 4 deletions(-) (limited to 'tnslc/parse/ast.tnsl') diff --git a/tnslc/parse/ast.tnsl b/tnslc/parse/ast.tnsl index 86788e7..cdd0ae2 100644 --- a/tnslc/parse/ast.tnsl +++ b/tnslc/parse/ast.tnsl @@ -32,10 +32,11 @@ struct Node { ~Node cur = self.sub.get(i) cur`.end() ;/ + self.sub.end() ;/ ;/ -/; _ast_root_loop (~utils.File fin, ~Node mod, Token first) +/; _ast_block (~utils.File fin, ~Node mod, Token first) ;/ /; _ast_module (~utils.File fin, ~Node mod, Token first) @@ -54,15 +55,64 @@ struct Node { out.init(t, tmp.data) tmp = produce_next_token(fin, tmp) - _ast_root_loop(fin, ~out, tmp) + /; loop (tmp.eq(";/\0") !== true) + /; if (tmp.eq("import\0")) + first = produce_next_token(fin, tmp) + tmp.end() + tmp = first + + ~uint8 path = utils.unquote_str(tmp.data) + utils.File _import = fin`.relative(path) + _delete(path) + path = _import.path.to_cstr('/') + + _printf("Importing ./\0") + _printf(path) + _printf("\n\0") + _delete(path) + + _ast_file(~_import, mod) + _import.end() + + ;; else + first = produce_next_token(fin, tmp) + tmp.end() + tmp = first + ;/ + ;/ + mod`.sub.push(~out) ;/ /; _ast_file (~utils.File fin, ~Node mod) fin`.open() - Token tok = produce_first_token(fin) - _ast_root_loop(fin, mod, tok) + Token tmp = produce_first_token(fin) + Token first + /; loop (tmp._type !== TTYPE_ERR) + /; if (tmp.eq("import\0")) + first = produce_next_token(fin, tmp) + tmp.end() + tmp = first + + ~uint8 path = utils.unquote_str(tmp.data) + utils.File _import = fin`.relative(path) + _delete(path) + path = _import.path.to_cstr('/') + + _printf("Importing ./\0") + _printf(path) + _printf("\n\0") + _delete(path) + + _ast_file(~_import, mod) + _import.end() + ;; else + first = produce_next_token(fin, tmp) + tmp.end() + tmp = first + ;/ + ;/ fin`.close() ;/ -- cgit v1.2.3