From f7772ee6c7c99912b3ea2b0c98eefff0d1489841 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 21 Jul 2018 00:10:39 -0400 Subject: Re-named "Binary" type to "Format". --- stdlib/source/lux/data/format/binary.lux | 46 +++++++++++----------- .../source/lux/language/compiler/default/cache.lux | 8 ++-- stdlib/source/lux/language/compiler/meta/cache.lux | 14 +++---- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/stdlib/source/lux/data/format/binary.lux b/stdlib/source/lux/data/format/binary.lux index c3724c703..592aba473 100644 --- a/stdlib/source/lux/data/format/binary.lux +++ b/stdlib/source/lux/data/format/binary.lux @@ -6,7 +6,7 @@ ["ex" exception (#+ exception:)] [equivalence (#+ Equivalence)]] [data - ["." error] + ["." error (#+ Error)] ["." number] [text ["." encoding] @@ -39,13 +39,13 @@ (type: #export (Write a) (-> a [Size (-> Offset Blob Blob)])) -(type: #export (Binary a) +(type: #export (Format a) {#read (Read a) #write (Write a)}) ## Operators (def: #export (read format input) - (All [a] (-> (Binary a) Blob (error.Error a))) + (All [a] (-> (Format a) Blob (Error a))) (case ((get@ #read format) [+0 input]) (#error.Error msg) (#error.Error msg) @@ -57,14 +57,14 @@ (ex.throw blob-was-not-fully-read [length end]))))) (def: #export (write format value) - (All [a] (-> (Binary a) a Blob)) + (All [a] (-> (Format a) a Blob)) (let [[valueS valueT] ((get@ #write format) value)] (|> valueS blob.create (valueT +0)))) ## Primitives (do-template [ ] [(def: - (Binary (I64 Any)) + (Format (I64 Any)) {#read (function (_ [offset blob]) (case ( offset blob) (#error.Success data) @@ -87,7 +87,7 @@ ## Combinators (def: #export (alt leftB rightB) - (All [l r] (-> (Binary l) (Binary r) (Binary (| l r)))) + (All [l r] (-> (Format l) (Format r) (Format (| l r)))) {#read (do p.Monad [flag (get@ #read bits/8)] (case flag @@ -116,7 +116,7 @@ ))}) (def: #export (seq preB postB) - (All [a b] (-> (Binary a) (Binary b) (Binary [a b]))) + (All [a b] (-> (Format a) (Format b) (Format [a b]))) {#read (p.seq (get@ #read preB) (get@ #read postB)) #write (function (_ [preV postV]) (let [[preS preT] ((get@ #write preB) preV) @@ -127,7 +127,7 @@ (postT (n/+ preS offset))))]))}) (def: #export (rec body) - (All [a] (-> (-> (Binary a) (Binary a)) (Binary a))) + (All [a] (-> (-> (Format a) (Format a)) (Format a))) {#read (function (_ input) (let [read (get@ #read (body (rec body)))] (read input))) @@ -137,7 +137,7 @@ ## Utilities (def: #export (ignore default) - (All [a] (-> a (Binary a))) + (All [a] (-> a (Format a))) {#read (function (_ input) (#error.Success [input default])) #write (function (_ value) @@ -146,11 +146,11 @@ blob)])}) (def: #export any - (Binary Any) + (Format Any) (ignore [])) (def: #export bit - (Binary Bit) + (Format Bit) {#read (function (_ [offset blob]) (case (blob.read/8 offset blob) (#error.Success data) @@ -172,18 +172,18 @@ (blob.write/8 offset (if value +1 +0)) error.assume))])}) -(def: #export nat (Binary Nat) (:assume ..bits/64)) -(def: #export int (Binary Int) (:assume ..bits/64)) -(def: #export rev (Binary Rev) (:assume ..bits/64)) +(def: #export nat (Format Nat) (:assume ..bits/64)) +(def: #export int (Format Int) (:assume ..bits/64)) +(def: #export rev (Format Rev) (:assume ..bits/64)) (def: #export frac - (Binary Frac) + (Format Frac) (let [(^slots [#read #write]) ..bits/64] {#read (:: p.Monad map number.bits-to-frac read) #write (|>> number.frac-to-bits write)})) (def: #export blob - (Binary Blob) + (Format Blob) {#read (do p.Monad [size (get@ #read nat)] (function (_ [offset blob]) @@ -201,7 +201,7 @@ (blob.copy size +0 value (n/+ size/64 offset) blob))))]))}) (def: #export text - (Binary Text) + (Format Text) (let [(^slots [#read #write]) ..blob] {#read (do p.Monad [utf8 read] @@ -209,22 +209,22 @@ #write (|>> encoding.to-utf8 write)})) (def: #export maybe - (All [a] (-> (Binary a) (Binary (Maybe a)))) + (All [a] (-> (Format a) (Format (Maybe a)))) (..alt ..any)) (def: #export (list value) - (All [a] (-> (Binary a) (Binary (List a)))) + (All [a] (-> (Format a) (Format (List a)))) (..rec (function (_ recur) (..alt ..any (..seq value recur))))) (def: #export ident - (Binary Ident) + (Format Ident) (..seq ..text ..text)) (def: #export type - (Binary Type) + (Format Type) (..rec (function (_ type) (let [pair (..seq type type) @@ -256,11 +256,11 @@ ))))) (def: #export cursor - (Binary Cursor) + (Format Cursor) ($_ ..seq ..text ..nat ..nat)) (def: #export code - (Binary Code) + (Format Code) (..rec (function (_ code) (let [sequence (..list code) diff --git a/stdlib/source/lux/language/compiler/default/cache.lux b/stdlib/source/lux/language/compiler/default/cache.lux index f82469cd7..d8f841e13 100644 --- a/stdlib/source/lux/language/compiler/default/cache.lux +++ b/stdlib/source/lux/language/compiler/default/cache.lux @@ -2,20 +2,20 @@ [lux #* [data [format - ["_" binary (#+ Binary)]]]]) + ["_" binary (#+ Format)]]]]) (def: definition - (Binary Definition) + (Format Definition) ($_ _.seq _.type _.code _.any)) (def: alias - (Binary [Text Text]) + (Format [Text Text]) (_.seq _.text _.text)) ## TODO: Remove #module-hash, #imports & #module-state ASAP. ## TODO: Not just from this parser, but from the lux.Module type. (def: #export module - (Binary Module) + (Format Module) ($_ _.seq ## #module-hash (_.ignore +0) diff --git a/stdlib/source/lux/language/compiler/meta/cache.lux b/stdlib/source/lux/language/compiler/meta/cache.lux index bacd339a9..eb702c0da 100644 --- a/stdlib/source/lux/language/compiler/meta/cache.lux +++ b/stdlib/source/lux/language/compiler/meta/cache.lux @@ -10,9 +10,9 @@ ["." error] ["." product] [format - ["." binary (#+ Binary)]] + ["." binary (#+ Format)]] ["." text - format] + [format (#- Format)]] [collection ["." list ("list/." Functor Fold)] ["dict" dictionary (#+ Dictionary)] @@ -98,19 +98,19 @@ ## Load (def: signature - (Binary Signature) + (Format Signature) ($_ binary.seq binary.ident binary.text)) (def: descriptor - (Binary Descriptor) + (Format Descriptor) ($_ binary.seq binary.nat binary.text (binary.list binary.text) (binary.ignore #.Cached))) (def: document - (All [a] (-> (Binary a) (Binary [Signature Descriptor a]))) + (All [a] (-> (Format a) (Format [Signature Descriptor a]))) (|>> ($_ binary.seq ..signature ..descriptor))) (def: (load-document System contexts root key binary module) - (All [m d] (-> (System m) (List File) File (Key d) (Binary d) Module + (All [m d] (-> (System m) (List File) File (Key d) (Format d) Module (m (Maybe [Dependency (Document d)])))) (do (:: System &monad) [document' (:: System read (//io/archive.document System root module)) @@ -132,7 +132,7 @@ (wrap #.None))))) (def: #export (load-archive System contexts root key binary) - (All [m d] (-> (System m) (List Context) File (Key d) (Binary d) (m Archive))) + (All [m d] (-> (System m) (List Context) File (Key d) (Format d) (m Archive))) (do (:: System &monad) [candidate (|> root (do> @ -- cgit v1.2.3