added blocked private_file and private flags

diff --git a/bin/onyx b/bin/onyx
index f4d515716ef1e05a460e52ec6e516df41ed7319b..122314bb0ef4dc366ba45d8e150944a0f1793f77 100755 (executable)
Binary files a/bin/onyx and b/bin/onyx differ

diff --git a/core/container/iter.onyx b/core/container/iter.onyx
index 97217cb28ce297914eb2d7f3baab0addca19d7a9..8bafc5d05ff64e1524fb2b3a154c60c447d55cc1 100644 (file)
--- a/core/container/iter.onyx
+++ b/core/container/iter.onyx
@@ -50,7 +50,7 @@ map :: (it: Iterator($T), transform: (T) -> $R) -> Iterator(R) {
 
     next :: ($T: type_expr, $R: type_expr, mi: ^MapIterator(T, R)) -> (R, bool) {
         value, cont := mi.iterator.next(mi.iterator.data);
-        if !cont do return value, false;
+        if !cont do return __zero_value(R), false;
 
         return mi.transform(value), true;
     }

diff --git a/include/onyxparser.h b/include/onyxparser.h
index 1686320b93a3e49f007dc8656f0ab5cf8aa77629..712ac2829098ee538c53b554b77e68bf4e97603b 100644 (file)
--- a/include/onyxparser.h
+++ b/include/onyxparser.h
@@ -28,6 +28,8 @@ typedef struct OnyxParser {
     Scope *current_scope;
     bh_arr(bh_arr(Entity *) *) alternate_entity_placement_stack;
 
+    bh_arr(AstFlags) scope_flags;
+
     b32 hit_unexpected_token : 1;
 } OnyxParser;
 

diff --git a/src/onyxparser.c b/src/onyxparser.c
index 1c3a796180484ae3726c9ec986c23f0c682b5bcc..1c60685f39f50176f528582f22bf562801e13e36 100644 (file)
--- a/src/onyxparser.c
+++ b/src/onyxparser.c
@@ -72,6 +72,7 @@ static AstTyped*      parse_top_level_expression(OnyxParser* parser);
 static AstBinding*    parse_top_level_binding(OnyxParser* parser, OnyxToken* symbol);
 static void           parse_top_level_statement(OnyxParser* parser);
 static AstPackage*    parse_package_expression(OnyxParser* parser);
+static void           parse_top_level_statements_until(OnyxParser* parser, TokenType tt);
 
 static void consume_token(OnyxParser* parser) {
     if (parser->hit_unexpected_token) return;
@@ -2523,8 +2524,36 @@ static AstBinding* parse_top_level_binding(OnyxParser* parser, OnyxToken* symbol
 
 static void parse_top_level_statement(OnyxParser* parser) {
     AstFlags private_kind = 0;
-    if      (parse_possible_directive(parser, "private"))      private_kind = Ast_Flag_Private_Package;
-    else if (parse_possible_directive(parser, "private_file")) private_kind = Ast_Flag_Private_File;
+    if (bh_arr_length(parser->scope_flags) > 0)
+        private_kind = bh_arr_last(parser->scope_flags);
+
+    // :CLEANUP this very repetetive code...
+    if (parse_possible_directive(parser, "private")) {
+        private_kind = Ast_Flag_Private_Package;
+        if (parser->curr->type == '{') {
+            bh_arr_push(parser->scope_flags, private_kind);
+
+            expect_token(parser, '{');
+            parse_top_level_statements_until(parser, '}');
+            expect_token(parser, '}');
+
+            bh_arr_pop(parser->scope_flags);
+            return;
+        }
+    }
+    else if (parse_possible_directive(parser, "private_file")) {
+        private_kind = Ast_Flag_Private_File;
+        if (parser->curr->type == '{') {
+            bh_arr_push(parser->scope_flags, private_kind);
+
+            expect_token(parser, '{');
+            parse_top_level_statements_until(parser, '}');
+            expect_token(parser, '}');
+
+            bh_arr_pop(parser->scope_flags);
+            return;
+        }
+    }
 
     AstBinding* binding = NULL;
 
@@ -2535,11 +2564,6 @@ static void parse_top_level_statement(OnyxParser* parser) {
             return;
         }
 
-        // case Token_Type_Keyword_Proc:
-        //     onyx_report_warning(parser->curr->pos, "Warning: 'proc' is a deprecated keyword.");
-        //     parse_top_level_expression(parser);
-        //     return;
-
         case Token_Type_Symbol: {
             OnyxToken* symbol = expect_token(parser, Token_Type_Symbol);
             expect_token(parser, ':');
@@ -2776,6 +2800,14 @@ static Package* parse_file_package(OnyxParser* parser) {
     return package_node->package;
 }
 
+static void parse_top_level_statements_until(OnyxParser* parser, TokenType tt) {
+    while (parser->curr->type != tt) {
+        if (parser->hit_unexpected_token) break;
+        if (onyx_has_errors()) break;
+        parse_top_level_statement(parser);
+    }
+}
+
 
 // NOTE: This returns a void* so I don't need to cast it everytime I use it
 void* onyx_ast_node_new(bh_allocator alloc, i32 size, AstKind kind) {
@@ -2797,6 +2829,7 @@ OnyxParser onyx_parser_create(bh_allocator alloc, OnyxTokenizer *tokenizer) {
     parser.hit_unexpected_token = 0;
     parser.current_scope = NULL;
     parser.alternate_entity_placement_stack = NULL;
+    parser.scope_flags = NULL;
 
     parser.polymorph_context = (PolymorphicContext) {
         .root_node = NULL,
@@ -2804,6 +2837,7 @@ OnyxParser onyx_parser_create(bh_allocator alloc, OnyxTokenizer *tokenizer) {
     };
 
     bh_arr_new(global_heap_allocator, parser.alternate_entity_placement_stack, 4);
+    bh_arr_new(global_heap_allocator, parser.scope_flags, 4);
 
     return parser;
 }
@@ -2825,11 +2859,7 @@ void onyx_parse(OnyxParser *parser) {
     implicit_use_builtin->expr = (AstTyped *) implicit_builtin_package;
     ENTITY_SUBMIT(implicit_use_builtin);
 
-    while (parser->curr->type != Token_Type_End_Stream) {
-        if (parser->hit_unexpected_token) break;
-        if (onyx_has_errors()) break;
-        parse_top_level_statement(parser);
-    }
+    parse_top_level_statements_until(parser, Token_Type_End_Stream);
 
     parser->current_scope = parser->current_scope->parent;
 }