Commit b660134a18a308a3a4378c98b78b84595da34e7e | zig

author	LemonBoy <thatlemon@gmail.com> 2019-05-18 23:48:38+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-05-19 00:32:49-04:00
log	b660134a18a308a3a4378c98b78b84595da34e7e
tree	94dd218222c1a14256aa4a64d3e7dead7e9598f0
parent	860684cc2f867b568137319930981904968c9577

Use the correct scope for `use`

use expressions outside the top-level scope now work as intended.

3 files changed, 31 insertions(+), 19 deletions(-)

src
- analyze.cpp
- analyze.hpp
test
- stage1
  - behavior
    import.zig

src/analyze.cpp+20-16

 @@ -3313,8 +3313,8 @@ Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name) {
     for (size_t i = 0; i < decls_scope->use_decls.length; i += 1) {
         AstNode *use_decl_node = decls_scope->use_decls.at(i);
         if (use_decl_node->data.use.resolution == TldResolutionUnresolved) {
-            preview_use_decl(g, use_decl_node);
+            preview_use_decl(g, use_decl_node, decls_scope);
-            resolve_use_decl(g, use_decl_node);
+            resolve_use_decl(g, use_decl_node, decls_scope);
         }
     }
 @@ -3754,14 +3754,14 @@ static void analyze_fn_body(CodeGen *g, ZigFn *fn_table_entry) {
     analyze_fn_ir(g, fn_table_entry, return_type_node);
 }
-static void add_symbols_from_import(CodeGen *g, AstNode *src_use_node, AstNode *dst_use_node) {
+static void add_symbols_from_import(CodeGen *g, AstNode *src_use_node, AstNode *dst_use_node, ScopeDecls* decls_scope) {
     if (src_use_node->data.use.resolution == TldResolutionUnresolved) {
-        preview_use_decl(g, src_use_node);
+        preview_use_decl(g, src_use_node, decls_scope);
     }
     ConstExprValue *use_target_value = src_use_node->data.use.using_namespace_value;
     if (type_is_invalid(use_target_value->type)) {
-        get_container_scope(dst_use_node->owner)->any_imports_failed = true;
+        decls_scope->any_imports_failed = true;
         return;
     }
 @@ -3775,12 +3775,12 @@ static void add_symbols_from_import(CodeGen *g, AstNode *src_use_node, AstNode *
     if (target_import->id != ZigTypeIdStruct) {
         add_node_error(g, dst_use_node,
             buf_sprintf("expected struct, found '%s'", buf_ptr(&target_import->name)));
-        get_container_scope(dst_use_node->owner)->any_imports_failed = true;
+        decls_scope->any_imports_failed = true;
         return;
     }
     if (get_container_scope(target_import)->any_imports_failed) {
-        get_container_scope(dst_use_node->owner)->any_imports_failed = true;
+        decls_scope->any_imports_failed = true;
     }
     auto it = get_container_scope(target_import)->decl_table.entry_iterator();
 @@ -3798,7 +3798,7 @@ static void add_symbols_from_import(CodeGen *g, AstNode *src_use_node, AstNode *
         Buf *target_tld_name = entry->key;
-        auto existing_entry = get_container_scope(dst_use_node->owner)->decl_table.put_unique(target_tld_name, target_tld);
+        auto existing_entry = decls_scope->decl_table.put_unique(target_tld_name, target_tld);
         if (existing_entry) {
             Tld *existing_decl = existing_entry->value;
             if (existing_decl != target_tld) {
 @@ -3814,11 +3814,11 @@ static void add_symbols_from_import(CodeGen *g, AstNode *src_use_node, AstNode *
     for (size_t i = 0; i < get_container_scope(target_import)->use_decls.length; i += 1) {
         AstNode *use_decl_node = get_container_scope(target_import)->use_decls.at(i);
         if (use_decl_node->data.use.visib_mod != VisibModPrivate)
-            add_symbols_from_import(g, use_decl_node, dst_use_node);
+            add_symbols_from_import(g, use_decl_node, dst_use_node, decls_scope);
     }
 }
-void resolve_use_decl(CodeGen *g, AstNode *node) {
+void resolve_use_decl(CodeGen *g, AstNode *node, ScopeDecls *decls_scope) {
     assert(node->type == NodeTypeUse);
     if (node->data.use.resolution == TldResolutionOk ||
 @@ -3826,10 +3826,10 @@ void resolve_use_decl(CodeGen *g, AstNode *node) {
     {
         return;
     }
-    add_symbols_from_import(g, node, node);
+    add_symbols_from_import(g, node, node, decls_scope);
 }
-void preview_use_decl(CodeGen *g, AstNode *node) {
+void preview_use_decl(CodeGen *g, AstNode *node, ScopeDecls *decls_scope) {
     assert(node->type == NodeTypeUse);
     if (node->data.use.resolution == TldResolutionOk ||
 @@ -3839,11 +3839,11 @@ void preview_use_decl(CodeGen *g, AstNode *node) {
     }
     node->data.use.resolution = TldResolutionResolving;
-    ConstExprValue *result = analyze_const_value(g, &get_container_scope(node->owner)->base,
+    ConstExprValue *result = analyze_const_value(g, &decls_scope->base,
         node->data.use.expr, g->builtin_types.entry_type, nullptr);
     if (type_is_invalid(result->type))
-        get_container_scope(node->owner)->any_imports_failed = true;
+        decls_scope->any_imports_failed = true;
     node->data.use.using_namespace_value = result;
 }
 @@ -3967,8 +3967,12 @@ void semantic_analyze(CodeGen *g) {
     {
         for (; g->use_queue_index < g->use_queue.length; g->use_queue_index += 1) {
             AstNode *use_decl_node = g->use_queue.at(g->use_queue_index);
-            preview_use_decl(g, use_decl_node);
+            // Get the top-level scope where `use` is used
-            resolve_use_decl(g, use_decl_node);
+            ScopeDecls *decls_scope = get_container_scope(use_decl_node->owner);
+            if (use_decl_node->data.use.resolution == TldResolutionUnresolved) {
+                preview_use_decl(g, use_decl_node, decls_scope);
+                resolve_use_decl(g, use_decl_node, decls_scope);
+            }
         }
         for (; g->resolve_queue_index < g->resolve_queue.length; g->resolve_queue_index += 1) {
             Tld *tld = g->resolve_queue.at(g->resolve_queue_index);

src/analyze.hpp+2-2

...	@@ -86,8 +86,8 @@ bool is_array_ref(ZigType *type_entry);	...	@@ -86,8 +86,8 @@ bool is_array_ref(ZigType *type_entry);
86	bool is_container_ref(ZigType *type_entry);	86	bool is_container_ref(ZigType *type_entry);
87	bool is_valid_vector_elem_type(ZigType *elem_type);	87	bool is_valid_vector_elem_type(ZigType *elem_type);
88	void scan_decls(CodeGen g, ScopeDecls decls_scope, AstNode *node);	88	void scan_decls(CodeGen g, ScopeDecls decls_scope, AstNode *node);
89	void preview_use_decl(CodeGen g, AstNode node);	89	void preview_use_decl(CodeGen g, AstNode node, ScopeDecls* decls_scope);
90	void resolve_use_decl(CodeGen g, AstNode node);	90	void resolve_use_decl(CodeGen g, AstNode node, ScopeDecls* decls_scope);
91	ZigFn scope_fn_entry(Scope scope);	91	ZigFn scope_fn_entry(Scope scope);
92	ZigPackage scope_package(Scope scope);	92	ZigPackage scope_package(Scope scope);
93	ZigType get_scope_import(Scope scope);	93	ZigType get_scope_import(Scope scope);

test/stage1/behavior/import.zig+9-1

 @@ -1,10 +1,18 @@
 const expect = @import("std").testing.expect;
+const expectEqual = @import("std").testing.expectEqual;
 const a_namespace = @import("import/a_namespace.zig");
 test "call fn via namespace lookup" {
-    expect(a_namespace.foo() == 1234);
+    expectEqual(i32(1234), a_namespace.foo());
 }
 test "importing the same thing gives the same import" {
     expect(@import("std") == @import("std"));
 }
+test "import in non-toplevel scope" {
+    const S = struct {
+        use @import("import/a_namespace.zig");
+    };
+    expectEqual(i32(1234), S.foo());
+}