update representation of control

Author: s-kybound

src/features/cseMachine/CseMachineUtils.ts

@@ -45,7 +45,11 @@ import {
   Primitive,
   ReferenceType
 } from './CseMachineTypes';
-import { isCustomPrimitive } from './utils/altLangs';
+import {
+  getAlternateControlItemComponent,
+  isCustomPrimitive,
+  needsNewRepresentation
+} from './utils/altLangs';
 
 // TODO: can make use of lodash
 /** Returns `true` if `x` is an object */
@@ -531,6 +535,19 @@ export function getControlItemComponent(
     ? index === Math.min(Layout.control.size() - 1, 9)
     : index === Layout.control.size() - 1;
   if (!isInstr(controlItem)) {
+    // there's no reason to provide an alternate representation
+    // for a instruction.
+    if (needsNewRepresentation(chapter)) {
+      return getAlternateControlItemComponent(
+        controlItem,
+        stackHeight,
+        highlightOnHover,
+        unhighlightOnHover,
+        topItem,
+        chapter
+      );
+    }
+
     if (isSchemeLanguage(chapter)) {
       // use the js-slang decoder on the control item
       controlItem = estreeDecode(controlItem as any);
@@ -797,12 +814,8 @@ export function getStashItemComponent(
   stashItem: StashValue,
   stackHeight: number,
   index: number,
-  chapter: Chapter
+  _chapter: Chapter
 ): StashItemComponent {
-  if (isSchemeLanguage(chapter)) {
-    // we can use schemeVisualise to get the representation of the value
-    // TODO
-  }
   if (isClosure(stashItem) || isGlobalFn(stashItem) || isDataArray(stashItem)) {
     for (const level of Layout.levels) {
       for (const frame of level.frames) {

src/features/cseMachine/utils/altLangs.ts

@@ -1,10 +1,53 @@
 // alternate representations of data types
 
+import { ControlItem } from 'js-slang/dist/cse-machine/types';
+import { Chapter, Node } from 'js-slang/dist/types';
+import { isSchemeLanguage } from 'src/commons/application/ApplicationTypes';
+
+import { ControlItemComponent } from '../components/ControlItemComponent';
 import { Data } from '../CseMachineTypes';
-import { isSchemeNumber } from './scheme';
+import { convertNodeToScheme, isSchemeNumber } from './scheme';
 
 // used to define custom primitives from alternate languages.
 // MAKE SURE the custom primitive has a toString() method!
 export function isCustomPrimitive(data: Data): boolean {
   return isSchemeNumber(data);
 }
+
+// tells the CSE machine whether a new representation is needed.
+// expand when necessary.
+export function needsNewRepresentation(chapter: Chapter): boolean {
+  return isSchemeLanguage(chapter);
+}
+
+export function getAlternateControlItemComponent(
+  controlItem: ControlItem,
+  stackHeight: number,
+  highlightOnHover: () => void,
+  unhighlightOnHover: () => void,
+  topItem: boolean,
+  chapter: Chapter
+) {
+  // keep in mind that the controlItem is a node.
+  // there's no reason to provide an alternate representation
+  // for a instruction.
+  const node = controlItem as Node;
+  switch (chapter) {
+    case Chapter.SCHEME_1:
+    case Chapter.SCHEME_2:
+    case Chapter.SCHEME_3:
+    case Chapter.SCHEME_4:
+    case Chapter.FULL_SCHEME:
+      const text = convertNodeToScheme(node);
+      return new ControlItemComponent(
+        text,
+        text,
+        stackHeight,
+        highlightOnHover,
+        unhighlightOnHover,
+        topItem
+      );
+    default:
+      throw new Error('Unknown chapter');
+  }
+}

src/features/cseMachine/utils/scheme.ts

@@ -1,3 +1,7 @@
+import { estreeDecode } from 'js-slang/dist/alt-langs/scheme/scm-slang/src/utils/encoder-visitor';
+import { unparse } from 'js-slang/dist/alt-langs/scheme/scm-slang/src/utils/reverse_parser';
+import { Node } from 'js-slang/dist/types';
+
 import { Data } from '../CseMachineTypes';
 
 /** Returns `true` if `data` is a scheme number
@@ -6,3 +10,7 @@ import { Data } from '../CseMachineTypes';
 export function isSchemeNumber(data: Data): boolean {
   return (data as any)?.numberType !== undefined;
 }
+
+export function convertNodeToScheme(node: Node): string {
+  return unparse(estreeDecode(node as any));
+}