- Re-organized analysis.

1 files changed, 23 insertions, 23 deletions

diff --git a/new-luxc/source/luxc/analyser.lux b/new-luxc/source/luxc/lang/analysis/expression.lux
index a7b872de5..e3a623089 100644
--- a/new-luxc/source/luxc/analyser.lux
+++ b/new-luxc/source/luxc/lang/analysis/expression.lux
@@ -14,12 +14,12 @@
         (lang ["la" analysis])
         ["&;" module]
         (generator [";G" common]))
-  (. ["&&;" common]
-     ["&&;" function]
-     ["&&;" primitive]
-     ["&&;" reference]
-     ["&&;" structure]
-     ["&&;" procedure]))
+  (.. [";A" common]
+      [";A" function]
+      [";A" primitive]
+      [";A" reference]
+      [";A" structure]
+      [";A" procedure]))
 
 (for {"JVM" (as-is (host;import java.lang.reflect.Method
                      (invoke [Object (Array Object)] #try Object))
@@ -67,31 +67,31 @@
                (^template [<tag> <analyser>]
                  (<tag> value)
                  (<analyser> value))
-               ([#;Bool &&primitive;analyse-bool]
-                [#;Nat  &&primitive;analyse-nat]
-                [#;Int  &&primitive;analyse-int]
-                [#;Deg  &&primitive;analyse-deg]
-                [#;Frac &&primitive;analyse-frac]
-                [#;Text &&primitive;analyse-text])
+               ([#;Bool primitiveA;analyse-bool]
+                [#;Nat  primitiveA;analyse-nat]
+                [#;Int  primitiveA;analyse-int]
+                [#;Deg  primitiveA;analyse-deg]
+                [#;Frac primitiveA;analyse-frac]
+                [#;Text primitiveA;analyse-text])
 
                (^ (#;Tuple (list)))
-               &&primitive;analyse-unit
+               primitiveA;analyse-unit
 
                ## Singleton tuples are equivalent to the element they contain.
                (^ (#;Tuple (list singleton)))
                (analyse singleton)
 
                (^ (#;Tuple elems))
-               (&&structure;analyse-product analyse elems)
+               (structureA;analyse-product analyse elems)
 
                (^ (#;Record pairs))
-               (&&structure;analyse-record analyse pairs)
+               (structureA;analyse-record analyse pairs)
 
                (#;Symbol reference)
-               (&&reference;analyse-reference reference)
+               (referenceA;analyse-reference reference)
 
                (^ (#;Form (list& [_ (#;Text proc-name)] proc-args)))
-               (&&procedure;analyse-procedure analyse eval proc-name proc-args)
+               (procedureA;analyse-procedure analyse eval proc-name proc-args)
 
                (^template [<tag> <analyser>]
                  (^ (#;Form (list& [_ (<tag> tag)]
@@ -102,15 +102,15 @@
 
                    _
                    (<analyser> analyse tag (` [(~@ values)]))))
-               ([#;Nat &&structure;analyse-sum]
-                [#;Tag &&structure;analyse-tagged-sum])
+               ([#;Nat structureA;analyse-sum]
+                [#;Tag structureA;analyse-tagged-sum])
 
                (#;Tag tag)
-               (&&structure;analyse-tagged-sum analyse tag (' []))
+               (structureA;analyse-tagged-sum analyse tag (' []))
                
                (^ (#;Form (list& func args)))
                (do meta;Monad<Meta>
-                 [[funcT =func] (&&common;with-unknown-type
+                 [[funcT =func] (commonA;with-unknown-type
                                   (analyse func))]
                  (case =func
                    [_ (#;Symbol def-name)]
@@ -131,10 +131,10 @@
 
                            _
                            (&;throw Macro-Expression-Must-Have-Single-Expansion (%code ast))))
-                       (&&function;analyse-apply analyse funcT =func args)))
+                       (functionA;analyse-apply analyse funcT =func args)))
 
                    _
-                   (&&function;analyse-apply analyse funcT =func args)))
+                   (functionA;analyse-apply analyse funcT =func args)))
 
                _
                (&;throw Unrecognized-Syntax (%code ast))