authorgravatar for thejoshwolfe@gmail.comJosh Wolfe <thejoshwolfe@gmail.com> 2015-12-02 16:33:06-07:00
committergravatar for thejoshwolfe@gmail.comJosh Wolfe <thejoshwolfe@gmail.com> 2015-12-02 16:33:06-07:00
logc89f77dd8e5005e60e8fb223c6c68b50566ac1ed
tree8512500c908ac8d95595e44af6eb9bc06bd03c06
parentffc2c9225ff78b282e06486ce5465c91186bb48d

parsing variable declaration

8 files changed, 102 insertions(+), 6 deletions(-)

README.md+3-1
......@@ -114,7 +114,7 @@ Statement : NonBlockExpression token(Semicolon) | BlockExpression
114114
115115Expression : BlockExpression | NonBlockExpression
116116
117NonBlockExpression : BoolOrExpression | ReturnExpression
117NonBlockExpression : ReturnExpression | VariableDeclaration | BoolOrExpression
118118
119119BlockExpression : IfExpression | Block
120120
......@@ -122,6 +122,8 @@ BoolOrExpression : BoolAndExpression token(BoolOr) BoolAndExpression | BoolAndEx
122122
123123ReturnExpression : token(Return) option(Expression)
124124
125VariableDeclaration : token(Let) token(Symbole) (token(Eq) Expression | token(Colon) Type option(token(Eq) Expression))
126
125127IfExpression : token(If) Expression Block option(Else | ElseIf)
126128
127129ElseIf : token(Else) IfExpression
example/expressions/expressions.zig created+14
......@@ -0,0 +1,14 @@
1#link("c")
2extern {
3 fn puts(s: *const u8) -> i32;
4 fn exit(code: i32) -> unreachable;
5}
6
7export fn _start() -> unreachable {
8 let a : i32 = 1;
9 let b = 2;
10 let c : i32;
11 // let d; // compile error
12 puts("Hello, world!");
13 exit(a + b);
14}
src/analyze.cpp+10
......@@ -277,6 +277,7 @@ static void preview_function_declarations(CodeGen *g, ImportTableEntry *import,
277277 case NodeTypeType:
278278 case NodeTypeFnDecl:
279279 case NodeTypeReturnExpr:
280 case NodeTypeVariableDeclaration:
280281 case NodeTypeRoot:
281282 case NodeTypeBlock:
282283 case NodeTypeBinOpExpr:
......@@ -373,6 +374,14 @@ static TypeTableEntry * analyze_expression(CodeGen *g, ImportTableEntry *import,
373374 break;
374375 }
375376
377 case NodeTypeVariableDeclaration:
378 {
379 zig_panic("TODO: analyze variable declaration");
380
381 return_type = g->builtin_types.entry_void;
382 break;
383 }
384
376385 case NodeTypeBinOpExpr:
377386 {
378387 switch (node->data.bin_op_expr.bin_op) {
......@@ -630,6 +639,7 @@ static void analyze_top_level_declaration(CodeGen *g, ImportTableEntry *import,
630639 case NodeTypeType:
631640 case NodeTypeFnDecl:
632641 case NodeTypeReturnExpr:
642 case NodeTypeVariableDeclaration:
633643 case NodeTypeRoot:
634644 case NodeTypeBlock:
635645 case NodeTypeBinOpExpr:
src/codegen.cpp+2
......@@ -477,6 +477,8 @@ static LLVMValueRef gen_expr(CodeGen *g, AstNode *node) {
477477 return gen_bin_op_expr(g, node);
478478 case NodeTypeReturnExpr:
479479 return gen_return_expr(g, node);
480 case NodeTypeVariableDeclaration:
481 zig_panic("TODO: variable declaration code gen");
480482 case NodeTypeCastExpr:
481483 return gen_cast_expr(g, node);
482484 case NodeTypePrefixOpExpr:
src/parser.cpp+60-5
......@@ -75,6 +75,8 @@ const char *node_type_str(NodeType node_type) {
7575 return "Directive";
7676 case NodeTypeReturnExpr:
7777 return "ReturnExpr";
78 case NodeTypeVariableDeclaration:
79 return "VariableDeclaration";
7880 case NodeTypeCastExpr:
7981 return "CastExpr";
8082 case NodeTypeNumberLiteral:
......@@ -178,6 +180,16 @@ void ast_print(AstNode *node, int indent) {
178180 if (node->data.return_expr.expr)
179181 ast_print(node->data.return_expr.expr, indent + 2);
180182 break;
183 case NodeTypeVariableDeclaration:
184 {
185 Buf *name_buf = &node->data.variable_declaration.symbol;
186 fprintf(stderr, "%s '%s'\n", node_type_str(node->type), buf_ptr(name_buf));
187 if (node->data.variable_declaration.type)
188 ast_print(node->data.variable_declaration.type, indent + 2);
189 if (node->data.variable_declaration.expr)
190 ast_print(node->data.variable_declaration.expr, indent + 2);
191 break;
192 }
181193 case NodeTypeExternBlock:
182194 {
183195 fprintf(stderr, "%s\n", node_type_str(node->type));
......@@ -1042,6 +1054,45 @@ static AstNode *ast_parse_return_expr(ParseContext *pc, int *token_index, bool m
10421054 }
10431055}
10441056
1057/*
1058VariableDeclaration : token(Let) token(Symbole) (token(Eq) Expression | token(Colon) Type option(token(Eq) Expression))
1059*/
1060static AstNode *ast_parse_variable_declaration_expr(ParseContext *pc, int *token_index, bool mandatory) {
1061 Token *let_tok = &pc->tokens->at(*token_index);
1062 if (let_tok->id == TokenIdKeywordLet) {
1063 *token_index += 1;
1064 AstNode *node = ast_create_node(pc, NodeTypeVariableDeclaration, let_tok);
1065
1066 Token *name_token = &pc->tokens->at(*token_index);
1067 *token_index += 1;
1068 ast_expect_token(pc, name_token, TokenIdSymbol);
1069 ast_buf_from_token(pc, name_token, &node->data.variable_declaration.symbol);
1070
1071 Token *eq_or_colon = &pc->tokens->at(*token_index);
1072 *token_index += 1;
1073 if (eq_or_colon->id == TokenIdEq) {
1074 node->data.variable_declaration.expr = ast_parse_expression(pc, token_index, true);
1075 return node;
1076 } else if (eq_or_colon->id == TokenIdColon) {
1077 node->data.variable_declaration.type = ast_parse_type(pc, *token_index, token_index);
1078
1079 Token *eq_token = &pc->tokens->at(*token_index);
1080 if (eq_token->id == TokenIdEq) {
1081 *token_index += 1;
1082
1083 node->data.variable_declaration.expr = ast_parse_expression(pc, token_index, true);
1084 }
1085 return node;
1086 } else {
1087 ast_invalid_token_error(pc, eq_or_colon);
1088 }
1089 } else if (mandatory) {
1090 ast_invalid_token_error(pc, let_tok);
1091 } else {
1092 return nullptr;
1093 }
1094}
1095
10451096/*
10461097BoolOrExpression : BoolAndExpression token(BoolOr) BoolAndExpression | BoolAndExpression
10471098*/
......@@ -1086,19 +1137,23 @@ static AstNode *ast_parse_block_expr(ParseContext *pc, int *token_index, bool ma
10861137}
10871138
10881139/*
1089NonBlockExpression : BoolOrExpression | ReturnExpression
1140NonBlockExpression : ReturnExpression | VariableDeclaration | BoolOrExpression
10901141*/
10911142static AstNode *ast_parse_non_block_expr(ParseContext *pc, int *token_index, bool mandatory) {
10921143 Token *token = &pc->tokens->at(*token_index);
10931144
1094 AstNode *bool_or_expr = ast_parse_bool_or_expr(pc, token_index, false);
1095 if (bool_or_expr)
1096 return bool_or_expr;
1097
10981145 AstNode *return_expr = ast_parse_return_expr(pc, token_index, false);
10991146 if (return_expr)
11001147 return return_expr;
11011148
1149 AstNode *variable_declaration_expr = ast_parse_variable_declaration_expr(pc, token_index, false);
1150 if (variable_declaration_expr)
1151 return variable_declaration_expr;
1152
1153 AstNode *bool_or_expr = ast_parse_bool_or_expr(pc, token_index, false);
1154 if (bool_or_expr)
1155 return bool_or_expr;
1156
11021157 if (mandatory)
11031158 ast_invalid_token_error(pc, token);
11041159
src/parser.hpp+9
......@@ -29,6 +29,7 @@ enum NodeType {
2929 NodeTypeExternBlock,
3030 NodeTypeDirective,
3131 NodeTypeReturnExpr,
32 NodeTypeVariableDeclaration,
3233 NodeTypeBinOpExpr,
3334 NodeTypeCastExpr,
3435 NodeTypeNumberLiteral,
......@@ -95,6 +96,13 @@ struct AstNodeReturnExpr {
9596 AstNode *expr;
9697};
9798
99struct AstNodeVariableDeclaration {
100 Buf symbol;
101 // one or both of type and expr will be non null
102 AstNode *type;
103 AstNode *expr;
104};
105
98106enum BinOpType {
99107 BinOpTypeInvalid,
100108 // TODO: include assignment?
......@@ -190,6 +198,7 @@ struct AstNode {
190198 AstNodeParamDecl param_decl;
191199 AstNodeBlock block;
192200 AstNodeReturnExpr return_expr;
201 AstNodeVariableDeclaration variable_declaration;
193202 AstNodeBinOpExpr bin_op_expr;
194203 AstNodeExternBlock extern_block;
195204 AstNodeDirective directive;
src/tokenizer.cpp+3
......@@ -165,6 +165,8 @@ static void end_token(Tokenize *t) {
165165 t->cur_tok->id = TokenIdKeywordFn;
166166 } else if (mem_eql_str(token_mem, token_len, "return")) {
167167 t->cur_tok->id = TokenIdKeywordReturn;
168 } else if (mem_eql_str(token_mem, token_len, "let")) {
169 t->cur_tok->id = TokenIdKeywordLet;
168170 } else if (mem_eql_str(token_mem, token_len, "mut")) {
169171 t->cur_tok->id = TokenIdKeywordMut;
170172 } else if (mem_eql_str(token_mem, token_len, "const")) {
......@@ -574,6 +576,7 @@ static const char * token_name(Token *token) {
574576 case TokenIdKeywordConst: return "Const";
575577 case TokenIdKeywordMut: return "Mut";
576578 case TokenIdKeywordReturn: return "Return";
579 case TokenIdKeywordLet: return "Let";
577580 case TokenIdKeywordExtern: return "Extern";
578581 case TokenIdKeywordUnreachable: return "Unreachable";
579582 case TokenIdKeywordPub: return "Pub";
src/tokenizer.hpp+1
......@@ -15,6 +15,7 @@ enum TokenId {
1515 TokenIdSymbol,
1616 TokenIdKeywordFn,
1717 TokenIdKeywordReturn,
18 TokenIdKeywordLet,
1819 TokenIdKeywordMut,
1920 TokenIdKeywordConst,
2021 TokenIdKeywordExtern,