- WIP: Adjustments to new-luxc based on recent changes to stdlib.

1 files changed, 13 insertions, 12 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 5cb4d52ec..689724bae 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
@@ -11,15 +11,16 @@
        [macro #+ with-gensyms]
        (macro [code]
               ["s" syntax #+ syntax:])
-       [host])
-  (luxc ["&" lang]
-        (lang [".L" host]
+       [host]
+       ["//" lang]
+       (lang ["//." reference #+ Register]
+             ["//." synthesis #+ Synthesis]
+             ["//." extension]))
+  (luxc (lang [".L" host]
               (host ["$" jvm]
                     (jvm ["$t" type]
                          ["$d" def]
-                         ["$i" inst]))
-              ["la" analysis]
-              ["ls" synthesis]))
+                         ["$i" inst]))))
   (/// [".T" runtime]
        [".T" case]
        [".T" function]
@@ -38,10 +39,10 @@
 
 ## [Types]
 (type: #export Translator
-  (-> ls.Synthesis (Meta $.Inst)))
+  (-> Synthesis (Meta $.Inst)))
 
 (type: #export Proc
-  (-> Translator (List ls.Synthesis) (Meta $.Inst)))
+  (-> Translator (List Synthesis) (Meta $.Inst)))
 
 (type: #export Bundle
   (Dict Text Proc))
@@ -78,8 +79,8 @@
 (def: (wrong-arity proc expected actual)
   (-> Text Nat Nat Text)
   (format "Wrong number of arguments for " (%t proc) "\n"
-          "Expected: " (|> expected nat-to-int %i) "\n"
-          "  Actual: " (|> actual nat-to-int %i)))
+          "Expected: " (|> expected .int %i) "\n"
+          "  Actual: " (|> actual .int %i)))
 
 (syntax: (arity: {name s.local-symbol} {arity s.nat})
   (with-gensyms [g!_ g!proc g!name g!translate g!inputs]
@@ -171,7 +172,7 @@
   message)
 
 (def: #export (wrong-syntax procedure args)
-  (-> Text (List ls.Synthesis) Text)
+  (-> Text (List Synthesis) Text)
   (format "Procedure: " procedure "\n"
           "Arguments: " (%code (code.tuple args))))
 
@@ -184,7 +185,7 @@
         (loopT.translate-loop translate offset initsS+ bodyS)
 
         (#e.Error error)
-        (&.throw Wrong-Syntax (wrong-syntax proc-name inputsS)))
+        (//.throw Wrong-Syntax (wrong-syntax proc-name inputsS)))
       )))
 
 (def: lux//recur