Fix remaining errors

Author: RichDom2185

src/createContext.ts

@@ -1,23 +1,26 @@
 // Variable determining chapter of Source is contained in this file.
 
+import { schemeVisualise } from './alt-langs/scheme/scheme-mapper'
 import * as scheme_libs from './alt-langs/scheme/scm-slang/src/stdlib/source-scheme-library'
-import {
-  scheme1Prelude,
-  scheme2Prelude,
-  scheme3Prelude,
-  scheme4Prelude,
-  schemeFullPrelude
-} from './stdlib/scheme.prelude'
 import { GLOBAL, JSSLANG_PROPERTIES } from './constants'
 import { call_with_current_continuation } from './cse-machine/continuations'
 import Heap from './cse-machine/heap'
+import { Transformers } from './cse-machine/interpreter'
+import { cset_apply, cset_eval } from './cse-machine/scheme-macros'
 import * as list from './stdlib/list'
 import { list_to_vector } from './stdlib/list'
 import { listPrelude } from './stdlib/list.prelude'
 import { localImportPrelude } from './stdlib/localImport.prelude'
 import * as misc from './stdlib/misc'
 import * as parser from './stdlib/parser'
 import * as pylib from './stdlib/pylib'
+import {
+  scheme1Prelude,
+  scheme2Prelude,
+  scheme3Prelude,
+  scheme4Prelude,
+  schemeFullPrelude
+} from './stdlib/scheme.prelude'
 import * as stream from './stdlib/stream'
 import { streamPrelude } from './stdlib/stream.prelude'
 import { createTypeEnvironment, tForAll, tVar } from './typeChecker/utils'
@@ -33,9 +36,6 @@ import {
 } from './types'
 import * as operators from './utils/operators'
 import { stringify } from './utils/stringify'
