From 8787650c4b1641832db9df2c35bc3046e886220e Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 6 May 2018 00:45:45 -0400 Subject: - Updated new-luxc to the latest stdlib changes. --- new-luxc/source/luxc/cache/description.lux | 8 -------- new-luxc/source/luxc/cache/io.lux | 10 +++++----- 2 files changed, 5 insertions(+), 13 deletions(-) (limited to 'new-luxc/source/luxc/cache') diff --git a/new-luxc/source/luxc/cache/description.lux b/new-luxc/source/luxc/cache/description.lux index cce2e783d..467fed765 100644 --- a/new-luxc/source/luxc/cache/description.lux +++ b/new-luxc/source/luxc/cache/description.lux @@ -23,12 +23,6 @@ (~ (code.text name)) (~+ (list/map write-type params)))) - #.Void - (` "Void") - - #.Unit - (` "Unit") - (^template [ ] ( left right) (` ( (~ (write-type left)) (~ (write-type right))))) @@ -73,8 +67,6 @@ (function (_ read-type) ($_ p.alt (tagged "Primitive" (p.seq s.text (p.some read-type))) - (s.this (` "Void")) - (s.this (` "Unit")) (binary "Sum" read-type) (binary "Product" read-type) (binary "Function" read-type) diff --git a/new-luxc/source/luxc/cache/io.lux b/new-luxc/source/luxc/cache/io.lux index 8c4367989..62585c0bc 100644 --- a/new-luxc/source/luxc/cache/io.lux +++ b/new-luxc/source/luxc/cache/io.lux @@ -66,7 +66,7 @@ (wrap (list.concat root-modules)))) (def: (delete file) - (-> File (Process Unit)) + (-> File (Process Top)) (do io.Monad [deleted? (file.delete file)] (if deleted? @@ -74,7 +74,7 @@ (io.throw Cannot-Delete-Cached-File file)))) (def: (un-install target-dir module-name) - (-> File Text (Process Unit)) + (-> File Text (Process Top)) (do io.Monad [#let [module-dir (///io.file target-dir module-name)] files (file.files module-dir) @@ -192,7 +192,7 @@ (:: @ map (dict.from-list text.Hash))))) (def: (set-cache cache) - (-> //.Cache (Process Unit)) + (-> //.Cache (Process Top)) (do io.Monad [swapped? (atom.compare-and-swap //.empty cache ..cache)] (if swapped? @@ -200,13 +200,13 @@ (io.throw Cannot-Pre-Load-Cache-More-Than-Once "")))) (def: #export (pre-load source-dirs target-dir load-def) - (-> (List File) File Loader (Process Unit)) + (-> (List File) File Loader (Process Top)) (do io.Monad [loaded-cache (pre-load' source-dirs (///io.platform-target target-dir) load-def)] (set-cache loaded-cache))) (def: #export (clean target-dir wanted-modules) - (-> File (Set Text) (Process Unit)) + (-> File (Set Text) (Process Top)) (do io.Monad [cached (cached target-dir) _ (|> cached -- cgit v1.2.3