spreadinstr

Author: alsonleej

src/cse-machine/interpreter.ts

@@ -21,6 +21,7 @@ import { evaluateBinaryExpression, evaluateUnaryExpression } from '../utils/oper
 import * as rttc from '../utils/rttc'
 import * as seq from '../utils/statementSeqTransform'
 import { checkProgramForUndefinedVariables } from '../validator/validator'
+import { isSchemeLanguage } from '../alt-langs/mapper'
 import Closure from './closure'
 import {
   Continuation,
@@ -83,7 +84,6 @@ import {
 } from './utils'
 import { isApply, isEval, schemeEval } from './scheme-macros'
 import { Transformer } from './patterns'
-import { isSchemeLanguage } from '../alt-langs/mapper'
 import { flattenList, isList } from './macro-utils'
 
 type CmdEvaluator = (
@@ -1339,7 +1339,7 @@ const cmdEvaluators: { [type: string]: CmdEvaluator } = {
     const cont = control.getStack()
     const size = control.size()
     for (let i = size - 1; i >= 0;  i--) {
-      // guaranteed at least one call instr above
+      // guaranteed at least one call instr above, because spread is not allowed inside arrays
       if ((cont[i] as AppInstr).instrType === InstrType.APPLICATION) {
         (cont[i] as AppInstr).numOfArgs += array.length - 1;
         break; // only the nearest call instruction above

src/cse-machine/patterns.ts

@@ -5,6 +5,7 @@
 // and a final template (for the list to be transformed into).
 import { List, Pair } from '../stdlib/list'
 import { _Symbol } from '../alt-langs/scheme/scm-slang/src/stdlib/base'
+import { atomic_equals, is_number } from '../alt-langs/scheme/scm-slang/src/stdlib/core-math'
 import {
   arrayToImproperList,
   arrayToList,
@@ -14,7 +15,6 @@ import {
   isPair,
   isList
 } from './macro-utils'
-import { atomic_equals, is_number } from '../alt-langs/scheme/scm-slang/src/stdlib/core-math'
 
 // a single pattern stored within the patterns component
 // may have several transformers attributed to it.

src/cse-machine/scheme-macros.ts

@@ -4,6 +4,7 @@ import { List } from '../stdlib/list'
 import { _Symbol } from '../alt-langs/scheme/scm-slang/src/stdlib/base'
 import { is_number, SchemeNumber } from '../alt-langs/scheme/scm-slang/src/stdlib/core-math'
 import { Context } from '..'
+import { encode } from '../alt-langs/scheme/scm-slang/src'
 import { Control, Stash } from './interpreter'
 import { currentTransformers, getVariable, handleRuntimeError } from './utils'
 import { Transformer, macro_transform, match } from './patterns'
@@ -12,11 +13,9 @@ import {
   arrayToList,
   flattenImproperList,
   isImproperList
-} from './macro-utils'
+, flattenList, isList } from './macro-utils'
 import { ControlItem } from './types'
-import { encode } from '../alt-langs/scheme/scm-slang/src'
 import { popInstr } from './instrCreator'
-import { flattenList, isList } from './macro-utils'
 
 // this needs to be better but for now it's fine
 export type SchemeControlItems = List | _Symbol | SchemeNumber | boolean | string

src/cse-machine/utils.ts

@@ -6,6 +6,8 @@ import * as errors from '../errors/errors'
 import { RuntimeSourceError } from '../errors/runtimeSourceError'
 import { Chapter, type Environment, type Node, type StatementSequence, type Value } from '../types'
 import * as ast from '../utils/ast/astCreator'
+import { _Symbol } from '../alt-langs/scheme/scm-slang/src/stdlib/base'
+import { is_number } from '../alt-langs/scheme/scm-slang/src/stdlib/core-math'
 import Heap from './heap'
 import * as instr from './instrCreator'
 import { Control, Transformers } from './interpreter'
@@ -22,8 +24,6 @@ import {
 import Closure from './closure'
 import { Continuation, isCallWithCurrentContinuation } from './continuations'
 import { isApply, isEval } from './scheme-macros'
-import { _Symbol } from '../alt-langs/scheme/scm-slang/src/stdlib/base'
-import { is_number } from '../alt-langs/scheme/scm-slang/src/stdlib/core-math'
 
 /**
  * Typeguard for commands to check if they are scheme values.