Correct type checking for returned function values

schwalbe-t · Jan 28, 2023 · 2a38be9 · 2a38be9
1 parent 59e31d9
commit 2a38be9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![Currant-Logo](./logo2.png)
+![Currant-Logo](./logo.png)
 
 Currant is a single-threaded programming language that runs in the browser. It has simple interoperability with JavaScript and can be easily embedded into a webpage:
 

diff --git a/currant.js b/currant.js
@@ -1637,7 +1637,7 @@ class CurrantFunction extends CurrantFunctionInterface {
             this.returnType.setBlock(bodyCopy);
             resultType = this.returnType.execute();
             if(resultType instanceof CurrantVariableReference) resultType = resultType.get();
-            if(result.type.constructor !== resultType.get().constructor)
+            if(!currantCompareTypes(result.type, resultType.get()))
                 throw new Error(`function did not return value of type "${this.returnType.src}"`);
         } else {
             let nothingType = new CurrantNothingType();

diff --git a/currant/types/function.js b/currant/types/function.js
@@ -184,7 +184,7 @@ class CurrantFunction extends CurrantFunctionInterface {
             this.returnType.setBlock(bodyCopy);
             resultType = this.returnType.execute();
             if(resultType instanceof CurrantVariableReference) resultType = resultType.get();
-            if(result.type.constructor !== resultType.get().constructor)
+            if(!currantCompareTypes(result.type, resultType.get()))
                 throw new Error(`function did not return value of type "${this.returnType.src}"`);
         } else {
             let nothingType = new CurrantNothingType();