fix: keep track of declared identifiers

source-academy · Jun 26, 2023 · 9460fc5 · 9460fc5
1 parent d7c021f
commit 9460fc5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/runner/fullJSRunner.ts b/src/runner/fullJSRunner.ts
@@ -12,6 +12,7 @@ import { parse } from '../parser/parser'
 import { evallerReplacer, getBuiltins, transpile } from '../transpiler/transpiler'
 import type { Context, NativeStorage } from '../types'
 import * as create from '../utils/astCreator'
+import { getIdentifiersInProgram } from '../utils/uniqueIds'
 import { toSourceError } from './errors'
 import { appendModulesToContext, resolvedErrorPromise } from './utils'
 
@@ -69,6 +70,9 @@ export async function fullJSRunner(
     ...preludeAndBuiltins,
     evallerReplacer(create.identifier(NATIVE_STORAGE_ID), new Set())
   ])
+  getIdentifiersInProgram(preEvalProgram).forEach(id =>
+    context.nativeStorage.previousProgramsIdentifiers.add(id)
+  )
   const preEvalCode: string = generate(preEvalProgram)
   const requireProvider = getRequireProvider(context)
   await fullJSEval(preEvalCode, requireProvider, context.nativeStorage)

diff --git a/src/transpiler/transpiler.ts b/src/transpiler/transpiler.ts
@@ -678,6 +678,9 @@ function transpileToFullJS(
     globalIds.native
   )
 
+  getGloballyDeclaredIdentifiers(program).forEach(id =>
+    context.nativeStorage.previousProgramsIdentifiers.add(id)
+  )
   const transpiledProgram: es.Program = create.program([
     evallerReplacer(create.identifier(NATIVE_STORAGE_ID), new Set()),
     create.expressionStatement(create.identifier('undefined')),