authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-26 16:00:39-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-26 16:00:39-07:00
loga73453a2680cdbe4decb946f5f8355e83b521aa2
tree93922996fba980dc65d648f9dfae7ddc50fe0419
parent5afe473a86c2fe32b6d7c472b71f88e70ac671c6

add c_import top level decl

see #88

6 files changed, 184 insertions(+), 38 deletions(-)

src/all_types.hpp+18-3
......@@ -136,7 +136,8 @@ enum NodeType {
136136 NodeTypeArrayAccessExpr,
137137 NodeTypeSliceExpr,
138138 NodeTypeFieldAccessExpr,
139 NodeTypeUse,
139 NodeTypeImport,
140 NodeTypeCImport,
140141 NodeTypeBoolLiteral,
141142 NodeTypeNullLiteral,
142143 NodeTypeUndefinedLiteral,
......@@ -410,7 +411,7 @@ struct AstNodePrefixOpExpr {
410411 Expr resolved_expr;
411412};
412413
413struct AstNodeUse {
414struct AstNodeImport {
414415 Buf path;
415416 ZigList<AstNode *> *directives;
416417 VisibMod visib_mod;
......@@ -419,6 +420,15 @@ struct AstNodeUse {
419420 ImportTableEntry *import;
420421};
421422
423struct AstNodeCImport {
424 ZigList<AstNode *> *directives;
425 VisibMod visib_mod;
426 AstNode *block;
427
428 // populated by semantic analyzer
429 TopLevelDecl top_level_decl;
430};
431
422432struct AstNodeIfBoolExpr {
423433 AstNode *condition;
424434 AstNode *then_block;
......@@ -699,7 +709,8 @@ struct AstNode {
699709 AstNodeFnCallExpr fn_call_expr;
700710 AstNodeArrayAccessExpr array_access_expr;
701711 AstNodeSliceExpr slice_expr;
702 AstNodeUse use;
712 AstNodeImport import;
713 AstNodeCImport c_import;
703714 AstNodeIfBoolExpr if_bool_expr;
704715 AstNodeIfVarExpr if_var_expr;
705716 AstNodeWhileExpr while_expr;
......@@ -920,6 +931,9 @@ enum BuiltinFnId {
920931 BuiltinFnIdAddWithOverflow,
921932 BuiltinFnIdSubWithOverflow,
922933 BuiltinFnIdMulWithOverflow,
934 BuiltinFnIdCInclude,
935 BuiltinFnIdCDefine,
936 BuiltinFnIdCUndef,
923937};
924938
925939struct BuiltinFnEntry {
......@@ -1051,6 +1065,7 @@ struct BlockContext {
10511065 ZigList<VariableTableEntry *> variable_list;
10521066 AstNode *parent_loop_node;
10531067 LLVMZigDIScope *di_scope;
1068 Buf *c_import_buf;
10541069};
10551070
10561071#endif
src/analyze.cpp+102-14
......@@ -21,6 +21,8 @@ static TypeTableEntry *analyze_cast_expr(CodeGen *g, ImportTableEntry *import, B
2121 AstNode *node);
2222static TypeTableEntry *analyze_error_literal_expr(CodeGen *g, ImportTableEntry *import,
2323 BlockContext *context, AstNode *node, Buf *err_name);
24static TypeTableEntry *analyze_block_expr(CodeGen *g, ImportTableEntry *import, BlockContext *context,
25 TypeTableEntry *expected_type, AstNode *node);
2426
2527static AstNode *first_executing_node(AstNode *node) {
2628 switch (node->type) {
......@@ -54,7 +56,8 @@ static AstNode *first_executing_node(AstNode *node) {
5456 case NodeTypeCharLiteral:
5557 case NodeTypeSymbol:
5658 case NodeTypePrefixOpExpr:
57 case NodeTypeUse:
59 case NodeTypeImport:
60 case NodeTypeCImport:
5861 case NodeTypeBoolLiteral:
5962 case NodeTypeNullLiteral:
6063 case NodeTypeUndefinedLiteral:
......@@ -1018,6 +1021,25 @@ static void resolve_error_value_decl(CodeGen *g, ImportTableEntry *import, AstNo
10181021 }
10191022}
10201023
1024static void resolve_c_import_decl(CodeGen *g, ImportTableEntry *import, AstNode *node) {
1025 assert(node->type == NodeTypeCImport);
1026
1027 AstNode *block_node = node->data.c_import.block;
1028
1029 BlockContext *child_context = new_block_context(node, import->block_context);
1030 child_context->c_import_buf = buf_alloc();
1031
1032 TypeTableEntry *resolved_type = analyze_block_expr(g, import, child_context,
1033 g->builtin_types.entry_void, block_node);
1034
1035 if (resolved_type->id == TypeTableEntryIdInvalid) {
1036 return;
1037 }
1038
1039 fprintf(stderr, "c import buf:\n%s\n", buf_ptr(child_context->c_import_buf));
1040 zig_panic("TODO");
1041}
1042
10211043static void resolve_top_level_decl(CodeGen *g, ImportTableEntry *import, AstNode *node) {
10221044 switch (node->type) {
10231045 case NodeTypeFnProto:
......@@ -1053,9 +1075,12 @@ static void resolve_top_level_decl(CodeGen *g, ImportTableEntry *import, AstNode
10531075 case NodeTypeErrorValueDecl:
10541076 resolve_error_value_decl(g, import, node);
10551077 break;
1056 case NodeTypeUse:
1078 case NodeTypeImport:
10571079 // nothing to do here
10581080 break;
1081 case NodeTypeCImport:
1082 resolve_c_import_decl(g, import, node);
1083 break;
10591084 case NodeTypeFnDef:
10601085 case NodeTypeDirective:
10611086 case NodeTypeParamDecl:
......@@ -1501,6 +1526,7 @@ BlockContext *new_block_context(AstNode *node, BlockContext *parent) {
15011526
15021527 if (parent) {
15031528 context->parent_loop_node = parent->parent_loop_node;
1529 context->c_import_buf = parent->c_import_buf;
15041530 }
15051531
15061532 if (node && node->type == NodeTypeFnDef) {
......@@ -1997,7 +2023,7 @@ static TypeTableEntry *resolve_expr_const_val_as_float_num_lit(CodeGen *g, AstNo
19972023 }
19982024}
19992025
2000static TypeTableEntry *resolve_expr_const_val_as_bignum_op(CodeGen *g, AstNode *node,
2026static TypeTableEntry *resolve_expr_const_val_as_bignum_op(CodeGen *g, AstNode *node,
20012027 bool (*bignum_fn)(BigNum *, BigNum *, BigNum *), AstNode *op1, AstNode *op2,
20022028 TypeTableEntry *resolved_type)
20032029{
......@@ -2521,7 +2547,7 @@ static VariableTableEntry *add_local_var(CodeGen *g, AstNode *source_node, Block
25212547 if (name) {
25222548 buf_init_from_buf(&variable_entry->name, name);
25232549 VariableTableEntry *existing_var;
2524
2550
25252551 if (context->fn_entry) {
25262552 existing_var = find_local_variable(context, name);
25272553 } else {
......@@ -3396,6 +3422,47 @@ static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry
33963422 return resolve_expr_const_val_as_type(g, node, type_entry);
33973423 }
33983424 }
3425 case BuiltinFnIdCInclude:
3426 {
3427 if (!context->c_import_buf) {
3428 add_node_error(g, node, buf_sprintf("@c_include valid only in c_import blocks"));
3429 return g->builtin_types.entry_invalid;
3430 }
3431
3432 AstNode **str_node = node->data.fn_call_expr.params.at(0)->parent_field;
3433 TypeTableEntry *str_type = get_unknown_size_array_type(g, g->builtin_types.entry_u8, true);
3434 TypeTableEntry *resolved_type = analyze_expression(g, import, context, str_type, *str_node);
3435
3436 if (resolved_type->id == TypeTableEntryIdInvalid) {
3437 return resolved_type;
3438 }
3439
3440 ConstExprValue *const_str_val = &get_resolved_expr(*str_node)->const_val;
3441
3442 if (!const_str_val->ok) {
3443 add_node_error(g, *str_node, buf_sprintf("@c_include requires constant expression"));
3444 return g->builtin_types.entry_void;
3445 }
3446
3447 buf_appendf(context->c_import_buf, "#include \"");
3448 ConstExprValue *ptr_field = const_str_val->data.x_struct.fields[0];
3449 uint64_t len = ptr_field->data.x_ptr.len;
3450 for (uint64_t i = 0; i < len; i += 1) {
3451 ConstExprValue *char_val = ptr_field->data.x_ptr.ptr[i];
3452 uint64_t big_c = char_val->data.x_bignum.data.x_uint;
3453 assert(big_c <= UINT8_MAX);
3454 uint8_t c = big_c;
3455 buf_appendf(context->c_import_buf, "%c", c);
3456 }
3457 buf_appendf(context->c_import_buf, "\"\n");
3458
3459 return g->builtin_types.entry_void;
3460 }
3461 case BuiltinFnIdCDefine:
3462 zig_panic("TODO");
3463 case BuiltinFnIdCUndef:
3464 zig_panic("TODO");
3465
33993466 }
34003467 zig_unreachable();
34013468}
......@@ -4038,7 +4105,8 @@ static TypeTableEntry *analyze_expression(CodeGen *g, ImportTableEntry *import,
40384105 case NodeTypeRoot:
40394106 case NodeTypeRootExportDecl:
40404107 case NodeTypeFnDef:
4041 case NodeTypeUse:
4108 case NodeTypeImport:
4109 case NodeTypeCImport:
40424110 case NodeTypeLabel:
40434111 case NodeTypeStructDecl:
40444112 case NodeTypeStructField:
......@@ -4140,7 +4208,8 @@ static void analyze_top_level_decl(CodeGen *g, ImportTableEntry *import, AstNode
41404208 break;
41414209 }
41424210 case NodeTypeRootExportDecl:
4143 case NodeTypeUse:
4211 case NodeTypeImport:
4212 case NodeTypeCImport:
41444213 case NodeTypeVariableDeclaration:
41454214 case NodeTypeErrorValueDecl:
41464215 case NodeTypeFnProto:
......@@ -4340,7 +4409,8 @@ static void collect_expr_decl_deps(CodeGen *g, ImportTableEntry *import, AstNode
43404409 case NodeTypeFnDecl:
43414410 case NodeTypeParamDecl:
43424411 case NodeTypeDirective:
4343 case NodeTypeUse:
4412 case NodeTypeImport:
4413 case NodeTypeCImport:
43444414 case NodeTypeLabel:
43454415 case NodeTypeStructDecl:
43464416 case NodeTypeStructField:
......@@ -4486,9 +4556,24 @@ static void detect_top_level_decl_deps(CodeGen *g, ImportTableEntry *import, Ast
44864556 case NodeTypeRootExportDecl:
44874557 resolve_top_level_decl(g, import, node);
44884558 break;
4489 case NodeTypeUse:
4559 case NodeTypeImport:
44904560 // already taken care of
44914561 break;
4562 case NodeTypeCImport:
4563 {
4564 TopLevelDecl *decl_node = &node->data.c_import.top_level_decl;
4565 decl_node->deps.init(1);
4566 collect_expr_decl_deps(g, import, node->data.c_import.block, decl_node);
4567
4568 decl_node->name = buf_sprintf("c_import_%" PRIu32, node->create_index);
4569 decl_node->import = import;
4570 if (decl_node->deps.size() > 0) {
4571 g->unresolved_top_level_decls.put(decl_node->name, node);
4572 } else {
4573 resolve_top_level_decl(g, import, node);
4574 }
4575 break;
4576 }
44924577 case NodeTypeErrorValueDecl:
44934578 // error value declarations do not depend on other top level decls
44944579 resolve_top_level_decl(g, import, node);
......@@ -4619,15 +4704,15 @@ void semantic_analyze(CodeGen *g) {
46194704
46204705 for (int i = 0; i < import->root->data.root.top_level_decls.length; i += 1) {
46214706 AstNode *child = import->root->data.root.top_level_decls.at(i);
4622 if (child->type == NodeTypeUse) {
4623 for (int i = 0; i < child->data.use.directives->length; i += 1) {
4624 AstNode *directive_node = child->data.use.directives->at(i);
4707 if (child->type == NodeTypeImport) {
4708 for (int i = 0; i < child->data.import.directives->length; i += 1) {
4709 AstNode *directive_node = child->data.import.directives->at(i);
46254710 Buf *name = &directive_node->data.directive.name;
46264711 add_node_error(g, directive_node,
46274712 buf_sprintf("invalid directive: '%s'", buf_ptr(name)));
46284713 }
46294714
4630 ImportTableEntry *target_import = child->data.use.import;
4715 ImportTableEntry *target_import = child->data.import.import;
46314716 assert(target_import);
46324717
46334718 target_import->importers.append({import, child});
......@@ -4760,7 +4845,8 @@ Expr *get_resolved_expr(AstNode *node) {
47604845 case NodeTypeFnDecl:
47614846 case NodeTypeParamDecl:
47624847 case NodeTypeDirective:
4763 case NodeTypeUse:
4848 case NodeTypeImport:
4849 case NodeTypeCImport:
47644850 case NodeTypeStructDecl:
47654851 case NodeTypeStructField:
47664852 case NodeTypeStructValueField:
......@@ -4780,6 +4866,8 @@ TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {
47804866 return &node->data.struct_decl.top_level_decl;
47814867 case NodeTypeErrorValueDecl:
47824868 return &node->data.error_value_decl.top_level_decl;
4869 case NodeTypeCImport:
4870 return &node->data.c_import.top_level_decl;
47834871 case NodeTypeNumberLiteral:
47844872 case NodeTypeReturnExpr:
47854873 case NodeTypeBinOpExpr:
......@@ -4808,7 +4896,7 @@ TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {
48084896 case NodeTypeStringLiteral:
48094897 case NodeTypeCharLiteral:
48104898 case NodeTypeSymbol:
4811 case NodeTypeUse:
4899 case NodeTypeImport:
48124900 case NodeTypeBoolLiteral:
48134901 case NodeTypeNullLiteral:
48144902 case NodeTypeUndefinedLiteral:
src/codegen.cpp+13-6
......@@ -177,6 +177,9 @@ static LLVMValueRef gen_builtin_fn_call_expr(CodeGen *g, AstNode *node) {
177177 switch (builtin_fn->id) {
178178 case BuiltinFnIdInvalid:
179179 case BuiltinFnIdTypeof:
180 case BuiltinFnIdCInclude:
181 case BuiltinFnIdCDefine:
182 case BuiltinFnIdCUndef:
180183 zig_unreachable();
181184 case BuiltinFnIdAddWithOverflow:
182185 case BuiltinFnIdSubWithOverflow:
......@@ -2250,7 +2253,8 @@ static LLVMValueRef gen_expr(CodeGen *g, AstNode *node) {
22502253 case NodeTypeFnDecl:
22512254 case NodeTypeParamDecl:
22522255 case NodeTypeDirective:
2253 case NodeTypeUse:
2256 case NodeTypeImport:
2257 case NodeTypeCImport:
22542258 case NodeTypeStructDecl:
22552259 case NodeTypeStructField:
22562260 case NodeTypeStructValueField:
......@@ -2930,6 +2934,9 @@ static void define_builtin_fns(CodeGen *g) {
29302934 create_builtin_fn_with_arg_count(g, BuiltinFnIdAddWithOverflow, "add_with_overflow", 4);
29312935 create_builtin_fn_with_arg_count(g, BuiltinFnIdSubWithOverflow, "sub_with_overflow", 4);
29322936 create_builtin_fn_with_arg_count(g, BuiltinFnIdMulWithOverflow, "mul_with_overflow", 4);
2937 create_builtin_fn_with_arg_count(g, BuiltinFnIdCInclude, "c_include", 1);
2938 create_builtin_fn_with_arg_count(g, BuiltinFnIdCDefine, "c_define", 2);
2939 create_builtin_fn_with_arg_count(g, BuiltinFnIdCUndef, "c_undef", 1);
29332940}
29342941
29352942
......@@ -3138,8 +3145,8 @@ static ImportTableEntry *codegen_add_code(CodeGen *g, Buf *abs_full_path,
31383145 }
31393146 }
31403147 }
3141 } else if (top_level_decl->type == NodeTypeUse) {
3142 Buf *import_target_path = &top_level_decl->data.use.path;
3148 } else if (top_level_decl->type == NodeTypeImport) {
3149 Buf *import_target_path = &top_level_decl->data.import.path;
31433150 Buf full_path = BUF_INIT;
31443151 Buf *import_code = buf_alloc();
31453152 bool found_it = false;
......@@ -3163,7 +3170,7 @@ static ImportTableEntry *codegen_add_code(CodeGen *g, Buf *abs_full_path,
31633170 auto entry = g->import_table.maybe_get(abs_full_path);
31643171 if (entry) {
31653172 found_it = true;
3166 top_level_decl->data.use.import = entry->value;
3173 top_level_decl->data.import.import = entry->value;
31673174 } else {
31683175 if ((err = os_fetch_file_path(abs_full_path, import_code))) {
31693176 if (err == ErrorFileNotFound) {
......@@ -3175,8 +3182,8 @@ static ImportTableEntry *codegen_add_code(CodeGen *g, Buf *abs_full_path,
31753182 goto done_looking_at_imports;
31763183 }
31773184 }
3178 top_level_decl->data.use.import = codegen_add_code(g,
3179 abs_full_path, search_path, &top_level_decl->data.use.path, import_code);
3185 top_level_decl->data.import.import = codegen_add_code(g,
3186 abs_full_path, search_path, &top_level_decl->data.import.path, import_code);
31803187 found_it = true;
31813188 }
31823189 break;
src/parser.cpp+47-15
......@@ -123,8 +123,10 @@ const char *node_type_str(NodeType node_type) {
123123 return "Symbol";
124124 case NodeTypePrefixOpExpr:
125125 return "PrefixOpExpr";
126 case NodeTypeUse:
127 return "Use";
126 case NodeTypeImport:
127 return "Import";
128 case NodeTypeCImport:
129 return "CImport";
128130 case NodeTypeBoolLiteral:
129131 return "BoolLiteral";
130132 case NodeTypeNullLiteral:
......@@ -329,8 +331,12 @@ void ast_print(AstNode *node, int indent) {
329331 case NodeTypeSymbol:
330332 fprintf(stderr, "Symbol %s\n", buf_ptr(&node->data.symbol_expr.symbol));
331333 break;
332 case NodeTypeUse:
333 fprintf(stderr, "%s '%s'\n", node_type_str(node->type), buf_ptr(&node->data.use.path));
334 case NodeTypeImport:
335 fprintf(stderr, "%s '%s'\n", node_type_str(node->type), buf_ptr(&node->data.import.path));
336 break;
337 case NodeTypeCImport:
338 fprintf(stderr, "%s\n", node_type_str(node->type));
339 ast_print(node->data.c_import.block, indent + 2);
334340 break;
335341 case NodeTypeBoolLiteral:
336342 fprintf(stderr, "%s '%s'\n", node_type_str(node->type),
......@@ -2768,19 +2774,35 @@ static AstNode *ast_parse_import(ParseContext *pc, int *token_index,
27682774 return nullptr;
27692775 *token_index += 1;
27702776
2771 Token *use_name = &pc->tokens->at(*token_index);
2772 *token_index += 1;
2773 ast_expect_token(pc, use_name, TokenIdStringLiteral);
2777 Token *import_name = ast_eat_token(pc, token_index, TokenIdStringLiteral);
27742778
2775 Token *semicolon = &pc->tokens->at(*token_index);
2779 ast_eat_token(pc, token_index, TokenIdSemicolon);
2780
2781 AstNode *node = ast_create_node(pc, NodeTypeImport, import_kw);
2782 node->data.import.visib_mod = visib_mod;
2783 node->data.import.directives = directives;
2784
2785 parse_string_literal(pc, import_name, &node->data.import.path, nullptr, nullptr);
2786 normalize_parent_ptrs(node);
2787 return node;
2788}
2789
2790/*
2791CImportDecl : "c_import" Block
2792*/
2793static AstNode *ast_parse_c_import(ParseContext *pc, int *token_index,
2794 ZigList<AstNode*> *directives, VisibMod visib_mod)
2795{
2796 Token *c_import_kw = &pc->tokens->at(*token_index);
2797 if (c_import_kw->id != TokenIdKeywordCImport)
2798 return nullptr;
27762799 *token_index += 1;
2777 ast_expect_token(pc, semicolon, TokenIdSemicolon);
27782800
2779 AstNode *node = ast_create_node(pc, NodeTypeUse, import_kw);
2780 node->data.use.visib_mod = visib_mod;
2781 node->data.use.directives = directives;
2801 AstNode *node = ast_create_node(pc, NodeTypeCImport, c_import_kw);
2802 node->data.c_import.visib_mod = visib_mod;
2803 node->data.c_import.directives = directives;
2804 node->data.c_import.block = ast_parse_block(pc, token_index, true);
27822805
2783 parse_string_literal(pc, use_name, &node->data.use.path, nullptr, nullptr);
27842806 normalize_parent_ptrs(node);
27852807 return node;
27862808}
......@@ -2953,6 +2975,12 @@ static void ast_parse_top_level_decls(ParseContext *pc, int *token_index, ZigLis
29532975 continue;
29542976 }
29552977
2978 AstNode *c_import_node = ast_parse_c_import(pc, token_index, directives, visib_mod);
2979 if (c_import_node) {
2980 top_level_decls->append(c_import_node);
2981 continue;
2982 }
2983
29562984 AstNode *struct_node = ast_parse_struct_decl(pc, token_index, directives, visib_mod);
29572985 if (struct_node) {
29582986 top_level_decls->append(struct_node);
......@@ -3103,8 +3131,12 @@ void normalize_parent_ptrs(AstNode *node) {
31033131 case NodeTypeFieldAccessExpr:
31043132 set_field(&node->data.field_access_expr.struct_expr);
31053133 break;
3106 case NodeTypeUse:
3107 set_list_fields(node->data.use.directives);
3134 case NodeTypeImport:
3135 set_list_fields(node->data.import.directives);
3136 break;
3137 case NodeTypeCImport:
3138 set_list_fields(node->data.c_import.directives);
3139 set_field(&node->data.c_import.block);
31083140 break;
31093141 case NodeTypeBoolLiteral:
31103142 // none
src/tokenizer.cpp+3
......@@ -211,6 +211,8 @@ static void end_token(Tokenize *t) {
211211 t->cur_tok->id = TokenIdKeywordPub;
212212 } else if (mem_eql_str(token_mem, token_len, "export")) {
213213 t->cur_tok->id = TokenIdKeywordExport;
214 } else if (mem_eql_str(token_mem, token_len, "c_import")) {
215 t->cur_tok->id = TokenIdKeywordCImport;
214216 } else if (mem_eql_str(token_mem, token_len, "import")) {
215217 t->cur_tok->id = TokenIdKeywordImport;
216218 } else if (mem_eql_str(token_mem, token_len, "true")) {
......@@ -1041,6 +1043,7 @@ const char * token_name(TokenId id) {
10411043 case TokenIdKeywordPub: return "pub";
10421044 case TokenIdKeywordExport: return "export";
10431045 case TokenIdKeywordImport: return "import";
1046 case TokenIdKeywordCImport: return "c_import";
10441047 case TokenIdKeywordTrue: return "true";
10451048 case TokenIdKeywordFalse: return "false";
10461049 case TokenIdKeywordIf: return "if";
src/tokenizer.hpp+1
......@@ -21,6 +21,7 @@ enum TokenId {
2121 TokenIdKeywordPub,
2222 TokenIdKeywordExport,
2323 TokenIdKeywordImport,
24 TokenIdKeywordCImport,
2425 TokenIdKeywordTrue,
2526 TokenIdKeywordFalse,
2627 TokenIdKeywordIf,