authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-04 03:52:37-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-04 03:52:37-07:00
log2c8958f4549d6076385d80c73f2830306728b081
tree0719a28a2e4aa1e9f7f85d504f50aecc8d8b841d
parent44d5d008d025c7f081d87da393363f40616bfe47

import segregation for types

See #3

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

src/analyze.cpp+20-13
......@@ -142,15 +142,16 @@ TypeTableEntry *get_pointer_to_type(CodeGen *g, TypeTableEntry *child_type, bool
142142 entry->data.pointer.child_type = child_type;
143143 entry->data.pointer.is_const = is_const;
144144
145 g->type_table.put(&entry->name, entry);
146145 *parent_pointer = entry;
147146 return entry;
148147 }
149148}
150149
151static TypeTableEntry *get_maybe_type(CodeGen *g, TypeTableEntry *child_type) {
150static TypeTableEntry *get_maybe_type(CodeGen *g, ImportTableEntry *import, TypeTableEntry *child_type) {
152151 if (child_type->maybe_parent) {
153 return child_type->maybe_parent;
152 TypeTableEntry *entry = child_type->maybe_parent;
153 import->type_table.put(&entry->name, entry);
154 return entry;
154155 } else {
155156 TypeTableEntry *entry = new_type_table_entry(TypeTableEntryIdMaybe);
156157 // create a struct with a boolean whether this is the null value
......@@ -193,16 +194,20 @@ static TypeTableEntry *get_maybe_type(CodeGen *g, TypeTableEntry *child_type) {
193194
194195 entry->data.maybe.child_type = child_type;
195196
196 g->type_table.put(&entry->name, entry);
197 import->type_table.put(&entry->name, entry);
197198 child_type->maybe_parent = entry;
198199 return entry;
199200 }
200201}
201202
202static TypeTableEntry *get_array_type(CodeGen *g, TypeTableEntry *child_type, uint64_t array_size) {
203static TypeTableEntry *get_array_type(CodeGen *g, ImportTableEntry *import,
204 TypeTableEntry *child_type, uint64_t array_size)
205{
203206 auto existing_entry = child_type->arrays_by_size.maybe_get(array_size);
204207 if (existing_entry) {
205 return existing_entry->value;
208 TypeTableEntry *entry = existing_entry->value;
209 import->type_table.put(&entry->name, entry);
210 return entry;
206211 } else {
207212 TypeTableEntry *entry = new_type_table_entry(TypeTableEntryIdArray);
208213 entry->type_ref = LLVMArrayType(child_type->type_ref, array_size);
......@@ -217,7 +222,7 @@ static TypeTableEntry *get_array_type(CodeGen *g, TypeTableEntry *child_type, ui
217222 entry->data.array.child_type = child_type;
218223 entry->data.array.len = array_size;
219224
220 g->type_table.put(&entry->name, entry);
225 import->type_table.put(&entry->name, entry);
221226 child_type->arrays_by_size.put(array_size, entry);
222227 return entry;
223228 }
......@@ -231,7 +236,7 @@ static TypeTableEntry *resolve_type(CodeGen *g, AstNode *node, ImportTableEntry
231236 case AstNodeTypeTypePrimitive:
232237 {
233238 Buf *name = &node->data.type.primitive_name;
234 auto table_entry = g->type_table.maybe_get(name);
239 auto table_entry = import->type_table.maybe_get(name);
235240 if (table_entry) {
236241 type_node->entry = table_entry->value;
237242 } else {
......@@ -268,7 +273,8 @@ static TypeTableEntry *resolve_type(CodeGen *g, AstNode *node, ImportTableEntry
268273 if (size_node->type == NodeTypeNumberLiteral &&
269274 is_num_lit_unsigned(size_node->data.number_literal.kind))
270275 {
271 type_node->entry = get_array_type(g, child_type, size_node->data.number_literal.data.x_uint);
276 type_node->entry = get_array_type(g, import, child_type,
277 size_node->data.number_literal.data.x_uint);
272278 } else {
273279 add_node_error(g, size_node,
274280 buf_create_from_str("array size must be literal unsigned integer"));
......@@ -287,7 +293,7 @@ static TypeTableEntry *resolve_type(CodeGen *g, AstNode *node, ImportTableEntry
287293 } else if (child_type->id == TypeTableEntryIdInvalid) {
288294 return child_type;
289295 }
290 type_node->entry = get_maybe_type(g, child_type);
296 type_node->entry = get_maybe_type(g, import, child_type);
291297 return type_node->entry;
292298 }
293299 case AstNodeTypeTypeCompilerExpr:
......@@ -651,7 +657,7 @@ static void preview_types(CodeGen *g, ImportTableEntry *import, AstNode *node) {
651657 StructDeclNode *struct_codegen = &node->codegen_node->data.struct_decl_node;
652658
653659 Buf *name = &node->data.struct_decl.name;
654 auto table_entry = g->type_table.maybe_get(name);
660 auto table_entry = import->type_table.maybe_get(name);
655661 if (table_entry) {
656662 struct_codegen->type_entry = table_entry->value;
657663 add_node_error(g, node,
......@@ -667,7 +673,7 @@ static void preview_types(CodeGen *g, ImportTableEntry *import, AstNode *node) {
667673 buf_init_from_buf(&entry->name, name);
668674 // put off adding the debug type until we do the full struct body
669675 // this type is incomplete until we do another pass
670 g->type_table.put(&entry->name, entry);
676 import->type_table.put(&entry->name, entry);
671677 struct_codegen->type_entry = entry;
672678 }
673679 break;
......@@ -1809,7 +1815,8 @@ static TypeTableEntry * analyze_expression(CodeGen *g, ImportTableEntry *import,
18091815 if (node->data.string_literal.c) {
18101816 return_type = g->builtin_types.entry_c_string_literal;
18111817 } else {
1812 return_type = get_array_type(g, g->builtin_types.entry_u8, buf_len(&node->data.string_literal.buf));
1818 return_type = get_array_type(g, import, g->builtin_types.entry_u8,
1819 buf_len(&node->data.string_literal.buf));
18131820 }
18141821 break;
18151822 case NodeTypeCharLiteral:
src/analyze.hpp+1-1
......@@ -110,6 +110,7 @@ struct ImportTableEntry {
110110
111111 // reminder: hash tables must be initialized before use
112112 HashMap<Buf *, FnTableEntry *, buf_hash, buf_eql_buf> fn_table;
113 HashMap<Buf *, TypeTableEntry *, buf_hash, buf_eql_buf> type_table;
113114};
114115
115116struct LabelTableEntry {
......@@ -151,7 +152,6 @@ struct CodeGen {
151152
152153 // reminder: hash tables must be initialized before use
153154 HashMap<Buf *, LLVMValueRef, buf_hash, buf_eql_buf> str_table;
154 HashMap<Buf *, TypeTableEntry *, buf_hash, buf_eql_buf> type_table;
155155 HashMap<Buf *, bool, buf_hash, buf_eql_buf> link_table;
156156 HashMap<Buf *, ImportTableEntry *, buf_hash, buf_eql_buf> import_table;
157157
src/codegen.cpp+18-17
......@@ -20,7 +20,6 @@
2020CodeGen *codegen_create(Buf *root_source_dir) {
2121 CodeGen *g = allocate<CodeGen>(1);
2222 g->str_table.init(32);
23 g->type_table.init(32);
2423 g->link_table.init(32);
2524 g->import_table.init(32);
2625 g->build_type = CodeGenBuildTypeDebug;
......@@ -1695,7 +1694,6 @@ static void define_builtin_types(CodeGen *g) {
16951694 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
16961695 entry->size_in_bits, entry->align_in_bits,
16971696 LLVMZigEncoding_DW_ATE_unsigned());
1698 g->type_table.put(&entry->name, entry);
16991697 g->builtin_types.entry_bool = entry;
17001698 }
17011699 {
......@@ -1707,7 +1705,6 @@ static void define_builtin_types(CodeGen *g) {
17071705 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
17081706 entry->size_in_bits, entry->align_in_bits,
17091707 LLVMZigEncoding_DW_ATE_unsigned());
1710 g->type_table.put(&entry->name, entry);
17111708 g->builtin_types.entry_u8 = entry;
17121709 }
17131710 {
......@@ -1720,7 +1717,6 @@ static void define_builtin_types(CodeGen *g) {
17201717 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
17211718 entry->size_in_bits, entry->align_in_bits,
17221719 LLVMZigEncoding_DW_ATE_unsigned());
1723 g->type_table.put(&entry->name, entry);
17241720 g->builtin_types.entry_u16 = entry;
17251721 }
17261722 {
......@@ -1733,7 +1729,6 @@ static void define_builtin_types(CodeGen *g) {
17331729 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
17341730 entry->size_in_bits, entry->align_in_bits,
17351731 LLVMZigEncoding_DW_ATE_unsigned());
1736 g->type_table.put(&entry->name, entry);
17371732 g->builtin_types.entry_u32 = entry;
17381733 }
17391734 {
......@@ -1746,7 +1741,6 @@ static void define_builtin_types(CodeGen *g) {
17461741 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
17471742 entry->size_in_bits, entry->align_in_bits,
17481743 LLVMZigEncoding_DW_ATE_unsigned());
1749 g->type_table.put(&entry->name, entry);
17501744 g->builtin_types.entry_u64 = entry;
17511745 }
17521746 g->builtin_types.entry_c_string_literal = get_pointer_to_type(g, g->builtin_types.entry_u8, true);
......@@ -1760,7 +1754,6 @@ static void define_builtin_types(CodeGen *g) {
17601754 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
17611755 entry->size_in_bits, entry->align_in_bits,
17621756 LLVMZigEncoding_DW_ATE_signed());
1763 g->type_table.put(&entry->name, entry);
17641757 g->builtin_types.entry_i8 = entry;
17651758 }
17661759 {
......@@ -1773,7 +1766,6 @@ static void define_builtin_types(CodeGen *g) {
17731766 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
17741767 entry->size_in_bits, entry->align_in_bits,
17751768 LLVMZigEncoding_DW_ATE_signed());
1776 g->type_table.put(&entry->name, entry);
17771769 g->builtin_types.entry_i16 = entry;
17781770 }
17791771 {
......@@ -1786,7 +1778,6 @@ static void define_builtin_types(CodeGen *g) {
17861778 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
17871779 entry->size_in_bits, entry->align_in_bits,
17881780 LLVMZigEncoding_DW_ATE_signed());
1789 g->type_table.put(&entry->name, entry);
17901781 g->builtin_types.entry_i32 = entry;
17911782 }
17921783 {
......@@ -1799,7 +1790,6 @@ static void define_builtin_types(CodeGen *g) {
17991790 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
18001791 entry->size_in_bits, entry->align_in_bits,
18011792 LLVMZigEncoding_DW_ATE_signed());
1802 g->type_table.put(&entry->name, entry);
18031793 g->builtin_types.entry_i64 = entry;
18041794 }
18051795 {
......@@ -1812,7 +1802,6 @@ static void define_builtin_types(CodeGen *g) {
18121802 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
18131803 entry->size_in_bits, entry->align_in_bits,
18141804 LLVMZigEncoding_DW_ATE_signed());
1815 g->type_table.put(&entry->name, entry);
18161805 g->builtin_types.entry_isize = entry;
18171806 }
18181807 {
......@@ -1825,7 +1814,6 @@ static void define_builtin_types(CodeGen *g) {
18251814 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
18261815 entry->size_in_bits, entry->align_in_bits,
18271816 LLVMZigEncoding_DW_ATE_unsigned());
1828 g->type_table.put(&entry->name, entry);
18291817 g->builtin_types.entry_usize = entry;
18301818 }
18311819 {
......@@ -1837,7 +1825,6 @@ static void define_builtin_types(CodeGen *g) {
18371825 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
18381826 entry->size_in_bits, entry->align_in_bits,
18391827 LLVMZigEncoding_DW_ATE_float());
1840 g->type_table.put(&entry->name, entry);
18411828 g->builtin_types.entry_f32 = entry;
18421829 }
18431830 {
......@@ -1849,7 +1836,6 @@ static void define_builtin_types(CodeGen *g) {
18491836 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
18501837 entry->size_in_bits, entry->align_in_bits,
18511838 LLVMZigEncoding_DW_ATE_float());
1852 g->type_table.put(&entry->name, entry);
18531839 g->builtin_types.entry_f64 = entry;
18541840 }
18551841 {
......@@ -1859,7 +1845,6 @@ static void define_builtin_types(CodeGen *g) {
18591845 entry->di_type = LLVMZigCreateDebugBasicType(g->dbuilder, buf_ptr(&entry->name),
18601846 entry->size_in_bits, entry->align_in_bits,
18611847 LLVMZigEncoding_DW_ATE_unsigned());
1862 g->type_table.put(&entry->name, entry);
18631848 g->builtin_types.entry_void = entry;
18641849 }
18651850 {
......@@ -1867,7 +1852,6 @@ static void define_builtin_types(CodeGen *g) {
18671852 entry->type_ref = LLVMVoidType();
18681853 buf_init_from_str(&entry->name, "unreachable");
18691854 entry->di_type = g->builtin_types.entry_void->di_type;
1870 g->type_table.put(&entry->name, entry);
18711855 g->builtin_types.entry_unreachable = entry;
18721856 }
18731857 {
......@@ -1903,7 +1887,6 @@ static void define_builtin_types(CodeGen *g) {
19031887 "string", g->dummy_di_file, 0, entry->size_in_bits, entry->align_in_bits, 0,
19041888 nullptr, di_element_types, element_count, 0, nullptr, "");
19051889
1906 g->type_table.put(&entry->name, entry);
19071890 g->builtin_types.entry_string = entry;
19081891 }
19091892}
......@@ -2033,6 +2016,24 @@ static ImportTableEntry *codegen_add_code(CodeGen *g, Buf *abs_full_path,
20332016 import_entry->line_offsets = tokenization.line_offsets;
20342017 import_entry->path = full_path;
20352018 import_entry->fn_table.init(32);
2019 import_entry->type_table.init(32);
2020 import_entry->type_table.put(&g->builtin_types.entry_bool->name, g->builtin_types.entry_bool);
2021 import_entry->type_table.put(&g->builtin_types.entry_u8->name, g->builtin_types.entry_u8);
2022 import_entry->type_table.put(&g->builtin_types.entry_u16->name, g->builtin_types.entry_u16);
2023 import_entry->type_table.put(&g->builtin_types.entry_u32->name, g->builtin_types.entry_u32);
2024 import_entry->type_table.put(&g->builtin_types.entry_u64->name, g->builtin_types.entry_u64);
2025 import_entry->type_table.put(&g->builtin_types.entry_i8->name, g->builtin_types.entry_i8);
2026 import_entry->type_table.put(&g->builtin_types.entry_i16->name, g->builtin_types.entry_i16);
2027 import_entry->type_table.put(&g->builtin_types.entry_i32->name, g->builtin_types.entry_i32);
2028 import_entry->type_table.put(&g->builtin_types.entry_i64->name, g->builtin_types.entry_i64);
2029 import_entry->type_table.put(&g->builtin_types.entry_isize->name, g->builtin_types.entry_isize);
2030 import_entry->type_table.put(&g->builtin_types.entry_usize->name, g->builtin_types.entry_usize);
2031 import_entry->type_table.put(&g->builtin_types.entry_f32->name, g->builtin_types.entry_f32);
2032 import_entry->type_table.put(&g->builtin_types.entry_f64->name, g->builtin_types.entry_f64);
2033 import_entry->type_table.put(&g->builtin_types.entry_void->name, g->builtin_types.entry_void);
2034 import_entry->type_table.put(&g->builtin_types.entry_unreachable->name, g->builtin_types.entry_unreachable);
2035 import_entry->type_table.put(&g->builtin_types.entry_string->name, g->builtin_types.entry_string);
2036
20362037 import_entry->root = ast_parse(source_code, tokenization.tokens, import_entry, g->err_color);
20372038 assert(import_entry->root);
20382039 if (g->verbose) {