diff options
Diffstat (limited to 'stdlib/source')
-rw-r--r-- | stdlib/source/lux.lux | 24 | ||||
-rw-r--r-- | stdlib/source/lux/host.jvm.lux | 4 | ||||
-rw-r--r-- | stdlib/source/lux/macro.lux | 10 | ||||
-rw-r--r-- | stdlib/source/lux/macro/syntax.lux | 2 | ||||
-rw-r--r-- | stdlib/source/lux/macro/syntax/common/reader.lux | 4 | ||||
-rw-r--r-- | stdlib/source/lux/type/implicit.lux | 4 |
6 files changed, 24 insertions, 24 deletions
diff --git a/stdlib/source/lux.lux b/stdlib/source/lux.lux index 6270d0b47..9537f6a9b 100644 --- a/stdlib/source/lux.lux +++ b/stdlib/source/lux.lux @@ -676,7 +676,7 @@ (text$ "Information about the current version and type of compiler that is running.")] default-def-meta-exported)))) -## (type: Compiler +## (type: Lux ## {#info Info ## #source Source ## #cursor Cursor @@ -689,8 +689,8 @@ ## #scope-type-vars (List Nat) ## #extensions Bottom ## #host Bottom}) -("lux def" Compiler - (#Named ["lux" "Compiler"] +("lux def" Lux + (#Named ["lux" "Lux"] (#Product ## "lux.info" Info (#Product ## "lux.source" @@ -738,12 +738,12 @@ default-def-meta-exported)))) ## (type: (Meta a) -## (-> Compiler (Either Text [Compiler a]))) +## (-> Lux (Either Text [Lux a]))) ("lux def" Meta (#Named ["lux" "Meta"] (#UnivQ #Nil - (#Function Compiler - (#Apply (#Product Compiler (#Bound +1)) + (#Function Lux + (#Apply (#Product Lux (#Bound +1)) (#Apply Text Either))))) (record$ (#Cons [(tag$ ["lux" "doc"]) (text$ "Computations that can have access to the state of the compiler. @@ -766,8 +766,8 @@ ("lux def" return ("lux check" (#UnivQ #Nil (#Function (#Bound +1) - (#Function Compiler - (#Apply (#Product Compiler + (#Function Lux + (#Apply (#Product Lux (#Bound +1)) (#Apply Text Either))))) ("lux function" _ val @@ -778,8 +778,8 @@ ("lux def" fail ("lux check" (#UnivQ #Nil (#Function Text - (#Function Compiler - (#Apply (#Product Compiler + (#Function Lux + (#Apply (#Product Lux (#Bound +1)) (#Apply Text Either))))) ("lux function" _ msg @@ -4436,7 +4436,7 @@ (#Some y) (#Some y))) (def: (find-in-env name state) - (-> Text Compiler (Maybe Type)) + (-> Text Lux (Maybe Type)) (case state {#info info #source source #current-module _ #modules modules #scopes scopes #type-context types #host host @@ -4459,7 +4459,7 @@ scopes))) (def: (find-def-type name state) - (-> Ident Compiler (Maybe Type)) + (-> Ident Lux (Maybe Type)) (let [[v-prefix v-name] name {#info info #source source #current-module _ #modules modules #scopes scopes #type-context types #host host diff --git a/stdlib/source/lux/host.jvm.lux b/stdlib/source/lux/host.jvm.lux index 2315ffd2c..1f920c0b1 100644 --- a/stdlib/source/lux/host.jvm.lux +++ b/stdlib/source/lux/host.jvm.lux @@ -358,7 +358,7 @@ (#.Cons short+full imports)) (def: (class-imports compiler) - (-> Compiler Class-Imports) + (-> Lux Class-Imports) (case (macro.run compiler (: (Meta Class-Imports) (do Monad<Meta> @@ -2055,7 +2055,7 @@ (wrap (list (` ("jvm object class" (~ (code.text (simple-class$ (list) type)))))))) (def: get-compiler - (Meta Compiler) + (Meta Lux) (function (_ compiler) (#.Right [compiler compiler]))) diff --git a/stdlib/source/lux/macro.lux b/stdlib/source/lux/macro.lux index 9b2b5fac8..1328fc034 100644 --- a/stdlib/source/lux/macro.lux +++ b/stdlib/source/lux/macro.lux @@ -14,7 +14,7 @@ (/ [code])) ## (type: (Meta a) -## (-> Compiler (e.Error [Compiler a]))) +## (-> Lux (e.Error [Lux a]))) (struct: #export _ (Functor Meta) (def: (map f fa) @@ -72,11 +72,11 @@ (get k plist')))) (def: #export (run' compiler action) - (All [a] (-> Compiler (Meta a) (e.Error [Compiler a]))) + (All [a] (-> Lux (Meta a) (e.Error [Lux a]))) (action compiler)) (def: #export (run compiler action) - (All [a] (-> Compiler (Meta a) (e.Error a))) + (All [a] (-> Lux (Meta a) (e.Error a))) (case (action compiler) (#e.Error error) (#e.Error error) @@ -531,7 +531,7 @@ (find-def-type name)))) (def: #export (find-type-def name) - {#.doc "Finds the value of a type definition (such as Int, Top or Compiler)."} + {#.doc "Finds the value of a type definition (such as Int, Top or Lux)."} (-> Ident (Meta Type)) (do Monad<Meta> [[def-type def-data def-value] (find-def name)] @@ -660,7 +660,7 @@ (def: #export get-compiler {#.doc "Obtains the current state of the compiler."} - (Meta Compiler) + (Meta Lux) (function (_ compiler) (#e.Success [compiler compiler]))) diff --git a/stdlib/source/lux/macro/syntax.lux b/stdlib/source/lux/macro/syntax.lux index 807e3a2b7..0907d3d81 100644 --- a/stdlib/source/lux/macro/syntax.lux +++ b/stdlib/source/lux/macro/syntax.lux @@ -159,7 +159,7 @@ (def: #export (on compiler action) {#.doc "Run a Lux operation as if it was a Syntax parser."} - (All [a] (-> Compiler (Meta a) (Syntax a))) + (All [a] (-> Lux (Meta a) (Syntax a))) (function (_ input) (case (macro.run compiler action) (#e.Error error) diff --git a/stdlib/source/lux/macro/syntax/common/reader.lux b/stdlib/source/lux/macro/syntax/common/reader.lux index 360abd685..49ef3851d 100644 --- a/stdlib/source/lux/macro/syntax/common/reader.lux +++ b/stdlib/source/lux/macro/syntax/common/reader.lux @@ -101,7 +101,7 @@ (def: #export (definition compiler) {#.doc "A reader that first macro-expands and then analyses the input Code, to ensure it's a definition."} - (-> Compiler (Syntax //.Definition)) + (-> Lux (Syntax //.Definition)) (do p.Monad<Parser> [definition-raw s.any me-definition-raw (s.on compiler @@ -123,7 +123,7 @@ (def: #export (typed-definition compiler) {#.doc "A reader for definitions that ensures the input syntax is typed."} - (-> Compiler (Syntax //.Definition)) + (-> Lux (Syntax //.Definition)) (do p.Monad<Parser> [_definition (definition compiler) _ (case (get@ #//.definition-type _definition) diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/lux/type/implicit.lux index 40ccde862..0decd9dba 100644 --- a/stdlib/source/lux/type/implicit.lux +++ b/stdlib/source/lux/type/implicit.lux @@ -196,7 +196,7 @@ #dependencies (List Instance)}) (def: (test-provision provision context dep alts) - (-> (-> Compiler Type-Context Type (Check Instance)) + (-> (-> Lux Type-Context Type (Check Instance)) Type-Context Type (List [Ident Type]) (Meta (List Instance))) (do Monad<Meta> @@ -224,7 +224,7 @@ (wrap found)))) (def: (provision compiler context dep) - (-> Compiler Type-Context Type (Check Instance)) + (-> Lux Type-Context Type (Check Instance)) (case (macro.run compiler ($_ macro.either (do Monad<Meta> [alts local-env] (test-provision provision context dep alts)) |