-import { schemeVisualise } from './alt-langs/scheme/scheme-mapper'
-import { cset_apply, cset_eval } from './cse-machine/scheme-macros'
-import { Transformers } from './cse-machine/interpreter'
 
 export class EnvTree {
   private _root: EnvTreeNode | null = null
@@ -262,7 +262,7 @@ export const importExternalSymbols = (context: Context, externalSymbols: string[
   ensureGlobalEnvironmentExist(context)
 
   externalSymbols.forEach(symbol => {
-    defineSymbol(context, symbol, GLOBAL[symbol])
+    defineSymbol(context, symbol, GLOBAL[symbol as keyof typeof GLOBAL])
   })
 }
 
@@ -324,7 +324,7 @@ export const importBuiltins = (context: Context, externalBuiltIns: CustomBuiltIn
     // Short param names for stringified version of math functions
     const parameterNames = [...'abcdefghijklmnopqrstuvwxyz']
     for (const name of mathLibraryNames) {
-      const value = Math[name]
+      const value = Math[name as keyof typeof Math]
       if (typeof value === 'function') {
         let paramString: string
         let minArgsNeeded = undefined

src/infiniteLoops/instrument.ts

@@ -4,8 +4,9 @@ import type es from 'estree'
 import { transformImportDeclarations } from '../transpiler/transpiler'
 import type { Node } from '../types'
 import * as create from '../utils/ast/astCreator'
-import { recursive, simple, WalkerCallback } from '../utils/walkers'
 import { getIdsFromDeclaration } from '../utils/ast/helpers'
+import { objectValues } from '../utils/misc'
+import { recursive, simple, WalkerCallback } from '../utils/walkers'
 // transforms AST of program
 
 const globalIds = {
@@ -40,8 +41,8 @@ enum FunctionNames {
  * E.g. "function f(f)..." -> "function f_0(f_1)..."
  * @param predefined A table of [key: string, value:string], where variables named 'key' will be renamed to 'value'
  */
-function unshadowVariables(program: Node, predefined = {}) {
-  for (const name of Object.values(globalIds)) {
+function unshadowVariables(program: Node, predefined: { [key: string]: string } = {}) {
+  for (const name of objectValues(globalIds)) {
     predefined[name] = name
   }
   const seenIds = new Set()
@@ -607,7 +608,7 @@ function instrument(
   builtins: Iterable<string>
 ): string {
   const { builtinsId, functionsId, stateId } = globalIds
-  const predefined = {}
+  const predefined: Record<string, string> = {}
   predefined[builtinsId] = builtinsId
   predefined[functionsId] = functionsId
   predefined[stateId] = stateId
@@ -640,7 +641,7 @@ function instrument(
 }
 
 export {
-  instrument,
   FunctionNames as InfiniteLoopRuntimeFunctions,
-  globalIds as InfiniteLoopRuntimeObjectNames
+  globalIds as InfiniteLoopRuntimeObjectNames,
+  instrument
 }

src/infiniteLoops/runtime.ts

@@ -251,7 +251,7 @@ function prepareBuiltins(oldBuiltins: Map<string, any>) {
   const nonDetFunctions = ['get_time', 'math_random']
   const newBuiltins = new Map<string, any>()
   for (const [name, fun] of oldBuiltins) {
-    const specialCase = builtinSpecialCases[name]
+    const specialCase = builtinSpecialCases[name as keyof typeof builtinSpecialCases]
     if (specialCase !== undefined) {
       newBuiltins.set(name, specialCase)
     } else {

src/infiniteLoops/state.ts

@@ -138,7 +138,9 @@ export class State {
     }
     const transitions = this.mixedStack[this.stackPointer].transitions
     for (let i = 0; i < transitions.length; i++) {
-      const transition = transitions[i]
+      // TODO: Something seems to be very wrong with the type definitions here
+      // Shall we just remove the infinite loop detector as per #1516?
+      const transition: any = transitions[i]
       if (transition[0] === name) {
         transition[1] = concrete
         transition[2] = id
@@ -234,6 +236,6 @@ export class State {
    * @returns the name of the last function in the stack.
    */
   public getLastFunctionName() {
-    return this.functionStack[this.functionStack.length - 1][0]
+    return (this.functionStack[this.functionStack.length - 1] as any)[0]
   }
 }

src/repl/utils.ts

@@ -1,11 +1,10 @@
 import { Option } from '@commander-js/extra-typings'
-
+import { parseError, type Context } from '..'
 import { pyLanguages, scmLanguages, sourceLanguages } from '../constants'
-import { Chapter, type Language, Variant, type Result, type LanguageOptions } from '../types'
-import { stringify } from '../utils/stringify'
 import Closure from '../cse-machine/closure'
-import { parseError, type Context } from '..'
+import { Chapter, Variant, type Language, type LanguageOptions, type Result } from '../types'
 import { objectKeys } from '../utils/misc'
+import { stringify } from '../utils/stringify'
 
 export function chapterParser(str: string): Chapter {
   let foundChapter: string | undefined
@@ -23,7 +22,7 @@ export function chapterParser(str: string): Chapter {
   }
 
   if (foundChapter in Chapter) {
-    return Chapter[foundChapter]
+    return Chapter[foundChapter as keyof typeof Chapter]
   }
   throw new Error(`Invalid chapter value: ${str}`)
 }

src/stdlib/pylib.ts

@@ -28,7 +28,8 @@ export function __py_adder(x: Value, y: Value) {
     return x + Number(y)
   }
   if (__is_numeric(x) && __is_numeric(y)) {
-    return x + y
+    // TODO: Shouldn't this be `Number(x) + Number(y)`?
+    return (x as any) + (y as any)
   }
   throw new Error(`Invalid types for addition operation: ${typeof x}, ${typeof y}`)
 }

src/stepper/lib.ts

@@ -1,9 +1,9 @@
 import * as es from 'estree'
 
+import { BuiltInFunctionError } from '../errors/errors'
 import * as misc from '../stdlib/misc'
 import { Context, substituterNodes } from '../types'
 import * as ast from '../utils/ast/astCreator'
-import { BuiltInFunctionError } from '../errors/errors'
 import { nodeToValue, nodeToValueWithContext, valueToExpression } from './converter'
 import { codify } from './stepper'
 import { isBuiltinFunction, isNumber } from './util'
@@ -98,7 +98,7 @@ export function parse_int(str: substituterNodes, radix: substituterNodes): es.Ex
 // }
 // evaluateMath(mathFn: string, ...args: substituterNodes): substituterNodes
 export function evaluateMath(mathFn: string, ...args: substituterNodes[]): es.Expression {
-  const fn = Math[mathFn.split('_')[1]]
+  const fn = Math[mathFn.split('_')[1] as keyof typeof Math] as Function
   if (!fn) {
     throw new BuiltInFunctionError(`Math function ${mathFn} not found.`)
   } else if (args.some(arg => !isNumber(arg))) {

src/transpiler/transpiler.ts

@@ -260,8 +260,8 @@ function transformSomeExpressionsToCheckIfBoolean(program: es.Program, globalIds
     const { line, column } = (node.loc ?? UNKNOWN_LOCATION).start
     const source = node.loc?.source ?? null
     const test = node.type === 'LogicalExpression' ? 'left' : 'test'
-    node[test] = create.callExpression(globalIds.boolOrErr, [
-      node[test],
+    ;(node as any)[test] = create.callExpression(globalIds.boolOrErr, [
+      (node as any)[test],
       create.literal(line),
       create.literal(column),
       create.literal(source)

src/utils/stringify.ts

@@ -49,9 +49,9 @@ function niceTypeToString(type: Type, nameMap = { _next: 0 }): string {
       }
       if (!(type.name in nameMap)) {
         // type name is not in map, so add it
-        nameMap[type.name] = 'T' + nameMap._next++
+        ;(nameMap as any)[type.name] = 'T' + nameMap._next++
       }
-      return nameMap[type.name]
+      return (nameMap as any)[type.name]
     case 'list':
       return `List<${curriedTypeToString(type.elementType)}>`
     case 'array':

src/vm/svml-assembler.ts

@@ -93,7 +93,7 @@ function serialiseFunction(f: SVMFunction): ImFunction {
       case OpCodes.NEWC:
         holes.push({
           offset: b.cursor,
-          referent: ['function', instr[1]![0]]
+          referent: ['function', (instr[1]! as any)[0]]
         })
         b.putU(32, 0)
         break