authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-04-28 18:03:44-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-04-28 18:03:44-07:00
logd908afe1050caca4dd33333adcd4844738c10e56
tree1813c1f48e3c8ea5bac47fb0cbb373f1c95993ff
parent46b0b84b90119a1eb70a30f78baa8239cafb2524

add array multiplication operator

10 files changed, 117 insertions(+), 3 deletions(-)

doc/langref.md+1-1
......@@ -121,7 +121,7 @@ MultiplyExpression = CurlySuffixExpression MultiplyOperator MultiplyExpression |
121121
122122CurlySuffixExpression = TypeExpr option(ContainerInitExpression)
123123
124MultiplyOperator = "*" | "/" | "%"
124MultiplyOperator = "*" | "/" | "%" | "**"
125125
126126PrefixOpExpression = PrefixOp PrefixOpExpression | SuffixOpExpression
127127
src/all_types.hpp+1
......@@ -342,6 +342,7 @@ enum BinOpType {
342342 BinOpTypeMod,
343343 BinOpTypeUnwrapMaybe,
344344 BinOpTypeStrCat,
345 BinOpTypeArrayMult,
345346};
346347
347348struct AstNodeBinOpExpr {
src/analyze.cpp+87
......@@ -2937,6 +2937,7 @@ static bool is_op_allowed(TypeTableEntry *type, BinOpType op) {
29372937 case BinOpTypeMod:
29382938 case BinOpTypeUnwrapMaybe:
29392939 case BinOpTypeStrCat:
2940 case BinOpTypeArrayMult:
29402941 zig_unreachable();
29412942 }
29422943 zig_unreachable();
......@@ -3121,9 +3122,93 @@ static TypeTableEntry *analyze_logic_bin_op_expr(CodeGen *g, ImportTableEntry *i
31213122 return g->builtin_types.entry_bool;
31223123}
31233124
3125static TypeTableEntry *analyze_array_mult(CodeGen *g, ImportTableEntry *import, BlockContext *context,
3126 TypeTableEntry *expected_type, AstNode *node)
3127{
3128 assert(node->type == NodeTypeBinOpExpr);
3129 assert(node->data.bin_op_expr.bin_op == BinOpTypeArrayMult);
3130
3131 AstNode **op1 = node->data.bin_op_expr.op1->parent_field;
3132 AstNode **op2 = node->data.bin_op_expr.op2->parent_field;
3133
3134 TypeTableEntry *op1_type = analyze_expression(g, import, context, nullptr, *op1);
3135 TypeTableEntry *op2_type = analyze_expression(g, import, context, nullptr, *op2);
3136
3137 if (op1_type->id == TypeTableEntryIdInvalid ||
3138 op2_type->id == TypeTableEntryIdInvalid)
3139 {
3140 return g->builtin_types.entry_invalid;
3141 }
3142
3143 ConstExprValue *op1_val = &get_resolved_expr(*op1)->const_val;
3144 ConstExprValue *op2_val = &get_resolved_expr(*op2)->const_val;
3145
3146 AstNode *bad_node;
3147 if (!op1_val->ok) {
3148 bad_node = *op1;
3149 } else if (!op2_val->ok) {
3150 bad_node = *op2;
3151 } else {
3152 bad_node = nullptr;
3153 }
3154 if (bad_node) {
3155 add_node_error(g, bad_node, buf_sprintf("array multiplication requires constant expression"));
3156 return g->builtin_types.entry_invalid;
3157 }
3158
3159 if (op1_type->id != TypeTableEntryIdArray) {
3160 add_node_error(g, *op1,
3161 buf_sprintf("expected array type, got '%s'", buf_ptr(&op1_type->name)));
3162 return g->builtin_types.entry_invalid;
3163 }
3164
3165 if (op2_type->id != TypeTableEntryIdNumLitInt &&
3166 op2_type->id != TypeTableEntryIdInt)
3167 {
3168 add_node_error(g, *op2, buf_sprintf("expected integer type, got '%s'", buf_ptr(&op2_type->name)));
3169 return g->builtin_types.entry_invalid;
3170 }
3171
3172 if (op2_val->data.x_bignum.is_negative) {
3173 add_node_error(g, *op2, buf_sprintf("expected positive number"));
3174 return g->builtin_types.entry_invalid;
3175 }
3176
3177 ConstExprValue *const_val = &get_resolved_expr(node)->const_val;
3178 const_val->ok = true;
3179 const_val->depends_on_compile_var = op1_val->depends_on_compile_var || op2_val->depends_on_compile_var;
3180
3181 TypeTableEntry *child_type = op1_type->data.array.child_type;
3182 BigNum old_array_len;
3183 bignum_init_unsigned(&old_array_len, op1_type->data.array.len);
3184
3185 BigNum new_array_len;
3186 if (bignum_mul(&new_array_len, &old_array_len, &op2_val->data.x_bignum)) {
3187 add_node_error(g, node, buf_sprintf("operation results in overflow"));
3188 return g->builtin_types.entry_invalid;
3189 }
3190
3191 uint64_t old_array_len_bare = op1_type->data.array.len;
3192 uint64_t operand_amt = op2_val->data.x_bignum.data.x_uint;
3193
3194 uint64_t new_array_len_bare = new_array_len.data.x_uint;
3195 const_val->data.x_array.fields = allocate<ConstExprValue*>(new_array_len_bare);
3196
3197 uint64_t i = 0;
3198 for (uint64_t x = 0; x < operand_amt; x += 1) {
3199 for (uint64_t y = 0; y < old_array_len_bare; y += 1) {
3200 const_val->data.x_array.fields[i] = op1_val->data.x_array.fields[y];
3201 i += 1;
3202 }
3203 }
3204
3205 return get_array_type(g, child_type, new_array_len_bare);
3206}
3207
31243208static TypeTableEntry *analyze_bin_op_expr(CodeGen *g, ImportTableEntry *import, BlockContext *context,
31253209 TypeTableEntry *expected_type, AstNode *node)
31263210{
3211 assert(node->type == NodeTypeBinOpExpr);
31273212 BinOpType bin_op_type = node->data.bin_op_expr.bin_op;
31283213 switch (bin_op_type) {
31293214 case BinOpTypeAssign:
......@@ -3320,6 +3405,8 @@ static TypeTableEntry *analyze_bin_op_expr(CodeGen *g, ImportTableEntry *import,
33203405
33213406 return str_type;
33223407 }
3408 case BinOpTypeArrayMult:
3409 return analyze_array_mult(g, import, context, expected_type, node);
33233410 case BinOpTypeInvalid:
33243411 zig_unreachable();
33253412 }
src/ast_render.cpp+1
......@@ -38,6 +38,7 @@ static const char *bin_op_str(BinOpType bin_op) {
3838 case BinOpTypeAssignBoolOr: return "||=";
3939 case BinOpTypeUnwrapMaybe: return "??";
4040 case BinOpTypeStrCat: return "++";
41 case BinOpTypeArrayMult: return "**";
4142 }
4243 zig_unreachable();
4344}
src/codegen.cpp+2
......@@ -1466,6 +1466,7 @@ static LLVMValueRef gen_arithmetic_bin_op(CodeGen *g, AstNode *source_node,
14661466 case BinOpTypeAssignBoolOr:
14671467 case BinOpTypeUnwrapMaybe:
14681468 case BinOpTypeStrCat:
1469 case BinOpTypeArrayMult:
14691470 zig_unreachable();
14701471 }
14711472 zig_unreachable();
......@@ -1772,6 +1773,7 @@ static LLVMValueRef gen_bin_op_expr(CodeGen *g, AstNode *node) {
17721773 switch (node->data.bin_op_expr.bin_op) {
17731774 case BinOpTypeInvalid:
17741775 case BinOpTypeStrCat:
1776 case BinOpTypeArrayMult:
17751777 zig_unreachable();
17761778 case BinOpTypeAssign:
17771779 case BinOpTypeAssignTimes:
src/eval.cpp+1-1
......@@ -232,7 +232,7 @@ int eval_const_expr_bin_op(ConstExprValue *op1_val, TypeTableEntry *op1_type,
232232 case BinOpTypeUnwrapMaybe:
233233 zig_panic("TODO");
234234 case BinOpTypeStrCat:
235 zig_panic("TODO");
235 case BinOpTypeArrayMult:
236236 case BinOpTypeInvalid:
237237 zig_unreachable();
238238 }
src/parser.cpp+11-1
......@@ -1297,6 +1297,7 @@ static PrefixOp tok_to_prefix_op(Token *token) {
12971297 case TokenIdPercentPercent: return PrefixOpUnwrapError;
12981298 case TokenIdDoubleQuestion: return PrefixOpUnwrapMaybe;
12991299 case TokenIdBoolAnd: return PrefixOpAddressOf;
1300 case TokenIdStarStar: return PrefixOpDereference;
13001301 default: return PrefixOpInvalid;
13011302 }
13021303}
......@@ -1331,6 +1332,14 @@ static AstNode *ast_parse_prefix_op_expr(ParseContext *pc, int *token_index, boo
13311332 parent_node->data.prefix_op_expr.primary_expr = node;
13321333 parent_node->data.prefix_op_expr.prefix_op = PrefixOpAddressOf;
13331334
1335 node->column += 1;
1336 } else if (token->id == TokenIdStarStar) {
1337 // pretend that we got 2 star tokens
1338
1339 parent_node = ast_create_node(pc, NodeTypePrefixOpExpr, token);
1340 parent_node->data.prefix_op_expr.primary_expr = node;
1341 parent_node->data.prefix_op_expr.prefix_op = PrefixOpDereference;
1342
13341343 node->column += 1;
13351344 }
13361345
......@@ -1355,6 +1364,7 @@ static AstNode *ast_parse_prefix_op_expr(ParseContext *pc, int *token_index, boo
13551364static BinOpType tok_to_mult_op(Token *token) {
13561365 switch (token->id) {
13571366 case TokenIdStar: return BinOpTypeMult;
1367 case TokenIdStarStar: return BinOpTypeArrayMult;
13581368 case TokenIdSlash: return BinOpTypeDiv;
13591369 case TokenIdPercent: return BinOpTypeMod;
13601370 default: return BinOpTypeInvalid;
......@@ -1362,7 +1372,7 @@ static BinOpType tok_to_mult_op(Token *token) {
13621372}
13631373
13641374/*
1365MultiplyOperator : token(Star) | token(Slash) | token(Percent)
1375MultiplyOperator = "*" | "/" | "%" | "**"
13661376*/
13671377static BinOpType ast_parse_mult_op(ParseContext *pc, int *token_index, bool mandatory) {
13681378 Token *token = &pc->tokens->at(*token_index);
src/tokenizer.cpp+6
......@@ -626,6 +626,11 @@ void tokenize(Buf *buf, Tokenization *out) {
626626 end_token(&t);
627627 t.state = TokenizeStateStart;
628628 break;
629 case '*':
630 t.cur_tok->id = TokenIdStarStar;
631 end_token(&t);
632 t.state = TokenizeStateStart;
633 break;
629634 default:
630635 t.pos -= 1;
631636 end_token(&t);
......@@ -1235,6 +1240,7 @@ const char * token_name(TokenId id) {
12351240 case TokenIdRParen: return ")";
12361241 case TokenIdComma: return ",";
12371242 case TokenIdStar: return "*";
1243 case TokenIdStarStar: return "**";
12381244 case TokenIdLBrace: return "{";
12391245 case TokenIdRBrace: return "}";
12401246 case TokenIdLBracket: return "[";
src/tokenizer.hpp+1
......@@ -47,6 +47,7 @@ enum TokenId {
4747 TokenIdRParen,
4848 TokenIdComma,
4949 TokenIdStar,
50 TokenIdStarStar,
5051 TokenIdLBrace,
5152 TokenIdRBrace,
5253 TokenIdLBracket,
test/self_hosted.zig+6
......@@ -1392,3 +1392,9 @@ fn test_take_address_of_parameter_noeval(f: f32) {
13921392 const f_ptr = &f;
13931393 assert(*f_ptr == 12.34);
13941394}
1395
1396
1397#attribute("test")
1398fn array_mult_operator() {
1399 assert(str.eql("ab" ** 5, "ababababab"));
1400}