From 8f575da5095e3b259d4eb6b6f13d3e37ef1d38e4 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Fri, 11 Jun 2021 02:48:13 -0400 Subject: Added import name formatting to "import:" macros for other backends. --- stdlib/source/program/aedifex/artifact/time/time.lux | 5 ++++- stdlib/source/program/aedifex/command/deploy.lux | 5 +++-- stdlib/source/program/aedifex/command/install.lux | 5 +++-- stdlib/source/program/aedifex/command/pom.lux | 5 +++-- stdlib/source/program/aedifex/dependency/deployment.lux | 5 +++-- stdlib/source/program/aedifex/dependency/resolution.lux | 7 ++++--- stdlib/source/program/aedifex/input.lux | 5 +++-- stdlib/source/program/aedifex/metadata/artifact.lux | 7 ++++--- stdlib/source/program/aedifex/metadata/snapshot.lux | 7 ++++--- stdlib/source/program/aedifex/package.lux | 5 +++-- stdlib/source/program/aedifex/repository/identity.lux | 5 +++-- 11 files changed, 37 insertions(+), 24 deletions(-) (limited to 'stdlib/source/program/aedifex') diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux index d14f0a435..5c074c20b 100644 --- a/stdlib/source/program/aedifex/artifact/time/time.lux +++ b/stdlib/source/program/aedifex/artifact/time/time.lux @@ -1,6 +1,6 @@ (.module: [lux #* - ["." time (#+ Time)] + ["." time] [abstract [monad (#+ do)]] [control @@ -15,6 +15,9 @@ ["." // #_ ["#" date]]) +(type: #export Time + time.Time) + (def: #export (format value) (%.Format Time) (let [(^slots [#time.hour #time.minute #time.second]) (time.clock value)] diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux index 758f87ab9..6546045a4 100644 --- a/stdlib/source/program/aedifex/command/deploy.lux +++ b/stdlib/source/program/aedifex/command/deploy.lux @@ -13,7 +13,8 @@ [binary (#+ Binary)] [text ["%" format (#+ format)] - ["." encoding]] + [encoding + ["." utf8]]] [collection ["." set]] [format @@ -65,7 +66,7 @@ [artifact ///artifact/type.lux_library] (let [pom_data (|> pom (\ xml.codec encode) - (\ encoding.utf8 encode))] + (\ utf8.codec encode))] {#///package.origin (#///repository/origin.Remote "") #///package.library [library (///dependency/status.verified library)] diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux index 35ffcf72f..375e803ce 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -13,7 +13,8 @@ [binary (#+ Binary)] [text ["%" format (#+ format)] - ["." encoding]] + [encoding + ["." utf8]]] [collection ["." set]] [format @@ -58,7 +59,7 @@ [identity ///artifact/type.lux_library] (let [pom_data (|> pom (\ xml.codec encode) - (\ encoding.utf8 encode))] + (\ utf8.codec encode))] {#///package.origin (#///origin.Local "") #///package.library (let [library (binary.run tar.writer package)] [library (///dependency/status.verified library)]) diff --git a/stdlib/source/program/aedifex/command/pom.lux b/stdlib/source/program/aedifex/command/pom.lux index 390d7d7d2..7ca26c311 100644 --- a/stdlib/source/program/aedifex/command/pom.lux +++ b/stdlib/source/program/aedifex/command/pom.lux @@ -11,7 +11,8 @@ [data ["." text ["%" format (#+ format)] - ["." encoding]] + [encoding + ["." utf8]]] [format ["." xml]]] [world @@ -32,7 +33,7 @@ (file.get_file promise.monad fs ///pom.file)) outcome (|> pom (\ xml.codec encode) - (\ encoding.utf8 encode) + (\ utf8.codec encode) (!.use (\ file over_write))) _ (console.write_line //clean.success console)] (wrap ///pom.file))) diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 04b82d7e2..963602494 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -14,7 +14,8 @@ ["." product] [text ["%" format (#+ format)] - ["." encoding]] + [encoding + ["." utf8]]] [collection ["." dictionary] ["." set (#+ Set)] @@ -54,7 +55,7 @@ (function (_ codec extension hash) (|> hash (\ codec encode) - (\ encoding.utf8 encode) + (\ utf8.codec encode) (\ repository upload (format artifact extension)))))] (do {! (try.with promise.monad)} [_ (\ repository upload artifact data)] diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 1d72f0937..89ad6368f 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -19,7 +19,8 @@ ["." maybe] ["." text ["%" format (#+ format)] - ["." encoding]] + [encoding + ["." utf8]]] [format ["." xml (#+ Tag XML)]] [collection @@ -81,7 +82,7 @@ [output (\ ! map (|>> (:coerce java/lang/String) java/lang/String::trim (:coerce Text)) - (\ encoding.utf8 decode actual)) + (\ utf8.codec decode actual)) actual (|> output (text.split_all_with " ") list.head @@ -131,7 +132,7 @@ library_&_status (..hashed repository version_template artifact extension)] (\ promise.monad wrap (do try.monad - [pom (\ encoding.utf8 decode pom_data) + [pom (\ utf8.codec decode pom_data) pom (\ xml.codec decode pom) profile (.run ///pom.parser (list pom))] (wrap {#///package.origin (#///repository/origin.Remote "") diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux index 11e648697..b00829469 100644 --- a/stdlib/source/program/aedifex/input.lux +++ b/stdlib/source/program/aedifex/input.lux @@ -12,7 +12,8 @@ [data [binary (#+ Binary)] ["." text - ["." encoding]]] + [encoding + ["." utf8]]]] [meta ["." location]] [tool @@ -43,7 +44,7 @@ (def: parse_project (-> Binary (Try Project)) (|>> (do> try.monad - [(\ encoding.utf8 decode)] + [(\ utf8.codec decode)] [..parse_lux] [(list) (.run //parser.project)]))) diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index 811713427..9210534cc 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -15,7 +15,8 @@ ["." product] ["." text ["%" format] - ["." encoding]] + [encoding + ["." utf8]]] [format ["." xml (#+ XML)]] [collection @@ -187,7 +188,7 @@ (#try.Success project) (wrap (|> project (do> try.monad - [(\ encoding.utf8 decode)] + [(\ utf8.codec decode)] [(\ xml.codec decode)] [list (.run ..parser)]))) @@ -204,5 +205,5 @@ (|> metadata ..format (\ xml.codec encode) - (\ encoding.utf8 encode) + (\ utf8.codec encode) (\ repository upload (..uri artifact)))) diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux index fa1bcb750..f6878a023 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -16,7 +16,8 @@ ["." product] ["." text ["%" format] - ["." encoding]] + [encoding + ["." utf8]]] [format ["." xml (#+ XML)]] [collection @@ -133,7 +134,7 @@ (#try.Success project) (wrap (|> project (do> try.monad - [(\ encoding.utf8 decode)] + [(\ utf8.codec decode)] [(\ xml.codec decode)] [list (.run ..parser)]))) @@ -147,5 +148,5 @@ (|> metadata ..format (\ xml.codec encode) - (\ encoding.utf8 encode) + (\ utf8.codec encode) (\ repository upload (..uri artifact)))) diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index 445c92987..f871954c3 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -11,7 +11,8 @@ ["." product] ["." binary (#+ Binary)] [text - ["." encoding]] + [encoding + ["." utf8]]] [format ["." xml (#+ XML)]] [collection @@ -50,7 +51,7 @@ {#origin (#//origin.Local "") #library [library #//status.Unverified] #pom [pom - (|> pom (\ xml.codec encode) (\ encoding.utf8 encode)) + (|> pom (\ xml.codec encode) (\ utf8.codec encode)) #//status.Unverified]}) (def: #export dependencies diff --git a/stdlib/source/program/aedifex/repository/identity.lux b/stdlib/source/program/aedifex/repository/identity.lux index 7ec3cceec..ef7b0c934 100644 --- a/stdlib/source/program/aedifex/repository/identity.lux +++ b/stdlib/source/program/aedifex/repository/identity.lux @@ -7,7 +7,8 @@ ["." product] ["." text ["%" format (#+ format)] - ["." encoding]]]]) + [encoding + ["." utf8]]]]]) (type: #export User Text) @@ -36,7 +37,7 @@ (def: #export (basic_auth user password) (-> User Password Text) - (let [credentials (\ encoding.utf8 encode (format user ":" password))] + (let [credentials (\ utf8.codec encode (format user ":" password))] (|> (java/util/Base64::getEncoder) (java/util/Base64$Encoder::encodeToString credentials) (format "Basic ")))) -- cgit v1.2.3