Replace 'vv' with 'datum4' in Frame

Author: masak

src/runtime/evaluate.ts

@@ -762,7 +762,7 @@ handlerMap.set(SyntaxKind.CALL_EXPR, (frame) => {
                 throw new E612_NotEnoughArgumentsError();
             }
             frame.datum2 = funcValue;
-            frame.vv
+            frame.datum4
                 = Array.from({ length: args.length }, () => new UninitValue());
             return new Frame(frame, { state: 2 });
         }
@@ -777,7 +777,7 @@ handlerMap.set(SyntaxKind.CALL_EXPR, (frame) => {
                 jumpMap.lastTarget = null;
                 jumpMap.nextTarget = null;
                 let funcValue = frame.datum2 as FuncValue;
-                let argValues = frame.vv;
+                let argValues = frame.datum4;
                 let bodyEnv = extend(funcValue.outerEnv);
                 for (let [param, arg] of
                      zip(funcValue.parameters, argValues)) {
@@ -796,7 +796,7 @@ handlerMap.set(SyntaxKind.CALL_EXPR, (frame) => {
         }
         case 3: {
             let argValue = frame.value;
-            frame.vv[frame.datum1] = argValue;
+            frame.datum4[frame.datum1] = argValue;
             return new Frame(frame, { state: 2, datum1: frame.datum1 + 1 });
         }
     }
@@ -854,11 +854,11 @@ handlerMap.set(SyntaxKind.ARRAY_INITIALIZER_EXPR, (frame) => {
                 return recurse(frame, 1, { node: elements[frame.datum1] });
             }
             else {
-                return new ArrayValue(frame.vv);
+                return new ArrayValue(frame.datum4);
             }
         }
         case 1: {
-            frame.vv[frame.datum1] = frame.value;
+            frame.datum4[frame.datum1] = frame.value;
             return new Frame(frame, { state: 0, datum1: frame.datum1 + 1 });
         }
     }
@@ -931,23 +931,23 @@ handlerMap.set(SyntaxKind.QUOTE_EXPR, (frame) => {
             else {
                 if (statements.length === 1
                     && isExprStatement(statements[0])) {
-                    return (frame.vv[0] as SyntaxNodeValue).children[0];
+                    return (frame.datum4[0] as SyntaxNodeValue).children[0];
                 }
                 else if (statements.length === 1
                          && isStatement(statements[0])) {
-                    return frame.vv[0];
+                    return frame.datum4[0];
                 }
                 else {
                     return new SyntaxNodeValue(
                         new IntValue(SYNTAX_KIND__BLOCK),
-                        frame.vv as Array<SyntaxNodeValue>,
+                        frame.datum4 as Array<SyntaxNodeValue>,
                         new NoneValue(),
                     );
                 }
             }
         }
         case 1: {
-            frame.vv[frame.datum1] = frame.value;
+            frame.datum4[frame.datum1] = frame.value;
             return new Frame(frame, { state: 0, datum1: frame.datum1 + 1 });
         }
         case 2: {
@@ -987,14 +987,14 @@ handlerMap.set(SyntaxKind.QUOTE_EXPR, (frame) => {
                     let [kind, payload] = kindAndPayloadOfNode(subNode);
                     return new SyntaxNodeValue(
                         kind,
-                        frame.vv as Array<SyntaxNodeValue>,
+                        frame.datum4 as Array<SyntaxNodeValue>,
                         payload,
                     );
                 }
             }
         }
         case 3: {
-            frame.vv[frame.datum1] = frame.value;
+            frame.datum4[frame.datum1] = frame.value;
             return new Frame(frame, { state: 2, datum1: frame.datum1 + 1 });
         }
         case 4: {

src/runtime/frame.ts

@@ -45,14 +45,14 @@ export class Frame {
     staticEnvs: Map<SyntaxNode, Env>;
     value: Value;
     cell: Cell | null;
-    vv: Array<Value>;
     jumpMap: JumpMap;
     tail: Frame;
 
     // mutable properties
     datum1: number;
     datum2: number | Value;
     datum3: Array<SyntaxNode>;
+    datum4: Array<Value>;
 
     constructor(oldFrame: Frame | null, newProps: Partial<Frame>) {
         this.mode = newProps.mode ?? oldFrame?.mode ?? Mode.GetValue;
@@ -64,7 +64,6 @@ export class Frame {
             ?? error("staticEnvs");
         this.value = newProps.value ?? oldFrame?.value ?? new NoneValue();
         this.cell = newProps.cell ?? oldFrame?.cell ?? null;
-        this.vv = newProps.vv ?? oldFrame?.vv ?? [];
         this.jumpMap = newProps.jumpMap
             ?? oldFrame?.jumpMap
             ?? error("jumpMap");
@@ -73,6 +72,7 @@ export class Frame {
         this.datum1 = newProps.datum1 ?? oldFrame?.datum1 ?? 0;
         this.datum2 = newProps.datum2 ?? oldFrame?.datum2 ?? 0;
         this.datum3 = newProps.datum3 ?? oldFrame?.datum3 ?? [];
+        this.datum4 = newProps.datum4 ?? oldFrame?.datum4 ?? [];
     }
 }