update inherit paths

nt/mix/default.nix

@@ -9,13 +9,21 @@
     ;
 
   inherit
-    (this.util)
+    (this.std)
     filterAttrs
     hasInfix
     mergeAttrsList
     nameValuePair
-    projectOnto
     removeSuffix
+    ;
+
+  inherit
+    (this.parse)
+    projectOnto
+    ;
+
+  inherit
+    (this.types)
     Wrap
     ;
 

nt/primitives/bootstrap/default.nix

@@ -29,10 +29,12 @@ let
     delegate;
 
   this = bootstrap {inherit this bootstrap;} [
+    ./nt.nix
     {
       std = ./std/bootstrap.nix;
       types = ./types/bootstrap.nix;
       parse = ./parse/bootstrap.nix;
+      trapdoor = ./trapdoor.nix;
     }
   ];
 in

nt/primitives/bootstrap/nt.nix

@@ -10,7 +10,7 @@
     ;
 
   inherit
-    (this)
+    (this.trapdoor)
     mkTrapdoorKey
     openTrapdoor
     ;

nt/primitives/bootstrap/parse/parse.nix

@@ -16,6 +16,11 @@
     (this.std)
     enfIsAttrs
     ;
+
+  inherit
+    (this.types)
+    Wrap
+    ;
 in rec {
   # form: getAttrAt :: list string -> set -> null | Wrap Any
   # given path as a list of strings, return that value of an

nt/primitives/bootstrap/std/attrs.nix

@@ -1,4 +1,4 @@
-{...}: let
+{this, ...}: let
   inherit
     (builtins)
     attrNames
@@ -14,6 +14,12 @@
     tail
     typeOf
     ;
+
+  inherit
+    (this)
+    flipCurry
+    id
+    ;
 in rec {
   enfIsAttrs = value: msg: let
     got = typeOf value;

nt/primitives/bootstrap/std/bootstrap.nix

@@ -1,11 +1,14 @@
 # WARNING: /nt/primitives/bootstrap cannot depend on mix
 # WARNING: this file is strictly for bootstrapping nt
-{bootstrap, ...} @ inputs:
+{bootstrap, ...}: let
-bootstrap inputs [
+  # WARNING: do not propagate `this` from parent, bootstrap/std must
-  ./attrs.nix
+  # WARNING: remain entirely independent from bootstrap
-  ./enforce.nix
+  this = bootstrap {inherit this bootstrap;} [
-  ./fn.nix
+    ./attrs.nix
-  ./list.nix
+    ./fn.nix
-  ./num.nix
+    ./list.nix
-  ./string.nix
+    ./num.nix
-]
+    ./string.nix
+  ];
+in
+  this

nt/primitives/bootstrap/types/maybe.nix

@@ -1,13 +1,21 @@
 {this, ...}: let
-  # inherit
+  inherit
-  #   (this)
+    (this)
-  #   enfImpls
+    ntTrapdoorKey
-  #   mkTrapdoorFn
+    ntDynamicTrapdoorKey
-  #   mkTrapdoorSet
+    ;
-  #   ntTrapdoorKey
+
-  #   ntDynamicTrapdoorKey
+  inherit
-  #   openTrapdoor
+    (this.std)
-  #   ;
+    enfImpls
+    ;
+
+  inherit
+    (this.trapdoor)
+    mkTrapdoorFn
+    mkTrapdoorSet
+    openTrapdoor
+    ;
 in {
   # NOTE: Maybe is used to simplify parsing Type/Class declarations
   # NOTE: and therefore must be implemented manually

nt/primitives/bootstrap/types/null.nix

@@ -1,10 +1,13 @@
 # XXX: TODO: replace Null with the naive Maybe type
 {this, ...}: let
-  # inherit
+  inherit
-  #   (this)
+    (this)
-  #   ntTrapdoorKey
+    ntTrapdoorKey
-  #   mkTrapdoorSet
+    ;
-  #   ;
+  inherit
+    (this.trapdoor)
+    mkTrapdoorSet
+    ;
 in {
   # NOTE: This is not good for writing type safe code
   # NOTE: it is however efficient for bootstrapping the primitives

nt/primitives/bootstrap/types/wrap.nix

@@ -1,10 +1,14 @@
 {this, ...}: let
-  # inherit
+  inherit
-  #   (this)
+    (this)
-  #   ntTrapdoorKey
+    ntTrapdoorKey
-  #   mkTrapdoorFn
+    ;
-  #   mkTrapdoorSet
+
-  #   ;
+  inherit
+    (this.trapdoor)
+    mkTrapdoorFn
+    mkTrapdoorSet
+    ;
 in {
   # NOTE: Wrap is used to simplify parsing Type/Class declarations
   # NOTE: and therefore must be implemented manually

nt/primitives/nt.nix

@@ -8,17 +8,29 @@
     ;
 
   inherit
-    (this.util)
+    (this)
     enfIsType
-    enfIsClassSig
+    typeSig
+    ;
+
+  inherit
+    (this.std)
     flipCurry
+    removeAttrsRec
+    ;
+
+  inherit
+    (this.parse)
+    enfIsClassSig
     hasAttrAt
     mkTrapdoorSet
     ntTrapdoorKey
     parseClassSig
     projectOnto
-    removeAttrsRec
+    ;
-    typeSig
+
+  inherit
+    (this.types)
     Wrap
     ;