fix tests with scheme

Author: s-kybound

src/createContext.ts

@@ -453,19 +453,14 @@ export const importBuiltins = (context: Context, externalBuiltIns: CustomBuiltIn
   if (context.chapter <= +Chapter.SCHEME_1 && context.chapter >= +Chapter.FULL_SCHEME) {
     switch (context.chapter) {
       case Chapter.FULL_SCHEME:
+        // Introduction to eval
         // eval metaprocedure
         defineBuiltin(context, '$scheme_ZXZhbA$61$$61$(xs)', csep_eval)
 
       case Chapter.SCHEME_4:
         // Introduction to call/cc
         defineBuiltin(context, 'call$47$cc(f)', call_with_current_continuation)
 
-      // Introduction to eval
-
-      // Scheme apply
-      // ^ is needed in Schemes 2 and 3 to apply to call functions with rest parameters,
-      // so we move it there.
-
       case Chapter.SCHEME_3:
         // Introduction to mutable values, streams
 
@@ -503,10 +498,6 @@ export const importBuiltins = (context: Context, externalBuiltIns: CustomBuiltIn
         defineBuiltin(context, 'list$45$$62$vector(xs)', scheme_libs.list$45$$62$vector)
 
       case Chapter.SCHEME_2:
-        // Splicing builtin resolvers
-        // defineBuiltin(context, '$36$make$45$splice(expr)', scheme_libs.make_splice)
-        // defineBuiltin(context, '$36$resolve$45$splice(xs)', scheme_libs.resolve_splice)
-
         // Scheme pairs
         defineBuiltin(context, 'cons(left, right)', scheme_libs.cons)
         defineBuiltin(context, 'xcons(right, left)', scheme_libs.xcons)

src/cse-machine/patterns.ts

@@ -7,7 +7,6 @@ import { List, Pair } from '../stdlib/list'
 import { _Symbol } from '../alt-langs/scheme/scm-slang/src/stdlib/base'
 import { flattenList, isList } from './scheme-macros'
 import { atomic_equals, is_number } from '../alt-langs/scheme/scm-slang/src/stdlib/core-math'
-import { schemeVisualise } from '../alt-langs/scheme/scheme-mapper'
 
 // a single pattern stored within the patterns component
 // may have several transformers attributed to it.

src/parser/__tests__/__snapshots__/fullTS.ts.snap

@@ -131,6 +131,9 @@ Node {
     },
   ],
   "end": 78,
+  "extra": Object {
+    "topLevelAwait": false,
+  },
   "interpreter": null,
   "loc": SourceLocation {
     "end": Position {

src/runner/__tests__/modules.ts

@@ -1,12 +1,12 @@
 import { mockContext } from '../../mocks/context'
-import { Chapter } from '../../types'
+import { Chapter, Variant } from '../../types'
 import { stripIndent } from '../../utils/formatters'
 import { expectFinishedResult } from '../../utils/testing'
 import { runCodeInSource } from '../sourceRunner'
 
 jest.mock('../../modules/loader/loaders')
 
-type DescribeCase = [string, Chapter[], string]
+type DescribeCase = [string, Chapter[], Variant[], string]
 const describeCases: DescribeCase[] = [
   [
     'javascript',
@@ -19,11 +19,21 @@ const describeCases: DescribeCase[] = [
       Chapter.FULL_TS,
       Chapter.LIBRARY_PARSER
     ],
+    [
+      Variant.DEFAULT,
+      Variant.DEFAULT,
+      Variant.DEFAULT,
+      Variant.DEFAULT,
+      Variant.DEFAULT,
+      Variant.DEFAULT,
+      Variant.DEFAULT
+    ],
     'import { foo } from "one_module"; foo();'
   ],
   [
     'python',
     [Chapter.PYTHON_1],
+    [Variant.DEFAULT],
     stripIndent`
     from one_module import foo
     foo()
@@ -32,20 +42,29 @@ const describeCases: DescribeCase[] = [
   [
     'scheme',
     [Chapter.SCHEME_1, Chapter.SCHEME_2, Chapter.SCHEME_3, Chapter.SCHEME_4, Chapter.FULL_SCHEME],
+    [
+      Variant.EXPLICIT_CONTROL,
+      Variant.EXPLICIT_CONTROL,
+      Variant.EXPLICIT_CONTROL,
+      Variant.EXPLICIT_CONTROL,
+      Variant.EXPLICIT_CONTROL
+    ],
     '(import "one_module" (foo)) (foo)'
   ]
 ]
 
 describe.each(describeCases)(
   'Ensuring that %s chapters are able to load modules',
-  (_, chapters, code) => {
+  (_, chapters, variants, code) => {
     const chapterCases = chapters.map(chapterVal => {
       const [chapterName] = Object.entries(Chapter).find(([, value]) => value === chapterVal)!
-      return [`Testing ${chapterName}`, chapterVal] as [string, Chapter]
+      const index = chapters.indexOf(chapterVal)
+      const variant = variants[index]
+      return [`Testing ${chapterName}`, chapterVal, variant] as [string, Chapter, Variant]
     })
 
-    test.each(chapterCases)('%s', async (_, chapter) => {
-      const context = mockContext(chapter)
+    test.each(chapterCases)('%s', async (_, chapter, variant) => {
+      const context = mockContext(chapter, variant)
       const { result } = await runCodeInSource(code, context)
 
       expectFinishedResult(result)

src/typeChecker/__tests__/__snapshots__/source1Typed.test.ts.snap

@@ -79,6 +79,9 @@ Node {
     },
   ],
   "end": 62,
+  "extra": Object {
+    "topLevelAwait": false,
+  },
   "interpreter": null,
   "loc": SourceLocation {
     "end": Position {
@@ -354,6 +357,9 @@ Node {
     },
   ],
   "end": 74,
+  "extra": Object {
+    "topLevelAwait": false,
+  },
   "interpreter": null,
   "loc": SourceLocation {
     "end": Position {