Merge branch 'master' into pluggable-modules
authorBrendan Hansen <brendan.f.hansen@gmail.com>
Sun, 5 Dec 2021 21:27:23 +0000 (15:27 -0600)
committerBrendan Hansen <brendan.f.hansen@gmail.com>
Sun, 5 Dec 2021 21:27:23 +0000 (15:27 -0600)
1  2 
include/astnodes.h
src/astnodes.c
src/entities.c
src/parser.c
src/symres.c
src/wasm_runtime.c

index 3f9ce101eeff79ea25dd7033f7f9dc79aa4d1ea5,921f8ea75f91a0cc681eba78bc467c29bf3015c6..f2eb464a4139898cb9c90afa662dca5035b40469
@@@ -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,
      
diff --cc src/astnodes.c
Simple merge
diff --cc src/entities.c
Simple merge
diff --cc src/parser.c
Simple merge
diff --cc src/symres.c
Simple merge
Simple merge