From 0594525aea5a62355838116a1408f7ce7a7ba0b4 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 10 May 2018 20:16:56 -0400
Subject: - Adjusted new-luxc to latest changes.

---
 new-luxc/source/luxc/repl.lux | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'new-luxc/source/luxc/repl.lux')

diff --git a/new-luxc/source/luxc/repl.lux b/new-luxc/source/luxc/repl.lux
index fbf1a336e..0ce7fb898 100644
--- a/new-luxc/source/luxc/repl.lux
+++ b/new-luxc/source/luxc/repl.lux
@@ -12,7 +12,7 @@
                      [json #+ JSON])
              (coll [array]
                    [list "list/" Functor<List>]
-                   [dict]))
+                   (dictionary ["dict" unordered])))
        (time [instant #+ Instant]
              [duration #+ Duration]
              [date #+ Date])
@@ -46,8 +46,8 @@
   [(exception: #export (<name> {message Text})
      message)]
 
-  [REPL-Initialization-Failed]
-  [REPL-Error]
+  [repl-initialization-failed]
+  [repl-error]
   )
 
 (def: repl-module "<REPL>")
@@ -85,7 +85,7 @@
         (wrap compiler))
       
       (#e.Error message)
-      (task.throw REPL-Initialization-Failed message))))
+      (task.throw repl-initialization-failed message))))
 
 (def: (add-line line [where offset input])
   (-> Text Source Source)
@@ -102,20 +102,20 @@
   (Poly Representation)
   (`` ($_ p.either
           (do p.Monad<Parser>
-            [_ poly.unit]
+            [_ (poly.this Top)]
             (wrap (const "[]")))
           
-          (~~ (do-template [<parser> <type> <formatter>]
+          (~~ (do-template [<type> <formatter>]
                 [(do p.Monad<Parser>
-                   [_ <parser>]
+                   [_ (poly.this <type>)]
                    (wrap (|>> (:! <type>) <formatter>)))]
 
-                [poly.bool Bool %b]
-                [poly.nat Nat %n]
-                [poly.int Int %i]
-                [poly.deg Deg %d]
-                [poly.frac Frac %f]
-                [poly.text Text %t])))))
+                [Bool %b]
+                [Nat %n]
+                [Int %i]
+                [Deg %d]
+                [Frac %f]
+                [Text %t])))))
 
 (def: (special-representation representation)
   (-> (Poly Representation) (Poly Representation))
@@ -324,8 +324,8 @@
               (recur compiler' source' false))
 
             (#e.Error error)
-            (if (ex.match? syntax.End-Of-File error)
+            (if (ex.match? syntax.end-of-file error)
               (recur compiler source true)
-              (exec (log! (REPL-Error error))
+              (exec (log! (ex.construct repl-error error))
                 (recur compiler fresh-source false))))))
       )))
-- 
cgit v1.2.3