fix missing unbox argument and prim tuple compare

Fundament-Software · Dec 13, 2023 · c41232b · c41232b
1 parent 0eab9ad
commit c41232b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/evaluator.lua b/evaluator.lua
@@ -318,7 +318,7 @@ end
 
 -- types of types
 add_comparer(value.prim_type_type.kind, value.prim_type_type.kind, always_fits_comparer)
-add_comparer("value.tuple_type", "value.tuple_type", function(a, b)
+local function tuple_compare(a, b)
 	-- fixme lol
 	local placeholder = value.neutral(neutral_value.free(free.unique({})))
 	local tuple_types_a, na = infer_tuple_type_unwrapped(a, placeholder)
@@ -345,7 +345,9 @@ add_comparer("value.tuple_type", "value.tuple_type", function(a, b)
 		end
 	end
 	return true
-end)
+end
+add_comparer("value.tuple_type", "value.tuple_type", tuple_compare)
+add_comparer("value.prim_tuple_type", "value.prim_tuple_type", tuple_compare)
 add_comparer("value.pi", "value.pi", function(a, b)
 	if a == b then
 		return true

diff --git a/testfile.alc b/testfile.alc
@@ -36,7 +36,7 @@ let prim-array-set =
 				array[index] = elem
 			end
 		:
-		prim-func-type (T : (boxed prim-type)) (arr : (unbox (prim-array-type T))) (index : prim-number) (elem : (unbox T)) ->
+		prim-func-type (T : (boxed prim-type)) (arr : (unbox prim-type (prim-array-type T))) (index : prim-number) (elem : (unbox prim-type T)) ->
 
 let prim-array-get = 
 	intrinsic
@@ -45,7 +45,7 @@ let prim-array-get =
 				return array[index]
 			end
 		:
-		prim-func-type (T : (boxed prim-type)) (arr : (unbox (prim-array-type T))) (index : prim-number) ->  (elem : (unbox T))
+		prim-func-type (T : (boxed prim-type)) (arr : (unbox prim-type (prim-array-type T))) (index : prim-number) ->  (elem : (unbox prim-type T))
 
 
 let prim-array-new = 
@@ -55,7 +55,7 @@ let prim-array-new =
 				return {}
 			end
 		:
-		prim-func-type (T : (boxed prim-type)) ->  (arr : (unbox (prim-array-type T)))
+		prim-func-type (T : (boxed prim-type)) ->  (arr : (unbox prim-type (prim-array-type T)))
 
 let array-type =
 	lambda ((T : prim-type))