bugfix with iter.enumerate

diff --git a/.gitignore b/.gitignore
index 59c997ccab422f43c1ef3643bd9f35d10cc74d4e..6020b7f2f058c7aceb6b2aca9af76f9a30973120 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ tmp/
 dist/
 **/node_modules/
 onyx-lsp.ini
+shared/lib/linux_x86_64/lib/libovmwasm.so
\ No newline at end of file

diff --git a/compiler/src/types.c b/compiler/src/types.c
index 296bcaec4bb8652eba0a44a2d89a7111e176b622..c1dfe372859424893b89980b7a3c51d80006712b 100644 (file)
--- a/compiler/src/types.c
+++ b/compiler/src/types.c
@@ -605,6 +605,11 @@ static Type* type_build_from_ast_inner(bh_allocator alloc, AstType* type_node, b
                 return type_of->resolved_type;
             }
 
+            // Why does this have to be here?
+            if (type_of->expr->type != NULL) {
+                return type_of->expr->type;
+            }
+
             return NULL;
         }
 

diff --git a/core/container/iter.onyx b/core/container/iter.onyx
index 06cac02f9b2e0104e1872168f409d04b3d05e40c..944fc2cb12996b51b83c3522896eec8ca03e9a75 100644 (file)
--- a/core/container/iter.onyx
+++ b/core/container/iter.onyx
@@ -378,7 +378,7 @@ enumerate :: (it: Iterator($T), start_index: i32 = 0) -> Iterator(Enumeration_Va
             value, cont := next(ec.iterator);
             if cont {
                 defer ec.current_index += 1;
-                return Enumeration_Value(typeof value).{ current_index, value }, true;
+                return Enumeration_Value(typeof value).{ ec.current_index, value }, true;
             }
 
             return .{}, false;