- WIP: JVM host procedure analysis.

1 files changed, 11 insertions, 5 deletions

diff --git a/new-luxc/source/luxc/analyser/procedure.lux b/new-luxc/source/luxc/analyser/procedure.lux
index 06ea7c324..064a28e9b 100644
--- a/new-luxc/source/luxc/analyser/procedure.lux
+++ b/new-luxc/source/luxc/analyser/procedure.lux
@@ -3,15 +3,21 @@
   (lux (control [monad #+ do])
        (data [text]
              text/format
-             (coll ["D" dict])
+             (coll ["d" dict])
              [maybe]))
   (luxc ["&" base]
         (lang ["la" analysis #+ Analysis]))
-  (. ["&&;" common]))
+  (. ["./;" common]
+     ["./;" host]))
+
+(def: procedures
+  ./common;Bundle
+  (|> ./common;procedures
+      (d;merge ./host;procedures)))
 
 (def: #export (analyse-procedure analyse proc-name proc-args)
   (-> &;Analyser Text (List Code) (Lux Analysis))
   (default (&;fail (format "Unknown procedure: " (%t proc-name)))
-    (do maybe;Monad<Maybe>
-      [proc (D;get proc-name &&common;procedures)]
-      (wrap (proc analyse proc-args)))))
+           (do maybe;Monad<Maybe>
+             [proc (d;get proc-name procedures)]
+             (wrap (proc analyse proc-args)))))