refactor(Typescript): decomp, pollard, cons (#139)

* decomp, transform

* update imports

* pollard, cons

* decomp

* clean up

* while (iscons) -> tail, iterator, some

* clean up code

* clean up code

Author: brianmickel

inspector.ts

@@ -48,11 +48,7 @@ class AtomFormatter {
         { name: 'b', value: x.q.b.toString() },
       ]);
     } else if (x.k == CONS) {
-      const items = [];
-      while (iscons(x)) {
-        items.push(car(x));
-        x = cdr(x);
-      }
+      const items = iscons(x) ? [...x] : [];
       return propertyList(items);
     } else if (x.k == TENSOR) {
       const elems = split_tensor(x, 0, 0)[1];

runtime/count.ts

@@ -1,13 +1,14 @@
 import { equal } from '../sources/misc';
 import { car, cdr, iscons, istensor, Sym, U } from './defs';
+
+const sum = (arr: number[]): number =>
+  arr.reduce((a: number, b: number) => a + b, 0);
+
 export function count(p: U) {
   let n: number;
   if (iscons(p)) {
-    n = 0;
-    while (iscons(p)) {
-      n += count(car(p)) + 1;
-      p = cdr(p);
-    }
+    const items = [...p];
+    n = sum(items.map(count)) + items.length;
   } else {
     n = 1;
   }
@@ -21,15 +22,11 @@ export function count(p: U) {
 export function countOccurrencesOfSymbol(needle: Sym, p: U) {
   let n = 0;
   if (iscons(p)) {
-    while (iscons(p)) {
-      n += countOccurrencesOfSymbol(needle, car(p));
-      p = cdr(p);
-    }
-  } else {
-    if (equal(needle, p)) {
-      n = 1;
-    }
+    n = sum([...p].map((el) => countOccurrencesOfSymbol(needle, el)));
+  } else if (equal(needle, p)) {
+    n = 1;
   }
+
   return n;
 }
 
@@ -43,10 +40,8 @@ export function countsize(p: U) {
       n += count(p.tensor.elem[i]);
     }
   } else if (iscons(p)) {
-    while (iscons(p)) {
-      n += count(car(p)) + 1;
-      p = cdr(p);
-    }
+    const items = [...p];
+    n = sum(items.map(count)) + items.length;
   } else {
     n = 1;
   }

runtime/find.ts

@@ -3,8 +3,6 @@ import { equal } from '../sources/misc';
 import {
   caddr,
   cadr,
-  car,
-  cdr,
   Constants,
   E,
   iscons,
@@ -29,11 +27,8 @@ export function Find(p: U, q: U): boolean {
     return false;
   }
 
-  while (iscons(p)) {
-    if (Find(car(p), q)) {
-      return true;
-    }
-    p = cdr(p);
+  if (iscons(p)) {
+    return [...p].some((p1: U) => Find(p1, q));
   }
 
   return false;
@@ -67,11 +62,8 @@ export function findPossibleClockForm(p: U, p1: U): boolean {
     return false;
   }
 
-  while (iscons(p)) {
-    if (findPossibleClockForm(car(p), p1)) {
-      return true;
-    }
-    p = cdr(p);
+  if (iscons(p)) {
+    return [...p].some((el) => findPossibleClockForm(el, p1));
   }
 
   return false;
@@ -92,11 +84,8 @@ export function findPossibleExponentialForm(p: U): boolean {
     return false;
   }
 
-  while (iscons(p)) {
-    if (findPossibleExponentialForm(car(p))) {
-      return true;
-    }
-    p = cdr(p);
+  if (iscons(p)) {
+    return [...p].some(findPossibleExponentialForm);
   }
 
   return false;

runtime/otherCFunctions.ts

@@ -1,5 +1,4 @@
 import { stop } from './run';
-import { push } from './stack';
 import { nativeInt } from '../sources/bignum';
 import { isZeroAtomOrTensor } from '../sources/is';
 import {
@@ -15,7 +14,7 @@ import {
   U,
 } from './defs';
 import { get_binding } from './symbol';
-import { list } from '../sources/list';
+import { makeList } from '../sources/list';
 
 export function strcmp(str1: string, str2: string): Sign {
   if (str1 === str2) {
@@ -177,18 +176,16 @@ export function __range__(
 }
 
 // Append one list to another.
-export function append(p1: U, p2: U) {
+export function append(p1: U, p2: U): U {
   // from https://github.com/gbl08ma/eigenmath/blob/8be989f00f2f6f37989bb7fd2e75a83f882fdc49/src/append.cpp
-  const h = defs.tos;
-  while (iscons(p1)) {
-    push(car(p1));
-    p1 = cdr(p1);
+  const arr = [];
+  if (iscons(p1)) {
+    arr.push(...p1);
   }
-  while (iscons(p2)) {
-    push(car(p2));
-    p2 = cdr(p2);
+  if (iscons(p2)) {
+    arr.push(...p2);
   }
-  list(defs.tos - h);
+  return makeList(...arr);
 }
 
 export function jn(n: number, x: number): number {

sources/bake.ts

@@ -2,7 +2,6 @@ import {
   ADD,
   car,
   Cons,
-  defs,
   doexpand,
   FOR,
   isadd,

sources/cons.ts

@@ -41,10 +41,6 @@ export function Eval_cosh(p1: U) {
 }
 
 export function ycosh(p1: U): U {
-  return yycosh(p1);
-}
-
-function yycosh(p1: U): U {
   if (car(p1) === symbol(ARCCOSH)) {
     return cadr(p1);
   }