refactor(pointfree): re-use comp() from thi.ng/compose

thi-ng · Dec 27, 2018 · 3f9b244 · 3f9b244
1 parent 1ebfea9
commit 3f9b244
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 53 deletions.
diff --git a/packages/pointfree/package.json b/packages/pointfree/package.json
@@ -30,6 +30,7 @@
     "dependencies": {
         "@thi.ng/api": "^4.2.4",
         "@thi.ng/checks": "^1.5.14",
+        "@thi.ng/compose": "^0.2.2",
         "@thi.ng/equiv": "^0.1.15",
         "@thi.ng/errors": "^0.1.12"
     },
@@ -50,4 +51,4 @@
     "publishConfig": {
         "access": "public"
     }
-}
+}
diff --git a/packages/pointfree/src/comp.ts b/packages/pointfree/src/comp.ts
diff --git a/packages/pointfree/src/index.ts b/packages/pointfree/src/index.ts
@@ -2,10 +2,10 @@ import { IObjectOf } from "@thi.ng/api/api";
 import { isArray } from "@thi.ng/checks/is-array";
 import { isFunction } from "@thi.ng/checks/is-function";
 import { isPlainObject } from "@thi.ng/checks/is-plain-object";
+import { compL } from "@thi.ng/compose/comp";
 import { equiv as _equiv } from "@thi.ng/equiv";
 import { illegalArgs } from "@thi.ng/errors/illegal-arguments";
 import { illegalState } from "@thi.ng/errors/illegal-state";
-
 import {
     Stack,
     StackContext,
@@ -14,7 +14,7 @@ import {
     StackProc,
     StackProgram
 } from "./api";
-import { comp } from "./comp";
+
 
 let SAFE = true;
 
@@ -95,7 +95,7 @@ const $stackFn = (f: StackProc) =>
 const tos = (stack: Stack) => stack[stack.length - 1];
 
 const compile = (prog: StackProgram) =>
-    comp.apply(null, prog.map(
+    compL.apply(null, prog.map(
         (w) => !isFunction(w) ?
             (ctx: StackContext) => (ctx[0].push(w), ctx) :
             w));
@@ -1793,4 +1793,3 @@ export const printrs = (ctx: StackContext) =>
     (console.log(ctx[1]), ctx);
 
 export * from "./api";
-export * from "./comp";