zig

commit f72c36cd37a383ca7ca9e09cb6a665dfe2c73365 (tree)
parent 5df091fea98e91536f95e3b4bd5bcb0881f06989
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Tue,  1 Mar 2016 17:59:56 -0700

fix detection of @import and @c_import inside fn body

Diffstat:
M
src/analyze.cpp
 | 
8
++++----
M
test/run_tests.cpp
 | 
6
++++++

2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/analyze.cpp b/src/analyze.cpp
@@ -4021,8 +4021,8 @@ static TypeTableEntry *analyze_import(CodeGen *g, ImportTableEntry *import, Bloc
 {
     assert(node->type == NodeTypeFnCallExpr);
 
-    if (context != import->block_context) {
-        add_node_error(g, node, buf_sprintf("@import valid only at top level scope"));
+    if (context->fn_entry) {
+        add_node_error(g, node, buf_sprintf("@import invalid inside function bodies"));
         return g->builtin_types.entry_invalid;
     }
 
@@ -4096,8 +4096,8 @@ static TypeTableEntry *analyze_c_import(CodeGen *g, ImportTableEntry *parent_imp
 {
     assert(node->type == NodeTypeFnCallExpr);
 
-    if (parent_context != parent_import->block_context) {
-        add_node_error(g, node, buf_sprintf("@c_import valid only at top level scope"));
+    if (parent_context->fn_entry) {
+        add_node_error(g, node, buf_sprintf("@c_import invalid inside function bodies"));
         return g->builtin_types.entry_invalid;
     }
 
diff --git a/test/run_tests.cpp b/test/run_tests.cpp
@@ -1764,6 +1764,12 @@ fn f(n: Number) -> i32 {
     }
 }
     )SOURCE", 1, ".tmp_source.zig:9:5: error: enumeration value 'Four' not handled in switch");
+
+    add_compile_fail_case("import inside function body", R"SOURCE(
+fn f() {
+    const std = @import("std");
+}
+    )SOURCE", 1, ".tmp_source.zig:3:17: error: @import invalid inside function bodies");
 }
 
 //////////////////////////////////////////////////////////////////////////////