Got new-luxc to compile/build again.

3 files changed, 14 insertions, 14 deletions

diff --git a/new-luxc/source/luxc/lang/host/jvm/def.lux b/new-luxc/source/luxc/lang/host/jvm/def.lux
index e8efe306b..db6bfe07b 100644
--- a/new-luxc/source/luxc/lang/host/jvm/def.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/def.lux
@@ -6,7 +6,7 @@
     ["." product]
     [collection
      ["." array (#+ Array)]
-     ["." list ("list/." Functor<List>)]]]
+     ["." list ("#/." functor)]]]
    ["." host (#+ import: do-to)]
    ["." function]]
   ["$" //
@@ -266,22 +266,22 @@
                       (FieldVisitor::visitEnd))]
          writer)))]
 
-  [boolean-field Bit  $t.boolean id]
+  [boolean-field Bit  $t.boolean function.identity]
   [byte-field    Int  $t.byte    host.long-to-byte]
   [short-field   Int  $t.short   host.long-to-short]
   [int-field     Int  $t.int     host.long-to-int]
-  [long-field    Int  $t.long    id]
+  [long-field    Int  $t.long    function.identity]
   [float-field   Frac $t.float   host.double-to-float]
-  [double-field  Frac $t.double  id]
+  [double-field  Frac $t.double  function.identity]
   [char-field    Nat  $t.char    (|>> .int host.long-to-int host.int-to-char)]
-  [string-field  Text ($t.class "java.lang.String" (list)) id]
+  [string-field  Text ($t.class "java.lang.String" (list)) function.identity]
   )
 
 (def: #export (fuse defs)
   (-> (List $.Def) $.Def)
   (case defs
     #.Nil
-    id
+    function.identity
 
     (#.Cons singleton #.Nil)
     singleton
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index 9a26f8df0..5311f39d9 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -9,13 +9,13 @@
     [text
      format]
     [collection
-     ["." list ("list/." Functor<List>)]]]
+     ["." list ("#/." functor)]]]
    ["." host (#+ import: do-to)]
    [macro
     ["." code]
     ["s" syntax (#+ syntax:)]]
    ["." function]
-   [platform
+   [tool
     [compiler
      [phase (#+ Operation)]]]]
   ["." // (#+ Primitive Inst)
@@ -134,12 +134,12 @@
        (do-to visitor
          (MethodVisitor::visitLdcInsn (<prepare> value)))))]
 
-  [boolean Bit id]
+  [boolean Bit  function.identity]
   [int     Int  host.long-to-int]
-  [long    Int  id]
-  [double  Frac id]
+  [long    Int  function.identity]
+  [double  Frac function.identity]
   [char    Nat  (|>> .int host.long-to-int host.int-to-char)]
-  [string  Text id]
+  [string  Text function.identity]
   )
 
 (syntax: (prefix {base s.local-identifier})
@@ -380,7 +380,7 @@
   (-> (List Inst) Inst)
   (case insts
     #.Nil
-    id
+    function.identity
 
     (#.Cons singleton #.Nil)
     singleton
diff --git a/new-luxc/source/luxc/lang/host/jvm/type.lux b/new-luxc/source/luxc/lang/host/jvm/type.lux
index 57374337d..523944b44 100644
--- a/new-luxc/source/luxc/lang/host/jvm/type.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/type.lux
@@ -4,7 +4,7 @@
     ["." text
      format]
     [collection
-     ["." list ("list/." Functor<List>)]]]]
+     ["." list ("#/." functor)]]]]
   ["." //])
 
 ## Types