From cf56825d26758044fe2a868e65717635864fd723 Mon Sep 17 00:00:00 2001
From: Christoffer Lerno <christoffer@aegik.com>
Date: Wed, 26 Jan 2022 21:27:13 +0100
Subject: [PATCH] Fixed bug when using indexing on a generic type. Made
 array::list::List work with [] and foreach.

---
 resources/examples/notworking/functions.c3 | 46 --------------
 resources/examples/notworking/vector.c3    | 70 ----------------------
 resources/examples/notworking/virtuals.c3  | 51 ----------------
 resources/examples/notworking/virtuals2.c3 | 17 ------
 resources/lib/std/list.c3                  | 39 ++----------
 src/compiler/sema_decls.c                  |  3 +-
 6 files changed, 6 insertions(+), 220 deletions(-)
 delete mode 100644 resources/examples/notworking/functions.c3
 delete mode 100644 resources/examples/notworking/vector.c3
 delete mode 100644 resources/examples/notworking/virtuals.c3
 delete mode 100644 resources/examples/notworking/virtuals2.c3

diff --git a/resources/examples/notworking/functions.c3 b/resources/examples/notworking/functions.c3
deleted file mode 100644
index 3ba1a7cf8..000000000
--- a/resources/examples/notworking/functions.c3
+++ /dev/null
@@ -1,46 +0,0 @@
-module functions;
-
-module vararray(Type)
-
-struct VarArray
-{
-    uint capacity;
-    uint size;
-    Type* type;
-}
-
-VarArray* make(uint size = startingSize)
-{
-    VarArray *array = malloc(VarArray.size);
-    array.capacity = startingSize;
-    array.size = 0;
-    array.type = startingSize > 0 ? malloc(Type.size * startingSize) : null;
-    return array;
-}
-
-generic Type[].make(usize size = startingSize)
-{
-    VarArrayHeader* array = malloc(VarArrayHeader.size + Type.size * startingSize);
-    array.capacity = startingSize;
-    array.size = 0;
-    return (Type[])(array[1]);
-}
-
-macro Type Type[].@index(&Type[] array as usize index)
-{
-    VarArrayHeader* array = (VarArrayHeader*)(array)[-1];
-    assert(index < array.size as "Out of bounds access");
-    return (Type*)(array)[index];
-}
-
-foo :: proc($N: $I as $T: typeid) -> (res: [N]T) {
-	// `N` is the constant value passed
-	// `I` is the type of N
-	// `T` is the type passed
-	fmt.printf("Generating an array of type %v from the value %v of type %v\n",
-	           typeid_of(type_of(res)), N, typeid_of(I));
-	for i in 0..<N {
-		res[i] = i*i;
-	}
-	return;
-}
\ No newline at end of file
diff --git a/resources/examples/notworking/vector.c3 b/resources/examples/notworking/vector.c3
deleted file mode 100644
index 47e1c7faf..000000000
--- a/resources/examples/notworking/vector.c3
+++ /dev/null
@@ -1,70 +0,0 @@
-module vector(Type);
-
-public struct Vector
-{
-    Type[] array;
-}
-
-public fn void Vector.init()
-{
-    array = nil;
-}
-
-public fn void Vector.add(Vector *vector, Type type)
-{
-    vector.array += type;
-}
-
-public fn usize Vector.size(Vector *vector)
-{
-    return vector.array.size;
-}
-
-public fn void Vector.removeLast(Vector *vector)
-{
-    vector.array.pop();
-}
-
-public fn void Vector.removefirst(Vector *vector)
-{
-    vector.array.removeAt(0);
-}
-
-public fn void Type *Vector.first(Vector *vector)
-{
-    return &vector.array.first;
-}
-
-public fn void Type *Vector.last(Vector *vector)
-{
-    return &vector.array.last();
-}
-
-public fn bool Vector.empty(Vector *vector)
-{
-    return !vector.array.size;
-}
-
-public macro Vector.foreach(Vector *vector, macro void(Type value) body)
-{
-    for (usize i = 0, i < vector.array.size; i++)
-    {
-        @body(vector.array[i]);
-    }
-}
-
-test
-{
-    define IntVector = Vector(int);
-    IntVector *vector = @calloc(IntVector);
-    vector.add(1);
-    vector.add(2);
-    for (int i : vector)
-    {
-        printDigit(i);
-    }
-    @vector.foreach(int i)
-    {
-        printDigit(i);
-    }
-}
\ No newline at end of file
diff --git a/resources/examples/notworking/virtuals.c3 b/resources/examples/notworking/virtuals.c3
deleted file mode 100644
index ffbe622f8..000000000
--- a/resources/examples/notworking/virtuals.c3
+++ /dev/null
@@ -1,51 +0,0 @@
-module comparable;
-import std::math;
-
-interface Geometry
-{
-    fn double area();
-    fn double perim();
-}
-
-struct Rect
-{
-    double width, height;
-}
-
-struct Circle
-{
-    double radius;
-}
-
-fn double Rect.area(Rect *r)
-{
-    return r.width * r.height;
-}
-
-fn double Rect.perim(Rect *r)
-{
-    return 2 * r.width + 2 * r.height;
-}
-
-fn double Circle.area(Circle *c)
-{
-    return math::PI * c.radius * c.radius
-}
-
-fn double Circle.perim(Circle *c)
-{
-    return math::PI * c.radius * 2;
-}
-
-fn void measure(virtual Geometry g)
-{
-    printf("area: %f, perimeter: %f\n", g.area(), g.perim());
-}
-
-fn void main()
-{
-    Rect r = { 3, 4 };
-    Circle c = { 5 };
-    measure(&r);
-    measure(&c);
-}
diff --git a/resources/examples/notworking/virtuals2.c3 b/resources/examples/notworking/virtuals2.c3
deleted file mode 100644
index c24e692f1..000000000
--- a/resources/examples/notworking/virtuals2.c3
+++ /dev/null
@@ -1,17 +0,0 @@
-module std::io;
-
-interface File : Closable, Readable, Seekable
-{
-    FileInfo[]! readdir(int count);
-    FileInfo! stat();
-}
-
-
-interface File
-{
-    inline Closable;
-    inline Readable;
-    inline Seekable;
-    FileInfo[]! readdir(int count);
-    FileInfo! stat();
-}
diff --git a/resources/lib/std/list.c3 b/resources/lib/std/list.c3
index cf4972ddd..67b69f3fe 100644
--- a/resources/lib/std/list.c3
+++ b/resources/lib/std/list.c3
@@ -116,43 +116,12 @@ fn void List.free(List *list)
     list.size = 0;
 }
 
