Commit 523e3b86af44b97bcf68e3eb0956ef297421ee10 | zig

author	Andrew Kelley <andrew@ziglang.org> 2016-01-22 22:02:07-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2016-01-22 22:02:07-07:00
log	523e3b86af44b97bcf68e3eb0956ef297421ee10
tree	61b3743aced3715ebc8f811cc3477fca45d0ad20
parent	21fc5a6402c527675900397ea60f107730985f1c

support statically initialized array literal

4 files changed, 38 insertions(+), 16 deletions(-)

src
- analyze.cpp
- codegen.cpp
std
- std.zig
test
- run_tests.cpp

src/analyze.cpp+16-4

 @@ -34,8 +34,6 @@ static AstNode *first_executing_node(AstNode *node) {
             return first_executing_node(node->data.field_access_expr.struct_expr);
         case NodeTypeSwitchRange:
             return first_executing_node(node->data.switch_range.start);
-        case NodeTypeContainerInitExpr:
-            return first_executing_node(node->data.container_init_expr.type);
         case NodeTypeRoot:
         case NodeTypeRootExportDecl:
         case NodeTypeFnProto:
 @@ -72,6 +70,7 @@ static AstNode *first_executing_node(AstNode *node) {
         case NodeTypeSwitchExpr:
         case NodeTypeSwitchProng:
         case NodeTypeArrayType:
+        case NodeTypeContainerInitExpr:
             return node;
     }
     zig_unreachable();
 @@ -1586,9 +1585,22 @@ static TypeTableEntry *analyze_container_init_expr(CodeGen *g, ImportTableEntry
         assert(pointer_type->id == TypeTableEntryIdPointer);
         TypeTableEntry *child_type = pointer_type->data.pointer.child_type;
+        ConstExprValue *const_val = &get_resolved_expr(node)->const_val;
+        const_val->ok = true;
+        const_val->data.x_array.fields = allocate<ConstExprValue*>(elem_count);
         for (int i = 0; i < elem_count; i += 1) {
-            AstNode *elem_node = container_init_expr->entries.at(i);
+            AstNode **elem_node = &container_init_expr->entries.at(i);
-            analyze_expression(g, import, context, child_type, elem_node);
+            analyze_expression(g, import, context, child_type, *elem_node);
+            if (const_val->ok) {
+                ConstExprValue *elem_const_val = &get_resolved_expr(*elem_node)->const_val;
+                if (elem_const_val->ok) {
+                    const_val->data.x_array.fields[i] = elem_const_val;
+                } else {
+                    const_val->ok = false;
+                }
+            }
         }
         TypeTableEntry *fixed_size_array_type = get_array_type(g, child_type, elem_count);

src/codegen.cpp+2-8

 @@ -2105,13 +2105,6 @@ static LLVMValueRef gen_const_val(CodeGen *g, TypeTableEntry *type_entry, ConstE
             return tag_value;
         } else {
             zig_panic("TODO");
-            /*
-            LLVMValueRef fields[] = {
-                tag_value,
-                union_value,
-            };
-            return LLVMConstStruct(fields, 2, false);
-            */
         }
     } else if (type_entry->id == TypeTableEntryIdFn) {
         return const_val->data.x_fn->fn_value;
 @@ -2197,10 +2190,11 @@ static void do_code_gen(CodeGen *g) {
         } else {
             init_val = LLVMConstNull(var->type->type_ref);
         }
-        LLVMValueRef global_value = LLVMAddGlobal(g->module, LLVMTypeOf(init_val), "");
+        LLVMValueRef global_value = LLVMAddGlobal(g->module, LLVMTypeOf(init_val), buf_ptr(&var->name));
         LLVMSetInitializer(global_value, init_val);
         LLVMSetGlobalConstant(global_value, var->is_const);
         LLVMSetUnnamedAddr(global_value, true);
+        LLVMSetLinkage(global_value, LLVMInternalLinkage);
         var->value_ref = global_value;
     }

std/std.zig+3-3

...	@@ -12,14 +12,14 @@ pub var stdin = InStream {	...	@@ -12,14 +12,14 @@ pub var stdin = InStream {
12		12
13	pub var stdout = OutStream {	13	pub var stdout = OutStream {
14	.fd = stdout_fileno,	14	.fd = stdout_fileno,
15	.buffer = uninitialized,	15	.buffer = undefined,
16	.index = 0,	16	.index = 0,
17	.buffered = true,	17	.buffered = true,
18	};	18	};
19		19
20	pub var stderr = OutStream {	20	pub var stderr = OutStream {
21	.fd = stderr_fileno,	21	.fd = stderr_fileno,
22	.buffer = uninitialized,	22	.buffer = undefined,
23	.index = 0,	23	.index = 0,
24	.buffered = false,	24	.buffered = false,
25	};	25	};
...	@@ -34,7 +34,7 @@ pub %.BadPerm;	...	@@ -34,7 +34,7 @@ pub %.BadPerm;
34	pub %.PipeFail;	34	pub %.PipeFail;
35	*/	35	*/
36		36
37	//const buffer_size: u16 = 4 * 1024;	37	//const buffer_size = 4 * 1024;
38	const max_u64_base10_digits: isize = 20;	38	const max_u64_base10_digits: isize = 20;
39		39
40	/*	40	/*

test/run_tests.cpp+17-1

 @@ -1244,6 +1244,20 @@ pub fn main(args: [][]u8) i32 => {
 }
     )SOURCE", "OK\n");
+    add_simple_case("statically initialized array literal", R"SOURCE(
+import "std.zig";
+const x = []u8{1,2,3,4};
+pub fn main(args: [][]u8) i32 => {
+    const y : [4]u8 = x;
+    if (y[3] != 4) {
+        print_str("BAD\n");
+    }
+    print_str("OK\n");
+    return 0;
+}
+    )SOURCE", "OK\n");
 }
 @@ -1498,12 +1512,14 @@ struct A {
     z : i32,
 }
 fn f() => {
+    // we want the error on the '{' not the 'A' because
+    // the A could be a complicated expression
     const a = A {
         .z = 4,
         .y = 2,
     };
 }
-    )SOURCE", 1, ".tmp_source.zig:8:17: error: missing field: 'x'");
+    )SOURCE", 1, ".tmp_source.zig:10:17: error: missing field: 'x'");
     add_compile_fail_case("invalid field in struct value expression", R"SOURCE(
 struct A {