From fb46beb8bd784ba92949bf2c535dc13c2f003ef0 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 25 Jun 2022 20:24:43 -0400 Subject: De-sigil-ification: suffix : [Part 15] --- stdlib/source/program/aedifex/action.lux | 2 +- stdlib/source/program/aedifex/artifact.lux | 8 ++++---- .../source/program/aedifex/artifact/extension.lux | 2 +- .../source/program/aedifex/artifact/snapshot.lux | 2 +- .../program/aedifex/artifact/snapshot/build.lux | 2 +- .../program/aedifex/artifact/snapshot/stamp.lux | 2 +- .../program/aedifex/artifact/snapshot/time.lux | 2 +- .../program/aedifex/artifact/snapshot/version.lux | 2 +- .../aedifex/artifact/snapshot/version/value.lux | 2 +- stdlib/source/program/aedifex/artifact/time.lux | 2 +- .../source/program/aedifex/artifact/time/time.lux | 2 +- stdlib/source/program/aedifex/artifact/type.lux | 2 +- .../source/program/aedifex/artifact/versioning.lux | 2 +- stdlib/source/program/aedifex/cli.lux | 4 ++-- stdlib/source/program/aedifex/command.lux | 2 +- stdlib/source/program/aedifex/command/build.lux | 4 ++-- stdlib/source/program/aedifex/dependency.lux | 2 +- .../program/aedifex/dependency/resolution.lux | 2 +- .../source/program/aedifex/dependency/status.lux | 2 +- stdlib/source/program/aedifex/format.lux | 4 ++-- .../source/program/aedifex/metadata/artifact.lux | 2 +- .../source/program/aedifex/metadata/snapshot.lux | 2 +- stdlib/source/program/aedifex/package.lux | 2 +- stdlib/source/program/aedifex/parser.lux | 2 +- stdlib/source/program/aedifex/profile.lux | 24 +++++++++++----------- stdlib/source/program/aedifex/project.lux | 2 +- stdlib/source/program/aedifex/repository.lux | 4 ++-- .../source/program/aedifex/repository/identity.lux | 6 +++--- .../source/program/aedifex/repository/origin.lux | 2 +- .../source/program/aedifex/repository/remote.lux | 2 +- stdlib/source/program/aedifex/runtime.lux | 2 +- 31 files changed, 51 insertions(+), 51 deletions(-) (limited to 'stdlib/source/program') diff --git a/stdlib/source/program/aedifex/action.lux b/stdlib/source/program/aedifex/action.lux index d1f388cca..cd0ef7459 100644 --- a/stdlib/source/program/aedifex/action.lux +++ b/stdlib/source/program/aedifex/action.lux @@ -8,7 +8,7 @@ [concurrency ["[0]" async (.only Async)]]]]]) -(type: .public (Action a) +(type .public (Action a) (Async (Try a))) (def .public monad diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux index 3b57b0734..92c8629bc 100644 --- a/stdlib/source/program/aedifex/artifact.lux +++ b/stdlib/source/program/aedifex/artifact.lux @@ -16,16 +16,16 @@ [net ["[0]" uri (.only URI)]]]]]) -(type: .public Group +(type .public Group Text) -(type: .public Name +(type .public Name Text) -(type: .public Version +(type .public Version Text) -(type: .public Artifact +(type .public Artifact (Record [#group Group #name Name diff --git a/stdlib/source/program/aedifex/artifact/extension.lux b/stdlib/source/program/aedifex/artifact/extension.lux index e4e8e8a71..08fb2d4b7 100644 --- a/stdlib/source/program/aedifex/artifact/extension.lux +++ b/stdlib/source/program/aedifex/artifact/extension.lux @@ -9,7 +9,7 @@ ["[0]" // ["[1]" type]]) -(type: .public Extension +(.type .public Extension Text) (def separator diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux index 23eb701e8..6b6e97124 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot.lux @@ -16,7 +16,7 @@ ["[0]" / ["[1][0]" stamp (.only Stamp)]]) -(type: .public Snapshot +(type .public Snapshot (Variant {#Local} {#Remote Stamp})) diff --git a/stdlib/source/program/aedifex/artifact/snapshot/build.lux b/stdlib/source/program/aedifex/artifact/snapshot/build.lux index 0ff1d45d9..2cd339f9b 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/build.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/build.lux @@ -17,7 +17,7 @@ [number ["[0]" nat]]]]]) -(type: .public Build +(type .public Build Nat) (def .public equivalence diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux index 7ebb79ac6..6fbeb5b07 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux @@ -17,7 +17,7 @@ ["[1][0]" time (.only Time)] ["[1][0]" build (.only Build)]]) -(type: .public Stamp +(type .public Stamp (Record [#time Time #build Build])) diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux index 87d9c89c7..b039dd2e2 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux @@ -21,7 +21,7 @@ ["[1]/[0]" date] ["[1]/[0]" time]]]) -(type: .public Time +(type .public Time ///time.Time) (def .public equivalence diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux index fdd97a517..3ab65cab4 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux @@ -17,7 +17,7 @@ ["[1][0]" type (.only Type)] ["[1][0]" time (.only Time)]]) -(type: .public Version +(type .public Version (Record [#extension Type #value Text diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux index 0dd217a27..534283b7f 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux @@ -11,7 +11,7 @@ ["[1][0]" time] ["[1][0]" stamp]]) -(type: .public Value +(type .public Value (Record [#version Text #snapshot Snapshot])) diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux index b4cf0dc02..61b2e8667 100644 --- a/stdlib/source/program/aedifex/artifact/time.lux +++ b/stdlib/source/program/aedifex/artifact/time.lux @@ -19,7 +19,7 @@ ["[1][0]" date] ["[1][0]" time]]) -(type: .public Time +(type .public Time [/date.Date /time.Time]) (def .public epoch diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux index 5349a295f..01e2c85cb 100644 --- a/stdlib/source/program/aedifex/artifact/time/time.lux +++ b/stdlib/source/program/aedifex/artifact/time/time.lux @@ -16,7 +16,7 @@ ["[0]" // ["[1]" date]]) -(type: .public Time +(type .public Time time.Time) (def .public (format value) diff --git a/stdlib/source/program/aedifex/artifact/type.lux b/stdlib/source/program/aedifex/artifact/type.lux index cba533fdd..3fad47295 100644 --- a/stdlib/source/program/aedifex/artifact/type.lux +++ b/stdlib/source/program/aedifex/artifact/type.lux @@ -3,7 +3,7 @@ [lux (.except Type)]]) ... https://maven.apache.org/ref/3.6.3/maven-core/artifact-handlers.html -(type: .public Type +(type .public Type Text) (with_template [ ] diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux index e85833e70..82dffcd61 100644 --- a/stdlib/source/program/aedifex/artifact/versioning.lux +++ b/stdlib/source/program/aedifex/artifact/versioning.lux @@ -29,7 +29,7 @@ ["[1][0]" snapshot (.only Snapshot) ["[1]/[0]" version (.only Version)]]]) -(type: .public Versioning +(type .public Versioning (Record [#snapshot Snapshot #last_updated //time.Time diff --git a/stdlib/source/program/aedifex/cli.lux b/stdlib/source/program/aedifex/cli.lux index 8f7185db5..26a1fd325 100644 --- a/stdlib/source/program/aedifex/cli.lux +++ b/stdlib/source/program/aedifex/cli.lux @@ -16,7 +16,7 @@ [identity (.only Identity)]] ["/" profile (.only Name)]]) -(type: .public Compilation +(type .public Compilation (Variant {#Build} {#Test})) @@ -37,7 +37,7 @@ (<>.or (cli.this "build") (cli.this "test"))) -(type: .public Command +(type .public Command (Variant {#Version} {#Clean} diff --git a/stdlib/source/program/aedifex/command.lux b/stdlib/source/program/aedifex/command.lux index fc287b4f1..a48bd31a3 100644 --- a/stdlib/source/program/aedifex/command.lux +++ b/stdlib/source/program/aedifex/command.lux @@ -5,5 +5,5 @@ ["[1]" profile] ["[1][0]" action (.only Action)]]) -(type: .public (Command a) +(type .public (Command a) (-> //.Profile (Action a))) diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 83be613e3..2f1931c0e 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -53,7 +53,7 @@ ["[1][0]" artifact (.only Group Name Version Artifact) ["[1]/[0]" type]]]) -(type: Finder +(type Finder (-> Resolution (Maybe Dependency))) (def (dependency_finder group name) @@ -84,7 +84,7 @@ (exception: .public no_available_lux) (exception: .public no_specified_program) -(type: .public Lux +(type .public Lux (Variant {#JVM Dependency} {#JS Dependency} diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index b5d251167..a83073467 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -13,7 +13,7 @@ ["[1]" artifact (.only Artifact) (.use "[1]#[0]" order) [type (.only Type)]]]) -(type: .public Dependency +(type .public Dependency (Record [#artifact Artifact #type Type])) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 7145a1ffe..d8c46d98c 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -143,7 +143,7 @@ ///package.#library library_&_status ///package.#pom [pom pom_data pom_status]])))))) -(type: .public Resolution +(type .public Resolution (Dictionary Dependency Package)) (def .public empty diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux index f3355b418..2ce288eec 100644 --- a/stdlib/source/program/aedifex/dependency/status.lux +++ b/stdlib/source/program/aedifex/dependency/status.lux @@ -10,7 +10,7 @@ ["[0]" /// ["[1][0]" hash (.only Hash SHA-1 MD5)]]) -(type: .public Status +(type .public Status (Variant {#Unverified} {#Partial (Either (Hash SHA-1) diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux index ac1cf8916..7be3a1752 100644 --- a/stdlib/source/program/aedifex/format.lux +++ b/stdlib/source/program/aedifex/format.lux @@ -23,7 +23,7 @@ ["[1][0]" artifact (.only Artifact) ["[1]/[0]" type]]]) -(type: .public (Format a) +(type .public (Format a) (-> a Code)) (def (license [name url type]) @@ -58,7 +58,7 @@ (Format /.Contributor) ..developer) -(type: Aggregate +(type Aggregate (Dictionary Text Code)) (def aggregate diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index ddc9e3200..a8840bab7 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -38,7 +38,7 @@ [repository (.only Repository)] ["[1][0]" artifact (.only Group Name Version Artifact)]]]) -(type: .public Metadata +(type .public Metadata (Record [#group Group #name Name diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux index b5cbeb2a7..8898385f7 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -45,7 +45,7 @@ ["[1]/[0]" version] ["[1]/[0]" stamp]]]]]) -(type: .public Metadata +(type .public Metadata (Record [#artifact Artifact #versioning Versioning])) diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index 6484c5e3e..cf4aa1e49 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -27,7 +27,7 @@ [remote (.only Address)] ["[1][0]" origin (.only Origin)]]]) -(type: .public Package +(type .public Package (Record [#origin Origin #library [Binary Status] diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index 6bedce20b..18a682362 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except Module type) + [lux (.except Module) [abstract [monad (.only do)]] [control diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index 5e07a1c18..3017defcd 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -44,7 +44,7 @@ [dependency.#artifact ["com.github.luxlang" "lux-jvm" "0.6.5"] dependency.#type type.jvm_library]) -(type: .public Distribution +(type .public Distribution (Variant {#Repo} {#Manual})) @@ -63,7 +63,7 @@ _ false)))) -(type: .public License +(type .public License [Text URL Distribution]) @@ -75,10 +75,10 @@ text.equivalence ..distribution_equivalence)) -(type: .public SCM +(type .public SCM URL) -(type: .public Organization +(type .public Organization [Text URL]) @@ -88,10 +88,10 @@ text.equivalence text.equivalence)) -(type: .public Email +(type .public Email Text) -(type: .public Developer +(type .public Developer [Text Email (Maybe Organization)]) @@ -103,10 +103,10 @@ text.equivalence (maybe.equivalence ..organization_equivalence))) -(type: .public Contributor +(type .public Contributor Developer) -(type: .public Info +(type .public Info (Record [#name (Maybe Text) #url (Maybe URL) @@ -140,14 +140,14 @@ #developers (list) #contributors (list)]) -(type: .public Source +(type .public Source Path) (def .public default_source Source "source") -(type: .public Target +(type .public Target Path) (def .public default_target @@ -158,14 +158,14 @@ Address "https://repo1.maven.org/maven2/") -(type: .public Name +(type .public Name Text) (def .public default Name "") -(type: .public Profile +(type .public Profile (Record [#parents (List Name) #identity (Maybe Artifact) diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index 2a63427cf..ae6a4acdf 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -21,7 +21,7 @@ (def .public file "project.lux") -(type: .public Project +(type .public Project (Dictionary Name Profile)) (def .public (project name profile) diff --git a/stdlib/source/program/aedifex/repository.lux b/stdlib/source/program/aedifex/repository.lux index 49cb01312..bd1d23d3e 100644 --- a/stdlib/source/program/aedifex/repository.lux +++ b/stdlib/source/program/aedifex/repository.lux @@ -15,7 +15,7 @@ [net [uri (.only URI)]]]]]) -(type: .public (Repository !) +(type .public (Repository !) (Interface (is Text description) @@ -36,7 +36,7 @@ (async.future (at repository upload uri content))) )) -(type: .public (Mock s) +(type .public (Mock s) (Interface (is Text the_description) diff --git a/stdlib/source/program/aedifex/repository/identity.lux b/stdlib/source/program/aedifex/repository/identity.lux index 4f5733651..348a3fc46 100644 --- a/stdlib/source/program/aedifex/repository/identity.lux +++ b/stdlib/source/program/aedifex/repository/identity.lux @@ -11,13 +11,13 @@ [encoding ["[0]" utf8]]]]]]) -(type: .public User +(type .public User Text) -(type: .public Password +(type .public Password Text) -(type: .public Identity +(type .public Identity (Record [#user User #password Password])) diff --git a/stdlib/source/program/aedifex/repository/origin.lux b/stdlib/source/program/aedifex/repository/origin.lux index 46f0822c2..e8b9c22a4 100644 --- a/stdlib/source/program/aedifex/repository/origin.lux +++ b/stdlib/source/program/aedifex/repository/origin.lux @@ -10,7 +10,7 @@ [file (.only Path)] [net (.only URL)]]]]) -(type: .public Origin +(type .public Origin (Variant {#Local Path} {#Remote URL})) diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index d939915d8..2414e25d8 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -31,7 +31,7 @@ ["[1][0]" artifact (.only Version Artifact) [extension (.only Extension)]]]]) -(type: .public Address +(type .public Address URL) (with_template [] diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux index a105b2da9..6b0a9dbc9 100644 --- a/stdlib/source/program/aedifex/runtime.lux +++ b/stdlib/source/program/aedifex/runtime.lux @@ -15,7 +15,7 @@ [world ["[0]" file]]]]) -(type: .public Runtime +(type .public Runtime (Record [#environment (Dictionary Text Text) #program Text -- cgit v1.2.3