From 14e96f5e5dad439383d63e60a52169cc2e7aaa5c Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 20 May 2018 21:04:03 -0400
Subject: - Re-named "Top" to "Any", and "Bottom" to "Nothing". - Removed some
modules that should have been deleted before.
---
.../source/luxc/lang/translation/common-lisp.lux | 20 ++++++++++----------
.../luxc/lang/translation/common-lisp/eval.jvm.lux | 18 +++++++++---------
.../lang/translation/common-lisp/runtime.jvm.lux | 2 +-
.../lang/translation/common-lisp/statement.jvm.lux | 2 +-
new-luxc/source/luxc/lang/translation/js.lux | 22 +++++++++++-----------
.../source/luxc/lang/translation/js/eval.jvm.lux | 8 ++++----
.../luxc/lang/translation/js/runtime.jvm.lux | 2 +-
.../luxc/lang/translation/js/statement.jvm.lux | 2 +-
.../luxc/lang/translation/jvm/common.jvm.lux | 12 ++++++------
.../source/luxc/lang/translation/jvm/eval.jvm.lux | 2 +-
.../luxc/lang/translation/jvm/statement.jvm.lux | 6 +++---
new-luxc/source/luxc/lang/translation/lua.lux | 20 ++++++++++----------
.../source/luxc/lang/translation/lua/eval.jvm.lux | 10 +++++-----
.../luxc/lang/translation/lua/runtime.jvm.lux | 2 +-
.../luxc/lang/translation/lua/statement.jvm.lux | 2 +-
new-luxc/source/luxc/lang/translation/php.lux | 20 ++++++++++----------
.../source/luxc/lang/translation/php/eval.jvm.lux | 14 +++++++-------
.../luxc/lang/translation/php/runtime.jvm.lux | 2 +-
.../luxc/lang/translation/php/statement.jvm.lux | 2 +-
new-luxc/source/luxc/lang/translation/python.lux | 20 ++++++++++----------
.../luxc/lang/translation/python/eval.jvm.lux | 12 ++++++------
.../luxc/lang/translation/python/runtime.jvm.lux | 2 +-
.../luxc/lang/translation/python/statement.jvm.lux | 2 +-
new-luxc/source/luxc/lang/translation/r.lux | 20 ++++++++++----------
.../source/luxc/lang/translation/r/eval.jvm.lux | 14 +++++++-------
.../source/luxc/lang/translation/r/runtime.jvm.lux | 2 +-
.../luxc/lang/translation/r/statement.jvm.lux | 2 +-
new-luxc/source/luxc/lang/translation/ruby.lux | 22 +++++++++++-----------
.../source/luxc/lang/translation/ruby/eval.jvm.lux | 12 ++++++------
.../luxc/lang/translation/ruby/runtime.jvm.lux | 2 +-
.../luxc/lang/translation/ruby/statement.jvm.lux | 2 +-
new-luxc/source/luxc/lang/translation/scheme.lux | 20 ++++++++++----------
.../luxc/lang/translation/scheme/eval.jvm.lux | 18 +++++++++---------
.../luxc/lang/translation/scheme/runtime.jvm.lux | 2 +-
.../luxc/lang/translation/scheme/statement.jvm.lux | 2 +-
35 files changed, 161 insertions(+), 161 deletions(-)
(limited to 'new-luxc/source/luxc/lang/translation')
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp.lux b/new-luxc/source/luxc/lang/translation/common-lisp.lux
index 704dfe91e..1ae046d33 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp.lux
@@ -52,7 +52,7 @@
(type: #export Host
{#context [Text Nat]
#anchor (Maybe Anchor)
- #loader (-> Expression (Error Top))
+ #loader (-> Expression (Error Any))
#interpreter (-> Expression (Error LispObject))
#module-buffer (Maybe StringBuilder)
#program-buffer StringBuilder})
@@ -80,12 +80,12 @@
(def: #export r-module-name Text (format "module" file-extension))
(def: #export init-module-buffer
- (Meta Top)
+ (Meta Any)
(function (_ compiler)
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #module-buffer (#.Some (StringBuilder::new [])))
- (:! Bottom))
+ (:! Nothing))
compiler)
[]])))
@@ -96,13 +96,13 @@
[old-name old-sub] (get@ #context old)
new-name (format old-name "f___" (%i (nat-to-int old-sub)))]
(case (expr (set@ #.host
- (:! Bottom (set@ #context [new-name +0] old))
+ (:! Nothing (set@ #context [new-name +0] old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #context [old-name (n/inc old-sub)])
- (:! Bottom))
+ (:! Nothing))
compiler')
[new-name output]])
@@ -124,13 +124,13 @@
(function (_ compiler)
(let [old (:! Host (get@ #.host compiler))]
(case (expr (set@ #.host
- (:! Bottom (set@ #anchor (#.Some anchor) old))
+ (:! Nothing (set@ #anchor (#.Some anchor) old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #anchor (get@ #anchor old))
- (:! Bottom))
+ (:! Nothing))
compiler')
output])
@@ -174,7 +174,7 @@
(#e.Success output)
(#e.Success [compiler output])))))]
- [load! #loader Top]
+ [load! #loader Any]
[interpret #interpreter LispObject]
)
@@ -187,7 +187,7 @@
(lang.normalize-name (format module "$" name)))
(def: #export (save code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(do macro.Monad
[module-buffer module-buffer
#let [_ (Appendable::append [(:! CharSequence (_.expression code))]
@@ -197,7 +197,7 @@
(def: #export run interpret)
(def: #export (save-module! target)
- (-> File (Meta (Process Top)))
+ (-> File (Meta (Process Any)))
(do macro.Monad
[module macro.current-module-name
module-buffer module-buffer
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux
index ee2aac932..eef9a985f 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux
@@ -24,7 +24,7 @@
(#static forName [String] #try (Class Object)))
(def: _0
- Top
+ Any
(case (Class::forName "org.armedbear.lisp.Symbol")
(#e.Success _)
(log! "LOADED")
@@ -71,23 +71,23 @@
(elt [int] LispObject))
(def: (parse-tuple lux-object host-object)
- (-> (-> Object (Error Top)) SimpleVector (Error Top))
+ (-> (-> Object (Error Any)) SimpleVector (Error Any))
(let [size (:! Nat (SimpleVector::length [] host-object))]
(loop [idx +0
- output (:! (Array Top) (array.new size))]
+ output (:! (Array Any) (array.new size))]
(if (n/< size idx)
(case (lux-object (SimpleVector::elt [(:! Int idx)] host-object))
(#e.Error error)
(#e.Error error)
(#e.Success lux-value)
- (recur (n/inc idx) (array.write idx (:! Top lux-value) output)))
+ (recur (n/inc idx) (array.write idx (:! Any lux-value) output)))
(#e.Success output)))))
(def: (variant tag flag value)
- (-> Nat Bool Top Top)
+ (-> Nat Bool Any Any)
[(Long::intValue [] (:! Long tag))
- (: Top
+ (: Any
(if flag
//.unit
(host.null)))
@@ -98,7 +98,7 @@
(cdr LispObject))
(def: (parse-variant lux-object host-object)
- (-> (-> Object (Error Top)) Cons (Error Top))
+ (-> (-> Object (Error Any)) Cons (Error Any))
(let [variant-tag (Cons::car host-object)]
(if (and (host.instance? org/armedbear/lisp/Symbol variant-tag)
(text/= //.variant-tag (Symbol::getName [] (:! Symbol variant-tag))))
@@ -113,7 +113,7 @@
(ex.throw invalid-variant (:! Text (Object::toString [] (:! Object host-object)))))))
(def: (lux-object host-object)
- (-> Object (Error Top))
+ (-> Object (Error Any))
(cond (host.instance? org/armedbear/lisp/Bignum host-object)
(#e.Success (Bignum::longValue [] (:! Bignum host-object)))
@@ -144,7 +144,7 @@
(ex.throw Unknown-Kind-Of-Host-Object (:! Object host-object))))
(def: #export (eval code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(let [interpreter (|> compiler (get@ #.host) (:! //.Host) (get@ #//.interpreter))]
(case (interpreter code)
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
index 96393c970..1819a8601 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
@@ -365,7 +365,7 @@
(def: #export artifact Text (format prefix //.file-extension))
(def: #export translate
- (Meta (Process Top))
+ (Meta (Process Any))
(do macro.Monad
[_ //.init-module-buffer
_ (//.save runtime)]
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
index e73d88c96..dab065e62 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
@@ -11,7 +11,7 @@
[".T" eval]))
(def: #export (translate-def name expressionT expressionO metaV)
- (-> Text Type Expression Code (Meta Top))
+ (-> Text Type Expression Code (Meta Any))
(do macro.Monad
[current-module macro.current-module-name
#let [def-ident [current-module name]]]
diff --git a/new-luxc/source/luxc/lang/translation/js.lux b/new-luxc/source/luxc/lang/translation/js.lux
index 3e9b1b143..edca93d10 100644
--- a/new-luxc/source/luxc/lang/translation/js.lux
+++ b/new-luxc/source/luxc/lang/translation/js.lux
@@ -90,12 +90,12 @@
(def: #export module-js-name Text "module.js")
(def: #export init-module-buffer
- (Meta Top)
+ (Meta Any)
(function (_ compiler)
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #module-buffer (#.Some (StringBuilder::new [])))
- (:! Bottom))
+ (:! Nothing))
compiler)
[]])))
@@ -106,13 +106,13 @@
[old-name old-sub] (get@ #context old)
new-name (format old-name "$" (%i (nat-to-int old-sub)))]
(case (expr (set@ #.host
- (:! Bottom (set@ #context [new-name +0] old))
+ (:! Nothing (set@ #context [new-name +0] old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #context [old-name (n/inc old-sub)])
- (:! Bottom))
+ (:! Nothing))
compiler')
[new-name output]])
@@ -134,13 +134,13 @@
(function (_ compiler)
(let [old (:! Host (get@ #.host compiler))]
(case (expr (set@ #.host
- (:! Bottom (set@ #anchor (#.Some anchor) old))
+ (:! Nothing (set@ #anchor (#.Some anchor) old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #anchor (get@ #anchor old))
- (:! Bottom))
+ (:! Nothing))
compiler')
output])
@@ -173,7 +173,7 @@
(#e.Success [compiler (|> compiler (get@ #.host) (:! Host) (get@ #program-buffer))])))
(def: (execute code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(case (|> compiler
(get@ #.host)
@@ -187,7 +187,7 @@
(#e.Success [compiler []]))))
(def: (::toString js-object)
- (-> Top JSObject)
+ (-> Any JSObject)
(object [] AbstractJSObject []
[]
(AbstractJSObject (isFunction) boolean
@@ -317,7 +317,7 @@
(format (module-name module) "$" (lang.normalize-name name)))
(def: #export (save-js code)
- (-> JS (Meta Top))
+ (-> JS (Meta Any))
(do macro.Monad
[module-buffer module-buffer
#let [_ (Appendable::append [(:! CharSequence code)]
@@ -325,11 +325,11 @@
(execute code)))
(def: #export (save-definition name code)
- (-> Ident Expression (Meta Top))
+ (-> Ident Expression (Meta Any))
(save-js (format "var " (definition-name name) " = " code ";\n")))
(def: #export (save-module! target)
- (-> File (Meta (Process Top)))
+ (-> File (Meta (Process Any)))
(do macro.Monad
[module macro.current-module-name
module-buffer module-buffer
diff --git a/new-luxc/source/luxc/lang/translation/js/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/js/eval.jvm.lux
index 5b2499eb0..04121b944 100644
--- a/new-luxc/source/luxc/lang/translation/js/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/js/eval.jvm.lux
@@ -73,7 +73,7 @@
#.None))
(def: (variant lux-object js-object)
- (-> (-> Object (Error Top)) ScriptObjectMirror (Maybe Top))
+ (-> (-> Object (Error Any)) ScriptObjectMirror (Maybe Any))
(case [(JSObject::getMember [//.variant-tag-field] js-object)
(JSObject::getMember [//.variant-flag-field] js-object)
(JSObject::getMember [//.variant-value-field] js-object)]
@@ -88,7 +88,7 @@
#.None))
(def: (array lux-object js-object)
- (-> (-> Object (Error Top)) ScriptObjectMirror (Maybe (Array Object)))
+ (-> (-> Object (Error Any)) ScriptObjectMirror (Maybe (Array Object)))
(if (JSObject::isArray [] js-object)
(let [init-num-keys (int-to-nat (ScriptObjectMirror::size [] js-object))]
(loop [num-keys init-num-keys
@@ -112,7 +112,7 @@
#.None))
(def: (lux-object js-object)
- (-> Object (Error Top))
+ (-> Object (Error Any))
(`` (cond (host.null? js-object)
(ex.throw Null-Has-No-Lux-Representation "")
@@ -160,7 +160,7 @@
(ex.throw Unknown-Kind-Of-JS-Object (Object::toString [] (:! Object js-object))))))
(def: #export (eval code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(case (|> compiler
(get@ #.host)
diff --git a/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux
index 1839a1a5e..2c7303c31 100644
--- a/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux
@@ -727,7 +727,7 @@
(def: #export artifact Text (format prefix ".js"))
(def: #export translate
- (Meta (Process Top))
+ (Meta (Process Any))
(do macro.Monad
[_ //.init-module-buffer
_ (//.save-js runtime)]
diff --git a/new-luxc/source/luxc/lang/translation/js/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/js/statement.jvm.lux
index e15e4379a..849ae76c2 100644
--- a/new-luxc/source/luxc/lang/translation/js/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/js/statement.jvm.lux
@@ -11,7 +11,7 @@
[".T" eval]))
(def: #export (translate-def name expressionT expressionJS metaV)
- (-> Text Type Expression Code (Meta Top))
+ (-> Text Type Expression Code (Meta Any))
(do macro.Monad
[current-module macro.current-module-name
#let [def-ident [current-module name]]]
diff --git a/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
index 29db94d07..1d8da2893 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/common.jvm.lux
@@ -66,13 +66,13 @@
(case (action (update@ #.host
(|>> (:! Host)
(set@ #artifacts (dict.new text.Hash))
- (:! Bottom))
+ (:! Nothing))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #artifacts (|> (get@ #.host compiler) (:! Host) (get@ #artifacts)))
- (:! Bottom))
+ (:! Nothing))
compiler')
[(|> compiler' (get@ #.host) (:! Host) (get@ #artifacts))
output]])
@@ -81,19 +81,19 @@
(#e.Error error))))
(def: #export (record-artifact name content)
- (-> Text Blob (Meta Top))
+ (-> Text Blob (Meta Any))
(function (_ compiler)
(if (|> compiler (get@ #.host) (:! Host) (get@ #artifacts) (dict.contains? name))
(ex.throw Cannot-Overwrite-Artifact name)
(#e.Success [(update@ #.host
(|>> (:! Host)
(update@ #artifacts (dict.put name content))
- (:! Bottom))
+ (:! Nothing))
compiler)
[]]))))
(def: #export (store-class name byte-code)
- (-> Text Bytecode (Meta Top))
+ (-> Text Bytecode (Meta Any))
(function (_ compiler)
(let [store (|> (get@ #.host compiler)
(:! Host)
@@ -116,7 +116,7 @@
(def: #export $Object $.Type ($t.class "java.lang.Object" (list)))
(def: #export (load-definition compiler)
- (-> Lux (-> Ident Blob (Error Top)))
+ (-> Lux (-> Ident Blob (Error Any)))
(function (_ (^@ def-ident [def-module def-name]) def-bytecode)
(let [normal-name (format (lang.normalize-name def-name) (%n (text/hash def-name)))
class-name (format (text.replace-all "/" "." def-module) "." normal-name)]
diff --git a/new-luxc/source/luxc/lang/translation/jvm/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/eval.jvm.lux
index c326895a2..d8e8ffd5e 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/eval.jvm.lux
@@ -21,7 +21,7 @@
(getField [String] Field))
(def: #export (eval valueI)
- (-> $.Inst (Meta Top))
+ (-> $.Inst (Meta Any))
(do macro.Monad
[current-module macro.current-module-name
class-name (:: @ map %code (macro.gensym (format current-module "/eval")))
diff --git a/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux
index 4400c1e90..4c52231f3 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux
@@ -37,7 +37,7 @@
(getField [String] #try Field))
(def: #export (translate-def def-name valueT valueI metaV)
- (-> Text Type $.Inst Code (Meta Top))
+ (-> Text Type $.Inst Code (Meta Any))
(do macro.Monad
[current-module macro.current-module-name
#let [def-ident [current-module def-name]]]
@@ -65,7 +65,7 @@
$i.RETURN))))]
_ (commonT.store-class class-name bytecode)
class (commonT.load-class class-name)
- valueV (: (Meta Top)
+ valueV (: (Meta Any)
(case (do e.Monad
[field (Class::getField [commonT.value-field] class)]
(Field::get [#.None] field))
@@ -93,7 +93,7 @@
(commonT.record-artifact (format bytecode-name ".class") bytecode)))))
(def: #export (translate-program programI)
- (-> $.Inst (Meta Top))
+ (-> $.Inst (Meta Any))
(let [nilI runtimeT.noneI
num-inputsI (|>> ($i.ALOAD +0) $i.ARRAYLENGTH)
decI (|>> ($i.int 1) $i.ISUB)
diff --git a/new-luxc/source/luxc/lang/translation/lua.lux b/new-luxc/source/luxc/lang/translation/lua.lux
index 5d25fb864..94a703300 100644
--- a/new-luxc/source/luxc/lang/translation/lua.lux
+++ b/new-luxc/source/luxc/lang/translation/lua.lux
@@ -78,7 +78,7 @@
(type: #export Host
{#context [Text Nat]
#anchor (Maybe Anchor)
- #interpreter (-> Text (Error Top))
+ #interpreter (-> Text (Error Any))
#module-buffer (Maybe StringBuilder)
#program-buffer StringBuilder})
@@ -104,12 +104,12 @@
(def: #export lua-module-name Text "module.lua")
(def: #export init-module-buffer
- (Meta Top)
+ (Meta Any)
(function (_ compiler)
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #module-buffer (#.Some (StringBuilder::new [])))
- (:! Bottom))
+ (:! Nothing))
compiler)
[]])))
@@ -120,13 +120,13 @@
[old-name old-sub] (get@ #context old)
new-name (format old-name "___" (%i (nat-to-int old-sub)))]
(case (expr (set@ #.host
- (:! Bottom (set@ #context [new-name +0] old))
+ (:! Nothing (set@ #context [new-name +0] old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #context [old-name (n/inc old-sub)])
- (:! Bottom))
+ (:! Nothing))
compiler')
[new-name output]])
@@ -148,13 +148,13 @@
(function (_ compiler)
(let [old (:! Host (get@ #.host compiler))]
(case (expr (set@ #.host
- (:! Bottom (set@ #anchor (#.Some anchor) old))
+ (:! Nothing (set@ #anchor (#.Some anchor) old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #anchor (get@ #anchor old))
- (:! Bottom))
+ (:! Nothing))
compiler')
output])
@@ -187,7 +187,7 @@
(#e.Success [compiler (|> compiler (get@ #.host) (:! Host) (get@ #program-buffer))])))
(def: (execute code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(let [interpreter (|> compiler (get@ #.host) (:! Host) (get@ #interpreter))]
(case (interpreter code)
@@ -208,7 +208,7 @@
(lang.normalize-name (format module "$" name)))
(def: #export (save code)
- (-> Lua (Meta Top))
+ (-> Lua (Meta Any))
(do macro.Monad
[module-buffer module-buffer
#let [_ (Appendable::append [(:! CharSequence code)]
@@ -216,7 +216,7 @@
(execute code)))
(def: #export (save-module! target)
- (-> File (Meta (Process Top)))
+ (-> File (Meta (Process Any)))
(do macro.Monad
[module macro.current-module-name
module-buffer module-buffer
diff --git a/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux
index cc267e7d5..68b41e6d7 100644
--- a/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux
@@ -38,7 +38,7 @@
(host.import net/sandius/rembulan/impl/DefaultTable)
(def: (variant lux-object host-object)
- (-> (-> Object (Error Top)) DefaultTable (Maybe Top))
+ (-> (-> Object (Error Any)) DefaultTable (Maybe Any))
(case [(Table::get-key [//.variant-tag-field] host-object)
(Table::get-key [//.variant-flag-field] host-object)
(Table::get-key [//.variant-value-field] host-object)]
@@ -46,14 +46,14 @@
[(lux-object value)
(#.Some value)])
(#.Some [(Long::intValue [] (:! Long tag))
- (: Top (case ?flag (#.Some _) "" #.None (host.null)))
+ (: Any (case ?flag (#.Some _) "" #.None (host.null)))
value])
_
#.None))
(def: (array lux-object host-object)
- (-> (-> Object (Error Top)) DefaultTable (Maybe (Array Object)))
+ (-> (-> Object (Error Any)) DefaultTable (Maybe (Array Object)))
(let [init-num-keys (:! Nat (Table::rawlen [] host-object))]
(loop [num-keys init-num-keys
idx +0
@@ -74,7 +74,7 @@
(#.Some output)))))
(def: (lux-object host-object)
- (-> Object (Error Top))
+ (-> Object (Error Any))
(cond (host.null? host-object)
(ex.throw Null-Has-No-Lux-Representation "")
@@ -106,7 +106,7 @@
))
(def: #export (eval code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(let [interpreter (|> compiler (get@ #.host) (:! //.Host) (get@ #//.interpreter))]
(case (interpreter (format "return " code ";"))
diff --git a/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux
index 70b498dfa..ace528429 100644
--- a/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux
@@ -386,7 +386,7 @@
(def: #export artifact Text (format prefix ".lua"))
(def: #export translate
- (Meta (Process Top))
+ (Meta (Process Any))
(do macro.Monad
[_ //.init-module-buffer
_ (//.save runtime)]
diff --git a/new-luxc/source/luxc/lang/translation/lua/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/statement.jvm.lux
index ee0725014..3a438ae65 100644
--- a/new-luxc/source/luxc/lang/translation/lua/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/statement.jvm.lux
@@ -11,7 +11,7 @@
[".T" eval]))
(def: #export (translate-def name expressionT expressionO metaV)
- (-> Text Type Expression Code (Meta Top))
+ (-> Text Type Expression Code (Meta Any))
(do macro.Monad
[current-module macro.current-module-name
#let [def-ident [current-module name]]]
diff --git a/new-luxc/source/luxc/lang/translation/php.lux b/new-luxc/source/luxc/lang/translation/php.lux
index 8cbcaad3a..50bfd5289 100644
--- a/new-luxc/source/luxc/lang/translation/php.lux
+++ b/new-luxc/source/luxc/lang/translation/php.lux
@@ -54,7 +54,7 @@
(type: #export Host
{#context [Text Nat]
#anchor (Maybe Anchor)
- #loader (-> Statement (Error Top))
+ #loader (-> Statement (Error Any))
#interpreter (-> Expression (Error Object))
#module-buffer (Maybe StringBuilder)
#program-buffer StringBuilder})
@@ -77,12 +77,12 @@
(def: #export module-name Text (format "module" extension))
(def: #export init-module-buffer
- (Meta Top)
+ (Meta Any)
(function (_ compiler)
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #module-buffer (#.Some (StringBuilder::new [])))
- (:! Bottom))
+ (:! Nothing))
compiler)
[]])))
@@ -93,13 +93,13 @@
[old-name old-sub] (get@ #context old)
new-name (format old-name "___" (%i (nat-to-int old-sub)))]
(case (expr (set@ #.host
- (:! Bottom (set@ #context [new-name +0] old))
+ (:! Nothing (set@ #context [new-name +0] old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #context [old-name (n/inc old-sub)])
- (:! Bottom))
+ (:! Nothing))
compiler')
[new-name output]])
@@ -121,13 +121,13 @@
(function (_ compiler)
(let [old (:! Host (get@ #.host compiler))]
(case (expr (set@ #.host
- (:! Bottom (set@ #anchor (#.Some anchor) old))
+ (:! Nothing (set@ #anchor (#.Some anchor) old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #anchor (get@ #anchor old))
- (:! Bottom))
+ (:! Nothing))
compiler')
output])
@@ -171,7 +171,7 @@
(#e.Success output)
(#e.Success [compiler output])))))]
- [load! #loader Statement Top]
+ [load! #loader Statement Any]
[interpret #interpreter Expression Object]
)
@@ -186,7 +186,7 @@
(lang.normalize-name (format module "$" name)))
(def: #export (save code)
- (-> Statement (Meta Top))
+ (-> Statement (Meta Any))
(do macro.Monad
[module-buffer module-buffer
#let [_ (Appendable::append [(:! CharSequence (_.code code))]
@@ -194,7 +194,7 @@
(load! code)))
(def: #export (save-module! target)
- (-> File (Meta (Process Top)))
+ (-> File (Meta (Process Any)))
(do macro.Monad
[module macro.current-module-name
module-buffer module-buffer
diff --git a/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux
index c6ff1a880..48c09c6c0 100644
--- a/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux
@@ -60,10 +60,10 @@
(get [Memory] Memory))
(def: (tuple lux-object host-object)
- (-> (-> Object (Error Top)) ArrayMemory (Error Top))
+ (-> (-> Object (Error Any)) ArrayMemory (Error Any))
(let [size (ArrayMemory::size [] host-object)]
(loop [idx 0
- output (: (Array Top) (array.new (:! Nat size)))]
+ output (: (Array Any) (array.new (:! Nat size)))]
(if (i/< size idx)
(let [value (|> host-object
(ArrayMemory::get [(LongMemory::new [idx])])
@@ -78,13 +78,13 @@
(ex.return output)))))
(def: (variant lux-object host-object)
- (-> (-> Object (Error Top)) ArrayMemory (Error Top))
+ (-> (-> Object (Error Any)) ArrayMemory (Error Any))
(do e.Monad
[variant-tag (lux-object (ArrayMemory::get [(StringMemory::new [//.variant-tag-field])] host-object))
variant-value (lux-object (ArrayMemory::get [(StringMemory::new [//.variant-value-field])] host-object))]
- (wrap (: Top
+ (wrap (: Any
[(Long::intValue [] (:! Long variant-tag))
- (: Top
+ (: Any
(if (|> host-object
(ArrayMemory::get [(StringMemory::new [//.variant-flag-field])])
(:! ReferenceMemory)
@@ -95,7 +95,7 @@
variant-value]))))
(def: (lux-object host-object)
- (-> Object (Error Top))
+ (-> Object (Error Any))
(cond (host.instance? php/runtime/memory/FalseMemory host-object)
(ex.return false)
@@ -123,7 +123,7 @@
(ex.throw Unknown-Kind-Of-Host-Object host-object)))
(def: #export (eval code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(let [interpreter (|> compiler (get@ #.host) (:! //.Host) (get@ #//.interpreter))]
(case (interpreter code)
diff --git a/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
index c7262a291..5f9745845 100644
--- a/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
@@ -397,7 +397,7 @@
(def: #export artifact Text (format prefix //.extension))
(def: #export translate
- (Meta (Process Top))
+ (Meta (Process Any))
(do macro.Monad
[_ //.init-module-buffer
_ (//.save runtime)]
diff --git a/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux
index afbf7e476..a20e164ca 100644
--- a/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux
@@ -11,7 +11,7 @@
[".T" eval]))
(def: #export (translate-def name expressionT expressionO metaV)
- (-> Text Type Expression Code (Meta Top))
+ (-> Text Type Expression Code (Meta Any))
(do macro.Monad
[current-module macro.current-module-name
#let [def-ident [current-module name]]]
diff --git a/new-luxc/source/luxc/lang/translation/python.lux b/new-luxc/source/luxc/lang/translation/python.lux
index 8739c278d..604f06019 100644
--- a/new-luxc/source/luxc/lang/translation/python.lux
+++ b/new-luxc/source/luxc/lang/translation/python.lux
@@ -54,7 +54,7 @@
(type: #export Host
{#context [Text Nat]
#anchor (Maybe Anchor)
- #loader (-> Statement (Error Top))
+ #loader (-> Statement (Error Any))
#interpreter (-> Expression (Error PyObject))
#module-buffer (Maybe StringBuilder)
#program-buffer StringBuilder})
@@ -74,12 +74,12 @@
(def: #export python-module-name Text "module.py")
(def: #export init-module-buffer
- (Meta Top)
+ (Meta Any)
(function (_ compiler)
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #module-buffer (#.Some (StringBuilder::new [])))
- (:! Bottom))
+ (:! Nothing))
compiler)
[]])))
@@ -90,13 +90,13 @@
[old-name old-sub] (get@ #context old)
new-name (format old-name "___" (%i (nat-to-int old-sub)))]
(case (expr (set@ #.host
- (:! Bottom (set@ #context [new-name +0] old))
+ (:! Nothing (set@ #context [new-name +0] old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #context [old-name (n/inc old-sub)])
- (:! Bottom))
+ (:! Nothing))
compiler')
[new-name output]])
@@ -118,13 +118,13 @@
(function (_ compiler)
(let [old (:! Host (get@ #.host compiler))]
(case (expr (set@ #.host
- (:! Bottom (set@ #anchor (#.Some anchor) old))
+ (:! Nothing (set@ #anchor (#.Some anchor) old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #anchor (get@ #anchor old))
- (:! Bottom))
+ (:! Nothing))
compiler')
output])
@@ -168,7 +168,7 @@
(#e.Success output)
(#e.Success [compiler output])))))]
- [load! #loader Statement Top]
+ [load! #loader Statement Any]
[interpret #interpreter Expression PyObject]
)
@@ -191,12 +191,12 @@
module-buffer)]]
( code)))]
- [save load! python.statement Statement Top]
+ [save load! python.statement Statement Any]
[run interpret python.expression Expression PyObject]
)
(def: #export (save-module! target)
- (-> File (Meta (Process Top)))
+ (-> File (Meta (Process Any)))
(do macro.Monad
[module macro.current-module-name
module-buffer module-buffer
diff --git a/new-luxc/source/luxc/lang/translation/python/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/python/eval.jvm.lux
index 164d088df..6f4e43f9d 100644
--- a/new-luxc/source/luxc/lang/translation/python/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/python/eval.jvm.lux
@@ -45,10 +45,10 @@
(getType [] PyType))
(def: (tuple lux-object host-object)
- (-> (-> PyObject (Error Top)) PyObject (Error Top))
+ (-> (-> PyObject (Error Any)) PyObject (Error Any))
(let [size (:! Nat (PyObject::__len__ [] host-object))]
(loop [idx +0
- output (:! (Array Top) (array.new size))]
+ output (:! (Array Any) (array.new size))]
(if (n/< size idx)
(case (PyObject::__getitem__ [(:! Int idx)] host-object)
(#e.Error error)
@@ -72,7 +72,7 @@
(def: value-field (PyString::new [//.variant-value-field]))
(def: (variant lux-object host-object)
- (-> (-> PyObject (Error Top)) PyObject (Error Top))
+ (-> (-> PyObject (Error Any)) PyObject (Error Any))
(case [(PyObject::__getitem__dict [tag-field] host-object)
(PyObject::__getitem__dict [flag-field] host-object)
(PyObject::__getitem__dict [value-field] host-object)]
@@ -85,7 +85,7 @@
[(lux-object value)
(#e.Success value)])
(#e.Success [(Long::intValue [] (:! Long tag))
- (: Top
+ (: Any
(case (python-type (:! PyObject flag))
"NoneType"
(host.null)
@@ -98,7 +98,7 @@
(ex.throw Not-A-Variant (Object::toString [] host-object))))
(def: (lux-object host-object)
- (-> PyObject (Error Top))
+ (-> PyObject (Error Any))
(case (python-type host-object)
"str"
(#e.Success (PyObject::asString [] host-object))
@@ -125,7 +125,7 @@
(ex.throw Unknown-Kind-Of-Host-Object (format type " " (Object::toString [] host-object)))))
(def: #export (eval code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(let [interpreter (|> compiler (get@ #.host) (:! //.Host) (get@ #//.interpreter))]
(case (interpreter code)
diff --git a/new-luxc/source/luxc/lang/translation/python/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/python/runtime.jvm.lux
index 8167537f5..282d7536e 100644
--- a/new-luxc/source/luxc/lang/translation/python/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/python/runtime.jvm.lux
@@ -426,7 +426,7 @@
(def: #export artifact Text (format prefix ".py"))
(def: #export translate
- (Meta (Process Top))
+ (Meta (Process Any))
(do macro.Monad
[_ //.init-module-buffer
_ (//.save runtime)]
diff --git a/new-luxc/source/luxc/lang/translation/python/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/python/statement.jvm.lux
index b267f5a64..23b51371c 100644
--- a/new-luxc/source/luxc/lang/translation/python/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/python/statement.jvm.lux
@@ -11,7 +11,7 @@
[".T" eval]))
(def: #export (translate-def name expressionT expressionO metaV)
- (-> Text Type Expression Code (Meta Top))
+ (-> Text Type Expression Code (Meta Any))
(do macro.Monad
[current-module macro.current-module-name
#let [def-ident [current-module name]]]
diff --git a/new-luxc/source/luxc/lang/translation/r.lux b/new-luxc/source/luxc/lang/translation/r.lux
index 410e167bc..0eba35760 100644
--- a/new-luxc/source/luxc/lang/translation/r.lux
+++ b/new-luxc/source/luxc/lang/translation/r.lux
@@ -56,7 +56,7 @@
(type: #export Host
{#context [Text Nat]
#anchor (Maybe Anchor)
- #loader (-> Expression (Error Top))
+ #loader (-> Expression (Error Any))
#interpreter (-> Expression (Error Object))
#module-buffer (Maybe StringBuilder)
#program-buffer StringBuilder})
@@ -82,12 +82,12 @@
(def: #export r-module-name Text "module.r")
(def: #export init-module-buffer
- (Meta Top)
+ (Meta Any)
(function (_ compiler)
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #module-buffer (#.Some (StringBuilder::new [])))
- (:! Bottom))
+ (:! Nothing))
compiler)
[]])))
@@ -98,13 +98,13 @@
[old-name old-sub] (get@ #context old)
new-name (format old-name "f___" (%i (nat-to-int old-sub)))]
(case (expr (set@ #.host
- (:! Bottom (set@ #context [new-name +0] old))
+ (:! Nothing (set@ #context [new-name +0] old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #context [old-name (n/inc old-sub)])
- (:! Bottom))
+ (:! Nothing))
compiler')
[new-name output]])
@@ -126,13 +126,13 @@
(function (_ compiler)
(let [old (:! Host (get@ #.host compiler))]
(case (expr (set@ #.host
- (:! Bottom (set@ #anchor (#.Some anchor) old))
+ (:! Nothing (set@ #anchor (#.Some anchor) old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #anchor (get@ #anchor old))
- (:! Bottom))
+ (:! Nothing))
compiler')
output])
@@ -176,7 +176,7 @@
(#e.Success output)
(#e.Success [compiler output])))))]
- [load! #loader Top]
+ [load! #loader Any]
[interpret #interpreter Object]
)
@@ -194,7 +194,7 @@
(lang.normalize-name (format module "$" name)))
(def: #export (save code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(do macro.Monad
[module-buffer module-buffer
#let [_ (Appendable::append [(:! CharSequence (r.expression code))]
@@ -204,7 +204,7 @@
(def: #export run interpret)
(def: #export (save-module! target)
- (-> File (Meta (Process Top)))
+ (-> File (Meta (Process Any)))
(do macro.Monad
[module macro.current-module-name
module-buffer module-buffer
diff --git a/new-luxc/source/luxc/lang/translation/r/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/r/eval.jvm.lux
index 05d16f871..66e157e40 100644
--- a/new-luxc/source/luxc/lang/translation/r/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/eval.jvm.lux
@@ -50,10 +50,10 @@
(host.import org/renjin/sexp/Null)
(def: (parse-tuple lux-object host-object)
- (-> (-> Object (Error Top)) ListVector (Error Top))
+ (-> (-> Object (Error Any)) ListVector (Error Any))
(let [size (:! Nat (ListVector::length [] host-object))]
(loop [idx +0
- output (:! (Array Top) (array.new size))]
+ output (:! (Array Any) (array.new size))]
(if (n/< size idx)
(case (ListVector::getElementAsSEXP [(:! Int idx)] host-object)
(#e.Error error)
@@ -65,11 +65,11 @@
(#e.Error error)
(#e.Success lux-value)
- (recur (n/inc idx) (array.write idx (:! Top lux-value) output))))
+ (recur (n/inc idx) (array.write idx (:! Any lux-value) output))))
(#e.Success output)))))
(def: (parse-variant lux-object host-object)
- (-> (-> Object (Error Top)) ListVector (Error Top))
+ (-> (-> Object (Error Any)) ListVector (Error Any))
(do e.Monad
[tag (ListVector::get-field-sexp [//.variant-tag-field] host-object)
flag (ListVector::get-field-sexp [//.variant-flag-field] host-object)
@@ -79,7 +79,7 @@
(:! IntArrayVector)
(IntArrayVector::getElementAsInt [0])
(Long::intValue []))
- (: Top
+ (: Any
(if (host.instance? Null flag)
(host.null)
//.unit))
@@ -100,7 +100,7 @@
low))))))
(def: (lux-object host-object)
- (-> Object (Error Top))
+ (-> Object (Error Any))
(cond (host.instance? StringArrayVector host-object)
(#e.Success (StringArrayVector::getElementAsString [0] (:! StringArrayVector host-object)))
@@ -132,7 +132,7 @@
(ex.throw Unknown-Kind-Of-Host-Object (format object-class " --- " text-representation)))))
(def: #export (eval code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(let [interpreter (|> compiler (get@ #.host) (:! //.Host) (get@ #//.interpreter))]
(case (interpreter code)
diff --git a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
index f13329e26..7cdc82064 100644
--- a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
@@ -882,7 +882,7 @@
(def: #export artifact Text (format prefix ".r"))
(def: #export translate
- (Meta (Process Top))
+ (Meta (Process Any))
(do macro.Monad
[_ //.init-module-buffer
_ (//.save runtime)]
diff --git a/new-luxc/source/luxc/lang/translation/r/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/r/statement.jvm.lux
index 7ff6a23e8..62349abcf 100644
--- a/new-luxc/source/luxc/lang/translation/r/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/statement.jvm.lux
@@ -11,7 +11,7 @@
[".T" eval]))
(def: #export (translate-def name expressionT expressionO metaV)
- (-> Text Type Expression Code (Meta Top))
+ (-> Text Type Expression Code (Meta Any))
(do macro.Monad
[current-module macro.current-module-name
#let [def-ident [current-module name]]]
diff --git a/new-luxc/source/luxc/lang/translation/ruby.lux b/new-luxc/source/luxc/lang/translation/ruby.lux
index 16b0813d5..c8cce4caf 100644
--- a/new-luxc/source/luxc/lang/translation/ruby.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby.lux
@@ -51,7 +51,7 @@
(type: #export Host
{#context [Text Nat]
#anchor (Maybe Anchor)
- #interpreter (-> Text (Error Top))
+ #interpreter (-> Text (Error Any))
#module-buffer (Maybe StringBuilder)
#program-buffer StringBuilder})
@@ -61,19 +61,19 @@
#anchor #.None
#interpreter (let [interpreter (ScriptingContainer::new [])]
(function (_ code)
- ("lux try" (io (: Top (maybe.default [] (ScriptingContainer::runScriptlet [code] interpreter)))))))
+ ("lux try" (io (: Any (maybe.default [] (ScriptingContainer::runScriptlet [code] interpreter)))))))
#module-buffer #.None
#program-buffer (StringBuilder::new [])}))
(def: #export ruby-module-name Text "module.rb")
(def: #export init-module-buffer
- (Meta Top)
+ (Meta Any)
(function (_ compiler)
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #module-buffer (#.Some (StringBuilder::new [])))
- (:! Bottom))
+ (:! Nothing))
compiler)
[]])))
@@ -84,13 +84,13 @@
[old-name old-sub] (get@ #context old)
new-name (format old-name "___" (%i (nat-to-int old-sub)))]
(case (expr (set@ #.host
- (:! Bottom (set@ #context [new-name +0] old))
+ (:! Nothing (set@ #context [new-name +0] old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #context [old-name (n/inc old-sub)])
- (:! Bottom))
+ (:! Nothing))
compiler')
[new-name output]])
@@ -112,13 +112,13 @@
(function (_ compiler)
(let [old (:! Host (get@ #.host compiler))]
(case (expr (set@ #.host
- (:! Bottom (set@ #anchor (#.Some anchor) old))
+ (:! Nothing (set@ #anchor (#.Some anchor) old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #anchor (get@ #anchor old))
- (:! Bottom))
+ (:! Nothing))
compiler')
output])
@@ -151,7 +151,7 @@
(#e.Success [compiler (|> compiler (get@ #.host) (:! Host) (get@ #program-buffer))])))
(def: (execute code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(let [interpreter (|> compiler (get@ #.host) (:! Host) (get@ #interpreter))]
(case (interpreter code)
@@ -172,7 +172,7 @@
(lang.normalize-name (format module "$" name)))
(def: #export (save code)
- (-> Ruby (Meta Top))
+ (-> Ruby (Meta Any))
(do macro.Monad
[module-buffer module-buffer
#let [_ (Appendable::append [(:! CharSequence code)]
@@ -180,7 +180,7 @@
(execute code)))
(def: #export (save-module! target)
- (-> File (Meta (Process Top)))
+ (-> File (Meta (Process Any)))
(do macro.Monad
[module macro.current-module-name
module-buffer module-buffer
diff --git a/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux
index 348e5bcf9..49bf7f1da 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux
@@ -36,10 +36,10 @@
(get [Object] #? Object))
(def: (tuple lux-object host-object)
- (-> (-> Object (Error Top)) RubyArray (Error Top))
+ (-> (-> Object (Error Any)) RubyArray (Error Any))
(let [size (:! Nat (RubyArray::getLength [] host-object))]
(loop [idx +0
- output (:! (Array Top) (array.new size))]
+ output (:! (Array Any) (array.new size))]
(if (n/< size idx)
(case (RubyArray::get [(:! Int idx)] host-object)
#.None
@@ -55,7 +55,7 @@
(#e.Success output)))))
(def: (variant lux-object host-object)
- (-> (-> Object (Error Top)) RubyHash (Error Top))
+ (-> (-> Object (Error Any)) RubyHash (Error Any))
(case [(RubyHash::get [(:! Object //.variant-tag-field)] host-object)
(RubyHash::get [(:! Object //.variant-flag-field)] host-object)
(RubyHash::get [(:! Object //.variant-value-field)] host-object)]
@@ -63,14 +63,14 @@
[(lux-object value)
(#.Some value)])
(#e.Success [(Long::intValue [] (:! Long tag))
- (: Top (case ?flag (#.Some _) "" #.None (host.null)))
+ (: Any (case ?flag (#.Some _) "" #.None (host.null)))
value])
_
(ex.throw Not-A-Variant "")))
(def: (lux-object host-object)
- (-> Object (Error Top))
+ (-> Object (Error Any))
(`` (cond (host.null? host-object)
(ex.throw Null-Has-No-Lux-Representation "")
@@ -100,7 +100,7 @@
)))
(def: #export (eval code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(let [interpreter (|> compiler (get@ #.host) (:! //.Host) (get@ #//.interpreter))]
(case (interpreter code)
diff --git a/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux
index e2bf83dfa..bb0549259 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux
@@ -271,7 +271,7 @@
(def: #export artifact Text (format prefix ".rb"))
(def: #export translate
- (Meta (Process Top))
+ (Meta (Process Any))
(do macro.Monad
[_ //.init-module-buffer
_ (//.save runtime)]
diff --git a/new-luxc/source/luxc/lang/translation/ruby/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/statement.jvm.lux
index 972a6428e..135a09039 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/statement.jvm.lux
@@ -11,7 +11,7 @@
[".T" eval]))
(def: #export (translate-def name expressionT expressionO metaV)
- (-> Text Type Expression Code (Meta Top))
+ (-> Text Type Expression Code (Meta Any))
(do macro.Monad
[current-module macro.current-module-name
#let [def-ident [current-module name]]]
diff --git a/new-luxc/source/luxc/lang/translation/scheme.lux b/new-luxc/source/luxc/lang/translation/scheme.lux
index 451d5f8e2..22cd7151e 100644
--- a/new-luxc/source/luxc/lang/translation/scheme.lux
+++ b/new-luxc/source/luxc/lang/translation/scheme.lux
@@ -55,7 +55,7 @@
(type: #export Host
{#context [Text Nat]
#anchor (Maybe Anchor)
- #loader (-> Expression (Error Top))
+ #loader (-> Expression (Error Any))
#interpreter (-> Expression (Error Object))
#module-buffer (Maybe StringBuilder)
#program-buffer StringBuilder})
@@ -82,12 +82,12 @@
(def: #export r-module-name Text (format "module" file-extension))
(def: #export init-module-buffer
- (Meta Top)
+ (Meta Any)
(function (_ compiler)
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #module-buffer (#.Some (StringBuilder::new [])))
- (:! Bottom))
+ (:! Nothing))
compiler)
[]])))
@@ -98,13 +98,13 @@
[old-name old-sub] (get@ #context old)
new-name (format old-name "f___" (%i (nat-to-int old-sub)))]
(case (expr (set@ #.host
- (:! Bottom (set@ #context [new-name +0] old))
+ (:! Nothing (set@ #context [new-name +0] old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #context [old-name (n/inc old-sub)])
- (:! Bottom))
+ (:! Nothing))
compiler')
[new-name output]])
@@ -126,13 +126,13 @@
(function (_ compiler)
(let [old (:! Host (get@ #.host compiler))]
(case (expr (set@ #.host
- (:! Bottom (set@ #anchor (#.Some anchor) old))
+ (:! Nothing (set@ #anchor (#.Some anchor) old))
compiler))
(#e.Success [compiler' output])
(#e.Success [(update@ #.host
(|>> (:! Host)
(set@ #anchor (get@ #anchor old))
- (:! Bottom))
+ (:! Nothing))
compiler')
output])
@@ -176,7 +176,7 @@
(#e.Success output)
(#e.Success [compiler output])))))]
- [load! #loader Top]
+ [load! #loader Any]
[interpret #interpreter Object]
)
@@ -189,7 +189,7 @@
(lang.normalize-name (format module "$" name)))
(def: #export (save code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(do macro.Monad
[module-buffer module-buffer
#let [_ (Appendable::append [(:! CharSequence (scheme.expression code))]
@@ -199,7 +199,7 @@
(def: #export run interpret)
(def: #export (save-module! target)
- (-> File (Meta (Process Top)))
+ (-> File (Meta (Process Any)))
(do macro.Monad
[module macro.current-module-name
module-buffer module-buffer
diff --git a/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux
index a45af1f00..056bf7599 100644
--- a/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux
@@ -59,36 +59,36 @@
(host.import gnu/mapping/SimpleSymbol)
(def: (parse-tuple lux-object host-object)
- (-> (-> Object (Error Top)) (FVector Object) (Error Top))
+ (-> (-> Object (Error Any)) (FVector Object) (Error Any))
(let [size (:! Nat (FVector::getBufferLength [] host-object))]
(loop [idx +0
- output (:! (Array Top) (array.new size))]
+ output (:! (Array Any) (array.new size))]
(if (n/< size idx)
(case (lux-object (FVector::get [(:! Int idx)] host-object))
(#e.Error error)
(#e.Error error)
(#e.Success lux-value)
- (recur (n/inc idx) (array.write idx (:! Top lux-value) output)))
+ (recur (n/inc idx) (array.write idx (:! Any lux-value) output)))
(#e.Success output)))))
(def: (variant tag flag value)
- (-> Nat Bool Top Top)
+ (-> Nat Bool Any Any)
[(Long::intValue [] (:! Long tag))
- (: Top
+ (: Any
(if flag
//.unit
(host.null)))
value])
(def: (to-text value)
- (-> Top Text)
+ (-> Any Text)
(let [value-text (:! Text (Object::toString [] (:! Object value)))
class-text (:! Text (Object::toString [] (Object::getClass [] (:! Object value))))]
(format value-text " : " class-text)))
(def: (parse-variant lux-object host-object)
- (-> (-> Object (Error Top)) Pair (Error Top))
+ (-> (-> Object (Error Any)) Pair (Error Any))
(let [variant-tag (Pair::getCar [] host-object)]
(if (and (host.instance? gnu/mapping/SimpleSymbol variant-tag)
(text/= //.variant-tag (Symbol::getName [] (:! Symbol variant-tag))))
@@ -103,7 +103,7 @@
(ex.throw invalid-variant (:! Text (Object::toString [] (:! Object host-object)))))))
(def: (lux-object host-object)
- (-> Object (Error Top))
+ (-> Object (Error Any))
(cond (or (host.instance? java/lang/Boolean host-object)
(host.instance? java/lang/String host-object))
(#e.Success host-object)
@@ -132,7 +132,7 @@
(ex.throw Unknown-Kind-Of-Host-Object (format object-class " --- " text-representation)))))
(def: #export (eval code)
- (-> Expression (Meta Top))
+ (-> Expression (Meta Any))
(function (_ compiler)
(let [interpreter (|> compiler (get@ #.host) (:! //.Host) (get@ #//.interpreter))]
(case (interpreter code)
diff --git a/new-luxc/source/luxc/lang/translation/scheme/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/scheme/runtime.jvm.lux
index 3bdfc614f..c3f149eeb 100644
--- a/new-luxc/source/luxc/lang/translation/scheme/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/scheme/runtime.jvm.lux
@@ -368,7 +368,7 @@
(def: #export artifact Text (format prefix //.file-extension))
(def: #export translate
- (Meta (Process Top))
+ (Meta (Process Any))
(do macro.Monad
[_ //.init-module-buffer
_ (//.save runtime)]
diff --git a/new-luxc/source/luxc/lang/translation/scheme/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/scheme/statement.jvm.lux
index 6fdb4073a..43e18cb85 100644
--- a/new-luxc/source/luxc/lang/translation/scheme/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/scheme/statement.jvm.lux
@@ -11,7 +11,7 @@
[".T" eval]))
(def: #export (translate-def name expressionT expressionO metaV)
- (-> Text Type Expression Code (Meta Top))
+ (-> Text Type Expression Code (Meta Any))
(do macro.Monad
[current-module macro.current-module-name
#let [def-ident [current-module name]]]
--
cgit v1.2.3