add conversions for function return values

caipng · Apr 29, 2024 · 99185e6 · 99185e6
1 parent f9cd520
commit 99185e6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/ast/types.ts b/src/ast/types.ts
@@ -6,6 +6,7 @@ import {
   TypeInfo,
   Void,
   int,
+  FunctionReturnType
 } from "../typing/types";
 
 export interface PositionInfo {
@@ -406,6 +407,7 @@ export const isJumpStatementReturn = (i: BaseNode): i is JumpStatementReturn =>
 export interface TypedJumpStatementReturn extends BaseNode {
   type: "JumpStatementReturn";
   value: TypedExpression | null;
+  expectedReturnType: FunctionReturnType;
 }
 
 export interface JumpStatementContinue extends BaseNode {

diff --git a/src/interpreter/evaluators.ts b/src/interpreter/evaluators.ts
@@ -190,10 +190,16 @@ export const ASTNodeEvaluator: {
   },
   JumpStatementReturn: (
     rt: Runtime,
-    { value: expr }: TypedJumpStatementReturn,
+    { value: expr, expectedReturnType }: TypedJumpStatementReturn,
   ) => {
     rt.agenda.push(returnInstruction());
-    if (expr) rt.agenda.push(expr);
+    if (expr) {
+		if (!expr.typeInfo.isCompatible(expectedReturnType))
+			// not possible to be void as expr is not null
+			// not possible to be a struct that is not compatible as type check would fail
+			rt.agenda.push(castInstruction(expectedReturnType as ScalarType));
+		rt.agenda.push(expr);
+	}
   },
   JumpStatementBreak: (rt: Runtime) => {
     jumpTill(rt, isBreakMarkInstruction);
@@ -1358,4 +1364,4 @@ const jumpTill = (rt: Runtime, pred: (i: AgendaItem) => boolean): void => {
       if (isExitBlockInstruction(t)) instructionEvaluator[t.type](rt, t);
     }
     rt.agenda.pop();
-}
+}
diff --git a/src/typing/main.ts b/src/typing/main.ts
@@ -492,7 +492,7 @@ const typeJumpStatementReturn = (
     if (isVoid(expectedReturnType)) {
       if (t.value)
         throw "non-empty return statement in function declared with void return type";
-      return { ...t, value: null };
+      return { ...t, value: null, expectedReturnType };
     }
 
     if (!t.value)
@@ -508,7 +508,7 @@ const typeJumpStatementReturn = (
     )
       throw "wrong return type";
 
-    return { ...t, value: expr };
+    return { ...t, value: expr, expectedReturnType };
   });
 
 const typeIterationStatement = (