-/*
-
-operator for(List *list; index, Type type)
+macro usize List.operator_len(List &list)
 {
-    $IndexType = typeof(index);
-    $IndexType last_index = ($IndexType)(list.size);
-    for ($IndexType i = 0; i < last_index; i++)
-    {
-        yield(i, list.entries[index]);
-    }
+    return list.len();
 }
 
-operator for(List *list; index, Type *type)
+macro Type List.operator_element_at(List &list, usize index)
 {
-    $IndexType = typeof(index);
-    $IndexType last_index = ($IndexType)(list.size);
-    for ($IndexType i = 0; i < last_index; i++)
-    {
-        yield(i, &list.entries[index]);
-    }
+    return list.entries[index];
 }
-
-operator for(List *list; Type *type)
-{
-    usize size = list.size;
-    for (usize i = 0; i < last_index; i++)
-    {
-        yield(i, &list.entries[index]);
-    }
-}
-*/
-/*
-operator for(List *list; Type type)
-{
-    usize size = list.size;
-    for (usize i = 0; i < last_index; i++)
-    {
-        yield(i, list.entries[index]);
-    }
-}*/
\ No newline at end of file
diff --git a/src/compiler/sema_decls.c b/src/compiler/sema_decls.c
index 5537699cd..90faf489a 100644
--- a/src/compiler/sema_decls.c
+++ b/src/compiler/sema_decls.c
@@ -946,7 +946,8 @@ Decl *sema_find_operator(SemaContext *context, Expr *expr, const char *kw)
 {
 	Decl *ambiguous = NULL;
 	Decl *private = NULL;
-	Decl *method = type_may_have_sub_elements(expr->type) ? sema_resolve_method(context->unit, expr->type->decl, kw, &ambiguous, &private) : NULL;
+	Type *type = expr->type->canonical;
+	Decl *method = type_may_have_sub_elements(type) ? sema_resolve_method(context->unit, type->decl, kw, &ambiguous, &private) : NULL;
 	if (!decl_ok(method)) return NULL;
 	if (!method)
 	{