[cpp] const pointers can no longer be implciitly converted to non-const

harrand · May 24, 2024 · fb301d6 · fb301d6
1 parent 2aaebab
commit fb301d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/cpp/src/build.cpp b/cpp/src/build.cpp
@@ -232,7 +232,7 @@ namespace build
 					ast::variable_declaration
 					{
 						.var_name = "outname",
-						.type_name = "i8&",
+						.type_name = "i8& const",
 						.initialiser = ast::expression{.expr = ast::null_literal{}}
 					},
 				},
@@ -250,7 +250,7 @@ namespace build
 					ast::variable_declaration
 					{
 						.var_name = "filename",
-						.type_name = "i8&",
+						.type_name = "i8& const",
 						.initialiser = ast::expression{.expr = ast::null_literal{}}
 					},
 				},
@@ -268,7 +268,7 @@ namespace build
 					ast::variable_declaration
 					{
 						.var_name = "filename",
-						.type_name = "i8&",
+						.type_name = "i8& const",
 						.initialiser = ast::expression{.expr = ast::null_literal{}}
 					},
 				},

diff --git a/cpp/src/type.cpp b/cpp/src/type.cpp
@@ -176,6 +176,10 @@ conversion_type type::is_implicitly_convertible_to(const type& rhs) const
 {
 	if(this->without_qualifiers() == rhs.without_qualifiers())
 	{
+		if(this->is_pointer() && this->is_const() && !rhs.is_const())
+		{
+			return conversion_type::impossible;
+		}
 		return conversion_type::none;
 	}
 	if(this->is_weak() || rhs.is_weak())

diff --git a/samples/scratchpad.psy b/samples/scratchpad.psy
@@ -9,6 +9,8 @@ print_digit :: (digit : i64 weak) -> u0
 
 is_odd :: (val : i64) -> bool
 {
+	mystr : i8& const := "well met";
+
 	half : i64 := (val / 2);	
 	low_half : i64 := ((val - 1) / 2);
 	return (half == low_half);
@@ -37,7 +39,7 @@ get_fox :: () -> animal
 	return ret;
 }
 
-puts :: (str : i8&) -> u0 := extern;
+puts :: (str : i8& const) -> u0 := extern;
 print_hello :: () -> u0
 {
 	buffer : i8& := __builtin_malloc(6 * (sizeof i8));