resolve all issues with scheme CSE machine

Author: s-kybound

src/commons/application/ApplicationTypes.ts

@@ -194,9 +194,23 @@ const schemeSubLanguages: Array<Pick<SALanguage, 'chapter' | 'variant' | 'displa
 ];
 
 export const schemeLanguages: SALanguage[] = schemeSubLanguages.map(sublang => {
-  return { ...sublang, mainLanguage: SupportedLanguage.SCHEME, supports: { repl: true } };
+  return {
+    ...sublang,
+    mainLanguage: SupportedLanguage.SCHEME,
+    supports: { repl: true, cseMachine: true }
+  };
 });
 
+export function isSchemeLanguage(chapter: Chapter): boolean {
+  return [
+    Chapter.SCHEME_1,
+    Chapter.SCHEME_2,
+    Chapter.SCHEME_3,
+    Chapter.SCHEME_4,
+    Chapter.FULL_SCHEME
+  ].includes(chapter);
+}
+
 const pySubLanguages: Array<Pick<SALanguage, 'chapter' | 'variant' | 'displayName'>> = [
   { chapter: Chapter.PYTHON_1, variant: Variant.DEFAULT, displayName: 'Python \xa71' }
   //{ chapter: Chapter.PYTHON_2, variant: Variant.DEFAULT, displayName: 'Python \xa72' },

src/commons/mocks/ContextMocks.ts

@@ -37,7 +37,9 @@ export function mockRuntimeContext(): Context {
     control: null,
     stash: null,
     envStepsTotal: 0,
-    breakpointSteps: []
+    breakpointSteps: [],
+    objectCount: 0,
+    changepointSteps: []
   };
   return context;
 }

src/commons/sagas/PlaygroundSaga.ts

@@ -12,7 +12,7 @@ import {
   updateShortURL
 } from '../../features/playground/PlaygroundActions';
 import { GENERATE_LZ_STRING, SHORTEN_URL } from '../../features/playground/PlaygroundTypes';
-import { isSourceLanguage, OverallState } from '../application/ApplicationTypes';
+import { isSchemeLanguage, isSourceLanguage, OverallState } from '../application/ApplicationTypes';
 import { ExternalLibraryName } from '../application/types/ExternalTypes';
 import { retrieveFilesInWorkspaceAsRecord } from '../fileSystem/utils';
 import { visitSideContent } from '../sideContent/SideContentActions';
@@ -116,6 +116,10 @@ export default function* PlaygroundSaga(): SagaIterator {
           yield put(toggleUsingCse(true, workspaceLocation));
         }
       }
+
+      if (isSchemeLanguage(playgroundSourceChapter) && newId === SideContentType.cseMachine) {
+        yield put(toggleUsingCse(true, workspaceLocation));
+      }
     }
   );
 }

src/commons/sagas/WorkspaceSaga.ts

@@ -31,6 +31,7 @@ import { DeviceSession } from '../../features/remoteExecution/RemoteExecutionTyp
 import { WORKSPACE_BASE_PATHS } from '../../pages/fileSystem/createInBrowserFileSystem';
 import {
   defaultEditorValue,
+  isSchemeLanguage,
   isSourceLanguage,
   OverallState,
   styliseSublanguage
@@ -1089,7 +1090,11 @@ export function* evalCode(
             .currentStep
       )
     : -1;
-  const cseActiveAndCorrectChapter = context.chapter >= 3 && cseIsActive;
+
+  // TODO: we need to make a function that generalises all languages that depend on using the CSE machine
+  const cseActiveAndCorrectChapter =
+    (isSchemeLanguage(context.chapter) || context.chapter >= 3) && cseIsActive;
+
   if (cseActiveAndCorrectChapter) {
     context.executionMethod = 'cse-machine';
   }

src/features/cseMachine/CseMachineLayout.tsx

@@ -185,6 +185,7 @@ export class Layout {
   /** remove program environment containing predefined functions */
   private static removeProgramEnv() {
     if (!Layout.globalEnvNode.children) return;
+    if (Layout.globalEnvNode.children.length === 0) return;
 
     const programEnvNode = Layout.globalEnvNode.children[0];
     const globalEnvNode = Layout.globalEnvNode;

src/features/cseMachine/components/ControlStack.tsx

@@ -1,6 +1,7 @@
 import * as es from 'estree';
 import { Control } from 'js-slang/dist/cse-machine/interpreter';
 import { ControlItem, Instr } from 'js-slang/dist/cse-machine/types';
+import { StatementSequence } from 'js-slang/dist/types';
 import { KonvaEventObject } from 'konva/lib/Node';
 import React from 'react';
 import { Group, Label, Tag, Text } from 'react-konva';
@@ -142,6 +143,6 @@ export const isInstr = (command: ControlItem): command is Instr => {
  * @param command A ControlItem
  * @returns true if the ControlItem is an esNode and false if it is an instruction.
  */
-export const isNode = (command: ControlItem): command is es.Node => {
+export const isNode = (command: ControlItem): command is es.Node | StatementSequence => {
   return (command as es.Node).type !== undefined;
 };