From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Sun, 5 Dec 2021 21:27:23 +0000 (-0600)
Subject: Merge branch 'master' into pluggable-modules
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=772e6e6c401b8b2b0e2e9030d968024d52de5ca1;p=onyx.git

Merge branch 'master' into pluggable-modules
---

772e6e6c401b8b2b0e2e9030d968024d52de5ca1
diff --cc include/astnodes.h
index 3f9ce101,921f8ea7..f2eb464a
--- a/include/astnodes.h
+++ b/include/astnodes.h
@@@ -1270,13 -1272,13 +1274,20 @@@ struct AstMacro 
      AstTyped* body;
  };
  
 +struct AstDirectiveLibrary {
 +    AstNode_base;
 +
 +    AstTyped *library_symbol; // This should resolve to a string literal
 +    char *library_name;
 +};
 +
+ struct AstForeignBlock {
+     AstNode_base;
+ 
+     OnyxToken *module_name;
+     bh_arr(struct Entity *) captured_entities;
+ };
+ 
  typedef enum EntityState {
      Entity_State_Error,