Got new-luxc to compile/build again.

2 files changed, 36 insertions, 36 deletions

diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
index 154dcbdcf..afd140997 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
@@ -8,12 +8,12 @@
     ["." text
      format]
     [collection
-     ["." list ("list/." Functor<List>)]
+     ["." list ("#/." functor)]
      ["." dictionary]]]
    ["." macro (#+ with-gensyms)
     ["." code]
     ["s" syntax (#+ syntax:)]]
-   [platform
+   [tool
     [compiler
      ["." phase
       [synthesis (#+ Synthesis)]
@@ -58,7 +58,7 @@
                        (function ((~ g!_) (~ g!extension-name) (~ g!phase) (~ g!inputs))
                          (case (~ g!inputs)
                            (^ (list (~+ g!inputC+)))
-                           (do phase.Monad<Operation>
+                           (do phase.monad
                              [(~+ (|> g!inputC+
                                       (list/map (function (_ g!input)
                                                   (list g!input (` ((~ g!phase) (~ g!input))))))
@@ -77,7 +77,7 @@
 (def: #export (variadic extension)
   (-> Variadic Handler)
   (function (_ extension-name phase inputsS)
-    (do phase.Monad<Operation>
+    (do phase.monad
       [inputsH (monad.map @ phase inputsS)]
       (wrap (extension inputsH)))))
 
diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux
index 370f07f82..483f810e2 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux
@@ -1,16 +1,16 @@
 (.module:
   lux
   (lux (control [monad #+ do]
-                ["p" parser "parser/" Monad<Parser>]
+                ["p" parser ("#/." monad)]
                 ["ex" exception #+ exception:])
        (data [product]
              ["e" error]
-             [text "text/" Eq<Text>]
+             [text ("#/." equivalence)]
              (text format
                    ["l" lexer])
-             (coll [list "list/" Functor<List>]
+             (coll [list ("#/." functor)]
                    (dictionary ["dict" unordered #+ Dict])))
-       [macro "macro/" Monad<Meta>]
+       [macro ("#/." monad)]
        (macro [code]
               ["s" syntax #+ syntax:])
        [host])
@@ -84,7 +84,7 @@
 (def: conversion-procs
   @.Bundle
   (<| (@.prefix "convert")
-      (|> (dict.new text.Hash<Text>)
+      (|> (dict.new text.hash)
           (@.install "double-to-float" (@.unary convert//double-to-float))
           (@.install "double-to-int" (@.unary convert//double-to-int))
           (@.install "double-to-long" (@.unary convert//double-to-long))
@@ -209,7 +209,7 @@
 (def: int-procs
   @.Bundle
   (<| (@.prefix "int")
-      (|> (dict.new text.Hash<Text>)
+      (|> (dict.new text.hash)
           (@.install "+" (@.binary int//+))
           (@.install "-" (@.binary int//-))
           (@.install "*" (@.binary int//*))
@@ -228,7 +228,7 @@
 (def: long-procs
   @.Bundle
   (<| (@.prefix "long")
-      (|> (dict.new text.Hash<Text>)
+      (|> (dict.new text.hash)
           (@.install "+" (@.binary long//+))
           (@.install "-" (@.binary long//-))
           (@.install "*" (@.binary long//*))
@@ -247,7 +247,7 @@
 (def: float-procs
   @.Bundle
   (<| (@.prefix "float")
-      (|> (dict.new text.Hash<Text>)
+      (|> (dict.new text.hash)
           (@.install "+" (@.binary float//+))
           (@.install "-" (@.binary float//-))
           (@.install "*" (@.binary float//*))
@@ -260,7 +260,7 @@
 (def: double-procs
   @.Bundle
   (<| (@.prefix "double")
-      (|> (dict.new text.Hash<Text>)
+      (|> (dict.new text.hash)
           (@.install "+" (@.binary double//+))
           (@.install "-" (@.binary double//-))
           (@.install "*" (@.binary double//*))
@@ -273,7 +273,7 @@
 (def: char-procs
   @.Bundle
   (<| (@.prefix "char")
-      (|> (dict.new text.Hash<Text>)
+      (|> (dict.new text.hash)
           (@.install "=" (@.binary char//=))
           (@.install "<" (@.binary char//<))
           )))
@@ -289,7 +289,7 @@
   (-> Text @.Proc)
   (case inputs
     (^ (list [_ (#.Nat level)] [_ (#.Text class)] lengthS))
-    (do macro.Monad<Meta>
+    (do macro.monad
       [lengthI (translate lengthS)
        #let [arrayJT ($t.array level (case class
                                        "boolean" $t.boolean
@@ -313,7 +313,7 @@
   (-> Text @.Proc)
   (case inputs
     (^ (list [_ (#.Text class)] idxS arrayS))
-    (do macro.Monad<Meta>
+    (do macro.monad
       [arrayI (translate arrayS)
        idxI (translate idxS)
        #let [loadI (case class
@@ -339,7 +339,7 @@
   (-> Text @.Proc)
   (case inputs
     (^ (list [_ (#.Text class)] idxS valueS arrayS))
-    (do macro.Monad<Meta>
+    (do macro.monad
       [arrayI (translate arrayS)
        idxI (translate idxS)
        valueI (translate valueS)
@@ -367,7 +367,7 @@
 (def: array-procs
   @.Bundle
   (<| (@.prefix "array")
-      (|> (dict.new text.Hash<Text>)
+      (|> (dict.new text.hash)
           (@.install "length" (@.unary array//length))
           (@.install "new" array//new)
           (@.install "read" array//read)
@@ -408,7 +408,7 @@
   (-> Text @.Proc)
   (case inputs
     (^ (list [_ (#.Text class)]))
-    (do macro.Monad<Meta>
+    (do macro.monad
       []
       (wrap (|>> (_.string class)
                  (_.INVOKESTATIC "java.lang.Class" "forName"
@@ -424,7 +424,7 @@
   (-> Text @.Proc)
   (case inputs
     (^ (list [_ (#.Text class)] objectS))
-    (do macro.Monad<Meta>
+    (do macro.monad
       [objectI (translate objectS)]
       (wrap (|>> objectI
                  (_.INSTANCEOF class)
@@ -437,7 +437,7 @@
   (-> Text @.Proc)
   (case inputs
     (^ (list [_ (#.Text from)] [_ (#.Text to)] valueS))
-    (do macro.Monad<Meta>
+    (do macro.monad
       [valueI (translate valueS)]
       (case [from to]
         ## Wrap
@@ -465,7 +465,7 @@
 (def: object-procs
   @.Bundle
   (<| (@.prefix "object")
-      (|> (dict.new text.Hash<Text>)
+      (|> (dict.new text.hash)
           (@.install "null" (@.nullary object//null))
           (@.install "null?" (@.unary object//null?))
           (@.install "synchronized" (@.binary object//synchronized))
@@ -485,13 +485,13 @@
             ["float" #$.Float]
             ["double" #$.Double]
             ["char" #$.Char])
-      (dict.from-list text.Hash<Text>)))
+      (dict.from-list text.hash)))
 
 (def: (static//get proc translate inputs)
   (-> Text @.Proc)
   (case inputs
     (^ (list [_ (#.Text class)] [_ (#.Text field)] [_ (#.Text unboxed)]))
-    (do macro.Monad<Meta>
+    (do macro.monad
       []
       (case (dict.get unboxed primitives)
         (#.Some primitive)
@@ -518,7 +518,7 @@
   (-> Text @.Proc)
   (case inputs
     (^ (list [_ (#.Text class)] [_ (#.Text field)] [_ (#.Text unboxed)] valueS))
-    (do macro.Monad<Meta>
+    (do macro.monad
       [valueI (translate valueS)]
       (case (dict.get unboxed primitives)
         (#.Some primitive)
@@ -550,7 +550,7 @@
   (-> Text @.Proc)
   (case inputs
     (^ (list [_ (#.Text class)] [_ (#.Text field)] [_ (#.Text unboxed)] objectS))
-    (do macro.Monad<Meta>
+    (do macro.monad
       [objectI (translate objectS)]
       (case (dict.get unboxed primitives)
         (#.Some primitive)
@@ -581,7 +581,7 @@
   (-> Text @.Proc)
   (case inputs
     (^ (list [_ (#.Text class)] [_ (#.Text field)] [_ (#.Text unboxed)] valueS objectS))
-    (do macro.Monad<Meta>
+    (do macro.monad
       [valueI (translate valueS)
        objectI (translate objectS)]
       (case (dict.get unboxed primitives)
@@ -632,7 +632,7 @@
 
 (def: java-type
   (l.Lexer $.Type)
-  (do p.Monad<Parser>
+  (do p.monad
     [raw base-type
      nesting (p.some (l.this "[]"))]
     (wrap ($t.array (list.size nesting) raw))))
@@ -651,7 +651,7 @@
       (Meta [$.Type $.Inst]))
   (case argS
     (^ [_ (#.Tuple (list [_ (#.Text argD)] argS))])
-    (do macro.Monad<Meta>
+    (do macro.monad
       [argT (translate-type argD)
        argI (translate argS)]
       (wrap [argT argI]))
@@ -673,7 +673,7 @@
   (case inputs
     (^ (list& [_ (#.Text class)] [_ (#.Text method)]
               [_ (#.Text unboxed)] argsS))
-    (do macro.Monad<Meta>
+    (do macro.monad
       [argsTI (monad.map @ (translate-arg translate) argsS)
        returnT (method-return-type unboxed)]
       (wrap (|>> (_.fuse (list/map product.right argsTI))
@@ -690,7 +690,7 @@
      (case inputs
        (^ (list& [_ (#.Text class)] [_ (#.Text method)]
                  [_ (#.Text unboxed)] objectS argsS))
-       (do macro.Monad<Meta>
+       (do macro.monad
          [objectI (translate objectS)
           argsTI (monad.map @ (translate-arg translate) argsS)
           returnT (method-return-type unboxed)]
@@ -713,7 +713,7 @@
   (-> Text @.Proc)
   (case inputs
     (^ (list& [_ (#.Text class)] argsS))
-    (do macro.Monad<Meta>
+    (do macro.monad
       [argsTI (monad.map @ (translate-arg translate) argsS)]
       (wrap (|>> (_.NEW class)
                  _.DUP
@@ -728,17 +728,17 @@
 (def: member-procs
   @.Bundle
   (<| (@.prefix "member")
-      (|> (dict.new text.Hash<Text>)
+      (|> (dict.new text.hash)
           (dict.merge (<| (@.prefix "static")
-                          (|> (dict.new text.Hash<Text>)
+                          (|> (dict.new text.hash)
                               (@.install "get" static//get)
                               (@.install "put" static//put))))
           (dict.merge (<| (@.prefix "virtual")
-                          (|> (dict.new text.Hash<Text>)
+                          (|> (dict.new text.hash)
                               (@.install "get" virtual//get)
                               (@.install "put" virtual//put))))
           (dict.merge (<| (@.prefix "invoke")
-                          (|> (dict.new text.Hash<Text>)
+                          (|> (dict.new text.hash)
                               (@.install "static" invoke//static)
                               (@.install "virtual" invoke//virtual)
                               (@.install "special" invoke//special)