Commit 56f83257993f92869049b53e8c72e03abdce9547 | zig

author	Andrew Kelley <andrew@ziglang.org> 2016-09-11 14:12:24-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2016-09-11 14:12:24-04:00
log	56f83257993f92869049b53e8c72e03abdce9547
tree	d273f8eda971432ab8b5c11052432f24df55d9e3
parent	28811234bb46824a55596a516f763a39bcbd508a

add compile error for assigning through const

pointer and slice

closes #188

2 files changed, 32 insertions(+), 9 deletions(-)

src
- analyze.cpp
test
- run_tests.cpp

src/analyze.cpp+18-9

 @@ -2907,8 +2907,13 @@ static TypeTableEntry *analyze_slice_expr(CodeGen *g, ImportTableEntry *import,
     return return_type;
 }
+enum LValPurpose {
+    LValPurposeAssign,
+    LValPurposeAddressOf,
+};
 static TypeTableEntry *analyze_array_access_expr(CodeGen *g, ImportTableEntry *import, BlockContext *context,
-        AstNode *node)
+        AstNode *node, LValPurpose purpose)
 {
     TypeTableEntry *array_type = analyze_expression(g, import, context, nullptr,
             node->data.array_access_expr.array_ref_expr);
 @@ -2923,11 +2928,20 @@ static TypeTableEntry *analyze_array_access_expr(CodeGen *g, ImportTableEntry *i
         }
         return_type = array_type->data.array.child_type;
     } else if (array_type->id == TypeTableEntryIdPointer) {
+        if (array_type->data.pointer.is_const && purpose == LValPurposeAssign) {
+            add_node_error(g, node, buf_sprintf("cannot assign to constant"));
+            return g->builtin_types.entry_invalid;
+        }
         return_type = array_type->data.pointer.child_type;
     } else if (array_type->id == TypeTableEntryIdStruct &&
                array_type->data.structure.is_slice)
     {
-        return_type = array_type->data.structure.fields[0].type_entry->data.pointer.child_type;
+        TypeTableEntry *pointer_type = array_type->data.structure.fields[0].type_entry;
+        if (pointer_type->data.pointer.is_const && purpose == LValPurposeAssign) {
+            add_node_error(g, node, buf_sprintf("cannot assign to constant"));
+            return g->builtin_types.entry_invalid;
+        }
+        return_type = pointer_type->data.pointer.child_type;
     } else {
         add_node_error(g, node,
                 buf_sprintf("array access of non-array type '%s'", buf_ptr(&array_type->name)));
 @@ -3254,11 +3268,6 @@ static bool is_op_allowed(TypeTableEntry *type, BinOpType op) {
     zig_unreachable();
 }
-enum LValPurpose {
-    LValPurposeAssign,
-    LValPurposeAddressOf,
-};
 static TypeTableEntry *analyze_lvalue(CodeGen *g, ImportTableEntry *import, BlockContext *block_context,
         AstNode *lhs_node, LValPurpose purpose, bool is_ptr_const)
 {
 @@ -3288,7 +3297,7 @@ static TypeTableEntry *analyze_lvalue(CodeGen *g, ImportTableEntry *import, Bloc
             }
         }
     } else if (lhs_node->type == NodeTypeArrayAccessExpr) {
-        expected_rhs_type = analyze_array_access_expr(g, import, block_context, lhs_node);
+        expected_rhs_type = analyze_array_access_expr(g, import, block_context, lhs_node, purpose);
     } else if (lhs_node->type == NodeTypeFieldAccessExpr) {
         expected_rhs_type = analyze_field_access_expr(g, import, block_context, nullptr, lhs_node);
     } else if (lhs_node->type == NodeTypePrefixOpExpr &&
 @@ -6599,7 +6608,7 @@ static TypeTableEntry *analyze_expression_pointer_only(CodeGen *g, ImportTableEn
         case NodeTypeArrayAccessExpr:
             // for reading array access; assignment handled elsewhere
-            return_type = analyze_array_access_expr(g, import, context, node);
+            return_type = analyze_array_access_expr(g, import, context, node, LValPurposeAddressOf);
             break;
         case NodeTypeSliceExpr:
             return_type = analyze_slice_expr(g, import, context, node);

test/run_tests.cpp+14

...	@@ -1467,6 +1467,20 @@ fn f(foo: &const Foo) {	...	@@ -1467,6 +1467,20 @@ fn f(foo: &const Foo) {
1467	foo.method(1, 2);	1467	foo.method(1, 2);
1468	}	1468	}
1469	)SOURCE", 1, ".tmp_source.zig:7:15: error: expected 1 arguments, got 2");	1469	)SOURCE", 1, ".tmp_source.zig:7:15: error: expected 1 arguments, got 2");
		1470
		1471	add_compile_fail_case("assign through constant pointer", R"SOURCE(
		1472	fn f() {
		1473	var cstr = c"Hat";
		1474	cstr[0] = 'W';
		1475	}
		1476	)SOURCE", 1, ".tmp_source.zig:4:7: error: cannot assign to constant");
		1477
		1478	add_compile_fail_case("assign through constant slice", R"SOURCE(
		1479	pub fn f() {
		1480	var cstr: []const u8 = "Hat";
		1481	cstr[0] = 'W';
		1482	}
		1483	)SOURCE", 1, ".tmp_source.zig:4:7: error: cannot assign to constant");
1470	}	1484	}
1471		1485
1472	//////////////////////////////////////////////////////////////////////////////	1486	//////////////////////////////////////////////////////////////////////////////