From b5c854fb5ac1ead274f4ae0c657da66df957f14e Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 15 Nov 2017 20:57:47 -0400
Subject: - Moved "luxc/lang/syntax" to "lux/lang/syntax". - Minor refactoring.

---
 new-luxc/source/luxc/lang/analysis/procedure/common.lux   |  8 ++++----
 new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'new-luxc/source/luxc/lang/analysis/procedure')

diff --git a/new-luxc/source/luxc/lang/analysis/procedure/common.lux b/new-luxc/source/luxc/lang/analysis/procedure/common.lux
index be77e643c..a643cb76a 100644
--- a/new-luxc/source/luxc/lang/analysis/procedure/common.lux
+++ b/new-luxc/source/luxc/lang/analysis/procedure/common.lux
@@ -56,7 +56,7 @@
             [_ (&;infer outputT)
              argsA (monad;map @
                               (function [[argT argC]]
-                                (&;with-expected-type argT
+                                (&;with-type argT
                                   (analyse argC)))
                               (list;zip2 inputsT+ args))]
             (wrap (la;procedure proc argsA)))
@@ -98,7 +98,7 @@
       (do meta;Monad<Meta>
         [[var-id varT] (&;with-type-env tc;var)
          _ (&;infer (type (Either Text varT)))
-         opA (&;with-expected-type (type (io;IO varT))
+         opA (&;with-type (type (io;IO varT))
                (analyse opC))]
         (wrap (la;procedure proc (list opA))))
       
@@ -148,7 +148,7 @@
       (^ (list valueC))
       (do meta;Monad<Meta>
         [_ (&;infer (type Type))
-         valueA (&;with-expected-type Type
+         valueA (&;with-type Type
                   (analyse valueC))]
         (wrap valueA))
       
@@ -342,7 +342,7 @@
       (do meta;Monad<Meta>
         [[var-id varT] (&;with-type-env tc;var)
          _ (&;infer (type (Atom varT)))
-         initA (&;with-expected-type varT
+         initA (&;with-type varT
                  (analyse initC))]
         (wrap (la;procedure proc (list initA))))
       
diff --git a/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux
index c6a456441..8f5382d2b 100644
--- a/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/analysis/procedure/host.jvm.lux
@@ -197,7 +197,7 @@
       (do meta;Monad<Meta>
         [_ (&;infer Nat)
          [var-id varT] (&;with-type-env tc;var)
-         arrayA (&;with-expected-type (type (Array varT))
+         arrayA (&;with-type (type (Array varT))
                   (analyse arrayC))]
         (wrap (la;procedure proc (list arrayA))))
 
@@ -210,7 +210,7 @@
     (case args
       (^ (list lengthC))
       (do meta;Monad<Meta>
-        [lengthA (&;with-expected-type Nat
+        [lengthA (&;with-type Nat
                    (analyse lengthC))
          expectedT meta;expected-type
          [level elem-class] (: (Meta [Nat Text])
@@ -303,12 +303,12 @@
       (do meta;Monad<Meta>
         [[var-id varT] (&;with-type-env tc;var)
          _ (&;infer varT)
-         arrayA (&;with-expected-type (type (Array varT))
+         arrayA (&;with-type (type (Array varT))
                   (analyse arrayC))
          ?elemT (&;with-type-env
                   (tc;read var-id))
          [elemT elem-class] (box-array-element-type (maybe;default varT ?elemT))
-         idxA (&;with-expected-type Nat
+         idxA (&;with-type Nat
                 (analyse idxC))]
         (wrap (la;procedure proc (list (code;text elem-class) idxA arrayA))))
 
@@ -323,14 +323,14 @@
       (do meta;Monad<Meta>
         [[var-id varT] (&;with-type-env tc;var)
          _ (&;infer (type (Array varT)))
-         arrayA (&;with-expected-type (type (Array varT))
+         arrayA (&;with-type (type (Array varT))
                   (analyse arrayC))
          ?elemT (&;with-type-env
                   (tc;read var-id))
          [valueT elem-class] (box-array-element-type (maybe;default varT ?elemT))
-         idxA (&;with-expected-type Nat
+         idxA (&;with-type Nat
                 (analyse idxC))
-         valueA (&;with-expected-type valueT
+         valueA (&;with-type valueT
                   (analyse valueC))]
         (wrap (la;procedure proc (list (code;text elem-class) idxA valueA arrayA))))
 
-- 
cgit v1.2.3