for key, val in some_map {}; for val, idx in some_array {}

3 files changed, 63 insertions, 61 deletions

diff --git a/src/check_stmt.cpp b/src/check_stmt.cpp
index 96f253d07..bbc1aaab3 100644
--- a/src/check_stmt.cpp
+++ b/src/check_stmt.cpp
@@ -978,10 +978,11 @@ void check_stmt_internal(Checker *c, AstNode *node, u32 flags) {
 		check_open_scope(c, node);
 		check_label(c, rs->label);
 
-		Type *val = nullptr;
-		Type *idx = nullptr;
+		Type *val0 = nullptr;
+		Type *val1 = nullptr;
 		Entity *entities[2] = {};
 		isize entity_count = 0;
+		bool is_map = false;
 
 		AstNode *expr = unparen_expr(rs->expr);
 
@@ -1069,8 +1070,8 @@ void check_stmt_internal(Checker *c, AstNode *node, u32 flags) {
 
 			add_type_and_value(&c->info, ie->left,  x.mode, x.type, x.value);
 			add_type_and_value(&c->info, ie->right, y.mode, y.type, y.value);
-			val = type;
-			idx = t_int;
+			val0 = type;
+			val1 = t_int;
 		} else {
 			Operand operand = {Addressing_Invalid};
 			check_expr_or_type(c, &operand, rs->expr);
@@ -1082,8 +1083,8 @@ void check_stmt_internal(Checker *c, AstNode *node, u32 flags) {
 					gb_string_free(t);
 					goto skip_expr;
 				} else {
-					val = operand.type;
-					idx = t_int;
+					val0 = operand.type;
+					val1 = t_int;
 					add_type_info_type(c, operand.type);
 					goto skip_expr;
 				}
@@ -1093,38 +1094,39 @@ void check_stmt_internal(Checker *c, AstNode *node, u32 flags) {
 				switch (t->kind) {
 				case Type_Basic:
 					if (is_type_string(t)) {
-						val = t_rune;
-						idx = t_int;
+						val0 = t_rune;
+						val1 = t_int;
 					}
 					break;
 				case Type_Array:
-					val = t->Array.elem;
-					idx = t_int;
+					val0 = t->Array.elem;
+					val1 = t_int;
 					break;
 
 				case Type_DynamicArray:
-					val = t->DynamicArray.elem;
-					idx = t_int;
+					val0 = t->DynamicArray.elem;
+					val1 = t_int;
 					break;
 
 				case Type_Slice:
-					val = t->Slice.elem;
-					idx = t_int;
+					val0 = t->Slice.elem;
+					val1 = t_int;
 					break;
 
 				case Type_Vector:
-					val = t->Vector.elem;
-					idx = t_int;
+					val0 = t->Vector.elem;
+					val1 = t_int;
 					break;
 
 				case Type_Map:
-					val = t->Map.value;
-					idx = t->Map.key;
+					is_map = true;
+					val0 = t->Map.key;
+					val1 = t->Map.value;
 					break;
 				}
 			}
 
-			if (val == nullptr) {
+			if (val0 == nullptr) {
 				gbString s = expr_to_string(operand.expr);
 				gbString t = type_to_string(operand.type);
 				error(operand.expr, "Cannot iterate over '%s' of type '%s'", s, t);
@@ -1134,8 +1136,8 @@ void check_stmt_internal(Checker *c, AstNode *node, u32 flags) {
 		}
 
 	skip_expr:; // NOTE(zhiayang): again, declaring a variable immediately after a label... weird.
-		AstNode *lhs[2] = {rs->value, rs->index};
-		Type *   rhs[2] = {val, idx};
+		AstNode *lhs[2] = {rs->val0, rs->val1};
+		Type *   rhs[2] = {val0, val1};
 
 		for (isize i = 0; i < 2; i++) {
 			if (lhs[i] == nullptr) {
diff --git a/src/ir.cpp b/src/ir.cpp
index 8b84f1e37..f7db49cbf 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -6920,32 +6920,33 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
 	case_ast_node(rs, RangeStmt, node);
 		ir_emit_comment(proc, str_lit("RangeStmt"));
 
-		Type *val_type = nullptr;
-		Type *idx_type = nullptr;
-		if (rs->value != nullptr && !is_blank_ident(rs->value)) {
-			val_type = type_of_expr(proc->module->info, rs->value);
+		Type *val0_type = nullptr;
+		Type *val1_type = nullptr;
+		if (rs->val0 != nullptr && !is_blank_ident(rs->val0)) {
+			val0_type = type_of_expr(proc->module->info, rs->val0);
 		}
-		if (rs->index != nullptr && !is_blank_ident(rs->index)) {
-			idx_type = type_of_expr(proc->module->info, rs->index);
+		if (rs->val1 != nullptr && !is_blank_ident(rs->val1)) {
+			val1_type = type_of_expr(proc->module->info, rs->val1);
 		}
 
-		if (val_type != nullptr) {
-			ir_add_local_for_identifier(proc, rs->value, true);
+		if (val0_type != nullptr) {
+			ir_add_local_for_identifier(proc, rs->val0, true);
 		}
-		if (idx_type != nullptr) {
-			ir_add_local_for_identifier(proc, rs->index, true);
+		if (val1_type != nullptr) {
+			ir_add_local_for_identifier(proc, rs->val1, true);
 		}
 
 		irValue *val = nullptr;
-		irValue *index = nullptr;
+		irValue *key = nullptr;
 		irBlock *loop = nullptr;
 		irBlock *done = nullptr;
 		AstNode *expr = unparen_expr(rs->expr);
+		bool is_map = false;
 
 		TypeAndValue tav = type_and_value_of_expr(proc->module->info, expr);
 
 		if (is_ast_node_a_range(expr)) {
-			ir_build_range_interval(proc, &expr->BinaryExpr, val_type, &val, &index, &loop, &done);
+			ir_build_range_interval(proc, &expr->BinaryExpr, val0_type, &val, &key, &loop, &done);
 		} else if (tav.mode == Addressing_Type) {
 			TokenPos pos = ast_node_token(expr).pos;
 			gbAllocator a = proc->module->allocator;
@@ -6982,8 +6983,8 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
 			irValue *val_ptr = ir_emit_ptr_offset(proc, values_data, offset);
 			ir_emit_increment(proc, offset_);
 
-			index = offset;
-			if (val_type != nullptr) {
+			key = offset;
+			if (val0_type != nullptr) {
 				if (is_type_float(core_elem)) {
 					irValue *f = ir_emit_load(proc, ir_emit_conv(proc, val_ptr, t_f64_ptr));
 					val = ir_emit_conv(proc, f, t);
@@ -6999,6 +7000,7 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
 			Type *et = base_type(type_deref(expr_type));
 			switch (et->kind) {
 			case Type_Map: {
+				is_map = true;
 				irAddr addr = ir_build_addr(proc, rs->expr);
 				irValue *map = ir_addr_get_ptr(proc, addr);
 				if (is_type_pointer(type_deref(ir_addr_type(addr)))) {
@@ -7006,7 +7008,7 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
 				}
 				irValue *entries_ptr = ir_emit_struct_ep(proc, map, 1);
 				irValue *count_ptr = ir_emit_struct_ep(proc, entries_ptr, 1);
-				ir_build_range_indexed(proc, map, val_type, count_ptr, &val, &index, &loop, &done);
+				ir_build_range_indexed(proc, map, val0_type, count_ptr, &val, &key, &loop, &done);
 				break;
 			}
 			case Type_Array: {
@@ -7017,7 +7019,7 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
 				}
 				count_ptr = ir_add_local_generated(proc, t_int);
 				ir_emit_store(proc, count_ptr, ir_const_int(proc->module->allocator, et->Array.count));
-				ir_build_range_indexed(proc, array, val_type, count_ptr, &val, &index, &loop, &done);
+				ir_build_range_indexed(proc, array, val0_type, count_ptr, &val, &key, &loop, &done);
 				break;
 			}
 			case Type_Vector: {
@@ -7028,7 +7030,7 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
 				}
 				count_ptr = ir_add_local_generated(proc, t_int);
 				ir_emit_store(proc, count_ptr, ir_const_int(proc->module->allocator, et->Vector.count));
-				ir_build_range_indexed(proc, vector, val_type, count_ptr, &val, &index, &loop, &done);
+				ir_build_range_indexed(proc, vector, val0_type, count_ptr, &val, &key, &loop, &done);
 				break;
 			}
 			case Type_DynamicArray: {
@@ -7038,7 +7040,7 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
 					array = ir_emit_load(proc, array);
 				}
 				count_ptr = ir_emit_struct_ep(proc, array, 1);
-				ir_build_range_indexed(proc, array, val_type, count_ptr, &val, &index, &loop, &done);
+				ir_build_range_indexed(proc, array, val0_type, count_ptr, &val, &key, &loop, &done);
 				break;
 			}
 			case Type_Slice: {
@@ -7051,7 +7053,7 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
 					count_ptr = ir_add_local_generated(proc, t_int);
 					ir_emit_store(proc, count_ptr, ir_slice_count(proc, slice));
 				}
-				ir_build_range_indexed(proc, slice, val_type, count_ptr, &val, &index, &loop, &done);
+				ir_build_range_indexed(proc, slice, val0_type, count_ptr, &val, &key, &loop, &done);
 				break;
 			}
 			case Type_Basic: {
@@ -7064,7 +7066,7 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
 					ir_emit_store(proc, s, string);
 					string = ir_emit_load(proc, s);
 				}
-				ir_build_range_string(proc, string, val_type, &val, &index, &loop, &done);
+				ir_build_range_string(proc, string, val0_type, &val, &key, &loop, &done);
 				break;
 			}
 			default:
@@ -7073,19 +7075,17 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
 			}
 		}
 
-		irAddr val_addr = {};
-		irAddr idx_addr = {};
-		if (val_type != nullptr) {
-			val_addr = ir_build_addr(proc, rs->value);
-		}
-		if (idx_type != nullptr) {
-			idx_addr = ir_build_addr(proc, rs->index);
-		}
-		if (val_type != nullptr) {
-			ir_addr_store(proc, val_addr, val);
-		}
-		if (idx_type != nullptr) {
-			ir_addr_store(proc, idx_addr, index);
+		irAddr val0_addr = {};
+		irAddr val1_addr = {};
+		if (val0_type) val0_addr = ir_build_addr(proc, rs->val0);
+		if (val1_type) val1_addr = ir_build_addr(proc, rs->val1);
+
+		if (is_map) {
+			if (val0_type) ir_addr_store(proc, val0_addr, key);
+			if (val1_type) ir_addr_store(proc, val1_addr, val);
+		} else {
+			if (val0_type) ir_addr_store(proc, val0_addr, val);
+			if (val1_type) ir_addr_store(proc, val1_addr, key);
 		}
 
 		ir_push_target_list(proc, rs->label, done, loop, nullptr);
diff --git a/src/parser.cpp b/src/parser.cpp
index d513bd79c..1434ed513 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -266,8 +266,8 @@ AST_NODE_KIND(_ComplexStmtBegin, "", i32) \
 	AST_NODE_KIND(RangeStmt, "range statement", struct { \
 		Token    token; \
 		AstNode *label; \
-		AstNode *value; \
-		AstNode *index; \
+		AstNode *val0; \
+		AstNode *val1; \
 		Token    in_token; \
 		AstNode *expr; \
 		AstNode *body; \
@@ -782,8 +782,8 @@ AstNode *clone_ast_node(gbAllocator a, AstNode *node) {
 		break;
 	case AstNode_RangeStmt:
 		n->RangeStmt.label = clone_ast_node(a, n->RangeStmt.label);
-		n->RangeStmt.value = clone_ast_node(a, n->RangeStmt.value);
-		n->RangeStmt.index = clone_ast_node(a, n->RangeStmt.index);
+		n->RangeStmt.val0  = clone_ast_node(a, n->RangeStmt.val0);
+		n->RangeStmt.val1  = clone_ast_node(a, n->RangeStmt.val1);
 		n->RangeStmt.expr  = clone_ast_node(a, n->RangeStmt.expr);
 		n->RangeStmt.body  = clone_ast_node(a, n->RangeStmt.body);
 		break;
@@ -1262,11 +1262,11 @@ AstNode *ast_for_stmt(AstFile *f, Token token, AstNode *init, AstNode *cond, Ast
 	return result;
 }
 
-AstNode *ast_range_stmt(AstFile *f, Token token, AstNode *value, AstNode *index, Token in_token, AstNode *expr, AstNode *body) {
+AstNode *ast_range_stmt(AstFile *f, Token token, AstNode *val0, AstNode *val1, Token in_token, AstNode *expr, AstNode *body) {
 	AstNode *result = make_ast_node(f, AstNode_RangeStmt);
 	result->RangeStmt.token = token;
-	result->RangeStmt.value = value;
-	result->RangeStmt.index = index;
+	result->RangeStmt.val0 = val0;
+	result->RangeStmt.val1 = val1;
 	result->RangeStmt.in_token = in_token;
 	result->RangeStmt.expr  = expr;
 	result->RangeStmt.body  = body;