From 7661faaa22a253bb4703992b638038d96ead0ade Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 25 Jan 2022 21:26:50 -0400
Subject: Bug fixes for eval in general and in Lux/Ruby.

---
 lux-jvm/source/luxc/lang/directive/jvm.lux | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lux-jvm/source/luxc/lang/directive/jvm.lux')

diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index 009bec5b4..3960a3532 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -40,14 +40,14 @@
      ["[0]" phase]
      [language
       [lux
-       ["[0]" analysis {"+" Analysis}]
        ["[0]" synthesis {"+" Synthesis}]
        ["[0]" generation]
        ["[0]" directive {"+" Requirements}]
+       ["[0]" analysis {"+" Analysis}
+        ["[0]A" type]]
        [phase
         [analysis
-         ["[0]A" scope]
-         ["[0]A" type]]
+         ["[0]A" scope]]
         ["[0]" extension
          ["[0]" bundle]
          [analysis
@@ -1054,8 +1054,8 @@
         constructor_argumentsA (monad.each ! (function (_ [typeJ termC])
                                                (do !
                                                  [typeL (//A.reflection_type mapping typeJ)
-                                                  termA (typeA.with_type typeL
-                                                          (analyse archive termC))]
+                                                  termA (<| (typeA.expecting typeL)
+                                                            (analyse archive termC))]
                                                  (in [typeJ termA])))
                                            constructor_argumentsC)
         selfT (//A.reflection_type mapping (/type.class class_name class_tvars))
@@ -1069,7 +1069,7 @@
                            {.#Item [self selfT]}
                            list.reversed
                            (list#mix scopeA.with_local (analyse archive bodyC))
-                           (typeA.with_type returnT)
+                           (typeA.expecting returnT)
                            analysis.with_scope)]
        (in [privacy strict_floating_point? annotations method_tvars exceptions
             self arguments constructor_argumentsA
@@ -1099,7 +1099,7 @@
                            {.#Item [self selfT]}
                            list.reversed
                            (list#mix scopeA.with_local (analyse archive bodyC))
-                           (typeA.with_type returnT)
+                           (typeA.expecting returnT)
                            analysis.with_scope)]
        (in [[super_name super_tvars] method_name strict_floating_point? annotations
             method_tvars self arguments returnJ exceptionsJ
@@ -1127,7 +1127,7 @@
                            {.#Item [self selfT]}
                            list.reversed
                            (list#mix scopeA.with_local (analyse archive bodyC))
-                           (typeA.with_type returnT)
+                           (typeA.expecting returnT)
                            analysis.with_scope)]
        (in [name privacy final? strict_floating_point? annotations method_tvars
             self arguments returnJ exceptionsJ
@@ -1152,7 +1152,7 @@
         [_scope bodyA] (|> arguments'
                            list.reversed
                            (list#mix scopeA.with_local (analyse archive bodyC))
-                           (typeA.with_type returnT)
+                           (typeA.expecting returnT)
                            analysis.with_scope)]
        (in [name privacy strict_floating_point? annotations method_tvars
             arguments returnJ exceptionsJ
-- 
cgit v1.2.3