From 66b1dc65c0cbf673758f75af851dc686abcf4893 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 17 Dec 2017 16:08:48 -0400
Subject: - Got the tests to run again.

---
 .../test/luxc/lang/analysis/procedure/common.lux   | 37 ++++++++++------------
 .../test/test/luxc/lang/translation/structure.lux  |  2 +-
 2 files changed, 18 insertions(+), 21 deletions(-)

(limited to 'new-luxc')

diff --git a/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux b/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
index 664e04581..bde0e0b60 100644
--- a/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/procedure/common.lux
@@ -18,7 +18,6 @@
               ["&." module]
               ["~" analysis]
               (analysis [".A" expression]
-                        ["@" procedure]
                         ["@." common])
               [".L" eval]))
   (/// common)
@@ -29,7 +28,7 @@
      (-> Text (List Code) Type Bool)
      (|> (&.with-scope
            (&.with-type output-type
-             (@.analyse-procedure analyse evalL.eval procedure params)))
+             (analyse (` ((~ (code.text procedure)) (~+ params))))))
          (macro.run (init-compiler []))
          (case> (#e.Success _)
                 <success>
@@ -263,9 +262,9 @@
                   (|> (&scope.with-scope ""
                         (&scope.with-local [var-name arrayT]
                           (&.with-type elemT
-                            (@.analyse-procedure analyse evalL.eval "lux array get"
-                                                 (list (code.symbol ["" var-name])
-                                                       idxC)))))
+                            (analyse (` ("lux array get"
+                                         (~ (code.symbol ["" var-name]))
+                                         (~ idxC)))))))
                       (macro.run (init-compiler []))
                       (case> (#e.Success _)
                              true
@@ -276,10 +275,10 @@
                   (|> (&scope.with-scope ""
                         (&scope.with-local [var-name arrayT]
                           (&.with-type arrayT
-                            (@.analyse-procedure analyse evalL.eval "lux array put"
-                                                 (list (code.symbol ["" var-name])
-                                                       idxC
-                                                       elemC)))))
+                            (analyse (` ("lux array put"
+                                         (~ (code.symbol ["" var-name]))
+                                         (~ idxC)
+                                         (~ elemC)))))))
                       (macro.run (init-compiler []))
                       (case> (#e.Success _)
                              true
@@ -290,9 +289,9 @@
                   (|> (&scope.with-scope ""
                         (&scope.with-local [var-name arrayT]
                           (&.with-type arrayT
-                            (@.analyse-procedure analyse evalL.eval "lux array remove"
-                                                 (list (code.symbol ["" var-name])
-                                                       idxC)))))
+                            (analyse (` ("lux array remove"
+                                         (~ (code.symbol ["" var-name]))
+                                         (~ idxC)))))))
                       (macro.run (init-compiler []))
                       (case> (#e.Success _)
                              true
@@ -303,8 +302,7 @@
                   (|> (&scope.with-scope ""
                         (&scope.with-local [var-name arrayT]
                           (&.with-type Nat
-                            (@.analyse-procedure analyse evalL.eval "lux array size"
-                                                 (list (code.symbol ["" var-name]))))))
+                            (analyse (` ("lux array size" (~ (code.symbol ["" var-name]))))))))
                       (macro.run (init-compiler []))
                       (case> (#e.Success _)
                              true
@@ -363,8 +361,7 @@
                   (|> (&scope.with-scope ""
                         (&scope.with-local [var-name atomT]
                           (&.with-type elemT
-                            (@.analyse-procedure analyse evalL.eval "lux atom read"
-                                                 (list (code.symbol ["" var-name]))))))
+                            (analyse (` ("lux atom read" (~ (code.symbol ["" var-name]))))))))
                       (macro.run (init-compiler []))
                       (case> (#e.Success _)
                              true
@@ -375,10 +372,10 @@
                   (|> (&scope.with-scope ""
                         (&scope.with-local [var-name atomT]
                           (&.with-type Bool
-                            (@.analyse-procedure analyse evalL.eval "lux atom compare-and-swap"
-                                                 (list (code.symbol ["" var-name])
-                                                       elemC
-                                                       elemC)))))
+                            (analyse (` ("lux atom compare-and-swap"
+                                         (~ (code.symbol ["" var-name]))
+                                         (~ elemC)
+                                         (~ elemC)))))))
                       (macro.run (init-compiler []))
                       (case> (#e.Success _)
                              true
diff --git a/new-luxc/test/test/luxc/lang/translation/structure.lux b/new-luxc/test/test/luxc/lang/translation/structure.lux
index 70e3b5951..078079b6b 100644
--- a/new-luxc/test/test/luxc/lang/translation/structure.lux
+++ b/new-luxc/test/test/luxc/lang/translation/structure.lux
@@ -100,7 +100,7 @@
                                 (let [_tag (:! Integer (maybe.assume (array.read +0 valueT)))
                                       _last? (array.read +1 valueT)
                                       _value (:! Top (maybe.assume (array.read +2 valueT)))]
-                                  (and (n/= tag (|> _tag host.i2l int-to-nat))
+                                  (and (n/= tag (|> _tag host.int-to-long int-to-nat))
                                        (case _last?
                                          (#.Some _last?')
                                          (and last? (text/= "" (:! Text _last?')))
-- 
cgit v1.2.3