Merge branch 'main' into typechecker

CS4215-OOGA · Apr 7, 2024 · 85fa78d · 85fa78d
2 parents 4155366 + aa67c70
commit 85fa78d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/vm/oogavm-heap.ts b/src/vm/oogavm-heap.ts
@@ -126,6 +126,7 @@ export function constructHeap(numWords: number, updateRootsFn): DataView {
     free = 0;
     allocateLiteralValues();
     updateRoots = updateRootsFn;
+    StringPool.clear();
     return heap;
 }
 

diff --git a/src/vm/oogavm-machine.ts b/src/vm/oogavm-machine.ts
@@ -706,8 +706,9 @@ export function run(numWords = 1000000) {
             throw Error('execution aborted due to: ' + getErrorType());
         }
     }
-    log('Program value is ' + addressToTSValue(peekStack(OS[0])));
-    return addressToTSValue(peekStack(OS[0]));
+    const returnValue = addressToTSValue(peekStack(OS[0]));
+    log('Program value is ' + returnValue);
+    return returnValue;
 }
 
 function getErrorType(): string {