From 86df87512966e8038d70624ab654262ce14a915c Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Mon, 12 Jul 2021 00:03:36 -0400 Subject: Better syntax for parallel-hierarchy imports. --- stdlib/source/spec/aedifex/repository.lux | 11 +++++------ stdlib/source/spec/lux/abstract/apply.lux | 4 ++-- stdlib/source/spec/lux/abstract/codec.lux | 4 ++-- stdlib/source/spec/lux/abstract/comonad.lux | 4 ++-- stdlib/source/spec/lux/abstract/enum.lux | 4 ++-- stdlib/source/spec/lux/abstract/equivalence.lux | 4 ++-- stdlib/source/spec/lux/abstract/fold.lux | 3 ++- stdlib/source/spec/lux/abstract/functor.lux | 4 ++-- stdlib/source/spec/lux/abstract/functor/contravariant.lux | 4 ++-- stdlib/source/spec/lux/abstract/hash.lux | 4 ++-- stdlib/source/spec/lux/abstract/interval.lux | 4 ++-- stdlib/source/spec/lux/abstract/monad.lux | 4 ++-- stdlib/source/spec/lux/abstract/monoid.lux | 4 ++-- stdlib/source/spec/lux/abstract/order.lux | 4 ++-- stdlib/source/spec/lux/world/console.lux | 4 ++-- stdlib/source/spec/lux/world/file.lux | 7 +++---- stdlib/source/spec/lux/world/program.lux | 4 ++-- stdlib/source/spec/lux/world/shell.lux | 4 ++-- 18 files changed, 40 insertions(+), 41 deletions(-) (limited to 'stdlib/source/spec') diff --git a/stdlib/source/spec/aedifex/repository.lux b/stdlib/source/spec/aedifex/repository.lux index 675d055b0..882937a0b 100644 --- a/stdlib/source/spec/aedifex/repository.lux +++ b/stdlib/source/spec/aedifex/repository.lux @@ -9,19 +9,18 @@ ["." promise (#+ Promise)]]] [data ["." binary - {[0 #test] - ["_#" /]}]] + ["_#" \test]]] [math ["." random]]] - {#program + [\\program ["." / ["#." remote] ["/#" // #_ ["#." artifact (#+ Artifact) - ["#/." extension]]]]} - {#test + ["#/." extension]]]]] + [\\test ["_." // #_ - ["#." artifact]]}) + ["#." artifact]]]) (def: #export (spec valid_artifact invalid_artifact subject) (-> Artifact Artifact (/.Repository Promise) Test) diff --git a/stdlib/source/spec/lux/abstract/apply.lux b/stdlib/source/spec/lux/abstract/apply.lux index a3218ae0c..749d82a28 100644 --- a/stdlib/source/spec/lux/abstract/apply.lux +++ b/stdlib/source/spec/lux/abstract/apply.lux @@ -9,8 +9,8 @@ ["." random] [number ["n" nat]]]] - {1 - ["." / (#+ Apply)]} + [\\ + ["." / (#+ Apply)]] [// [functor (#+ Injection Comparison)]]) diff --git a/stdlib/source/spec/lux/abstract/codec.lux b/stdlib/source/spec/lux/abstract/codec.lux index db3148c3f..d892436f3 100644 --- a/stdlib/source/spec/lux/abstract/codec.lux +++ b/stdlib/source/spec/lux/abstract/codec.lux @@ -7,10 +7,10 @@ ["." try]] [math ["." random (#+ Random)]]] - {1 + [\\ ["." / [// - [equivalence (#+ Equivalence)]]]}) + [equivalence (#+ Equivalence)]]]]) (def: #export (spec (^open "@//.") (^open "@//.") generator) (All [m a] (-> (Equivalence a) (/.Codec m a) (Random a) Test)) diff --git a/stdlib/source/spec/lux/abstract/comonad.lux b/stdlib/source/spec/lux/abstract/comonad.lux index 42933a9e3..7d68d7a24 100644 --- a/stdlib/source/spec/lux/abstract/comonad.lux +++ b/stdlib/source/spec/lux/abstract/comonad.lux @@ -7,8 +7,8 @@ ["." random] [number ["n" nat]]]] - {1 - ["." / (#+ CoMonad)]} + [\\ + ["." / (#+ CoMonad)]] [// [functor (#+ Injection Comparison)]]) diff --git a/stdlib/source/spec/lux/abstract/enum.lux b/stdlib/source/spec/lux/abstract/enum.lux index 6d28dead8..2823c7b38 100644 --- a/stdlib/source/spec/lux/abstract/enum.lux +++ b/stdlib/source/spec/lux/abstract/enum.lux @@ -5,8 +5,8 @@ [monad (#+ do)]] [math ["." random (#+ Random)]]] - {1 - ["." /]}) + [\\ + ["." /]]) (def: #export (spec (^open "\.") gen-sample) (All [a] (-> (/.Enum a) (Random a) Test)) diff --git a/stdlib/source/spec/lux/abstract/equivalence.lux b/stdlib/source/spec/lux/abstract/equivalence.lux index f3d97e5b6..14e84c05b 100644 --- a/stdlib/source/spec/lux/abstract/equivalence.lux +++ b/stdlib/source/spec/lux/abstract/equivalence.lux @@ -5,8 +5,8 @@ [monad (#+ do)]] [math ["." random (#+ Random)]]] - {1 - ["." / (#+ Equivalence)]}) + [\\ + ["." / (#+ Equivalence)]]) (def: #export (spec (^open "_//.") random) (All [a] (-> (Equivalence a) (Random a) Test)) diff --git a/stdlib/source/spec/lux/abstract/fold.lux b/stdlib/source/spec/lux/abstract/fold.lux index 03421803f..204987ded 100644 --- a/stdlib/source/spec/lux/abstract/fold.lux +++ b/stdlib/source/spec/lux/abstract/fold.lux @@ -9,7 +9,8 @@ ["n" nat]]]] [// [functor (#+ Injection Comparison)]] - {1 ["." /]}) + [\\ + ["." /]]) (def: #export (spec injection comparison (^open "@//.")) (All [f] (-> (Injection f) (Comparison f) (/.Fold f) Test)) diff --git a/stdlib/source/spec/lux/abstract/functor.lux b/stdlib/source/spec/lux/abstract/functor.lux index 88fc113ee..8aa3b5e95 100644 --- a/stdlib/source/spec/lux/abstract/functor.lux +++ b/stdlib/source/spec/lux/abstract/functor.lux @@ -10,8 +10,8 @@ ["." random] [number ["n" nat]]]] - {1 - ["." / (#+ Functor)]}) + [\\ + ["." / (#+ Functor)]]) (type: #export (Injection f) (All [a] (-> a (f a)))) diff --git a/stdlib/source/spec/lux/abstract/functor/contravariant.lux b/stdlib/source/spec/lux/abstract/functor/contravariant.lux index f713b5c9e..21a2a62c6 100644 --- a/stdlib/source/spec/lux/abstract/functor/contravariant.lux +++ b/stdlib/source/spec/lux/abstract/functor/contravariant.lux @@ -10,8 +10,8 @@ ["." random] [number ["n" nat]]]] - {1 - ["." / (#+ Functor)]}) + [\\ + ["." / (#+ Functor)]]) (def: (identity equivalence value (^open "@//.")) (All [f a] (-> (Equivalence (f a)) (f a) (Functor f) Test)) diff --git a/stdlib/source/spec/lux/abstract/hash.lux b/stdlib/source/spec/lux/abstract/hash.lux index 543ea2a85..94b9cf92b 100644 --- a/stdlib/source/spec/lux/abstract/hash.lux +++ b/stdlib/source/spec/lux/abstract/hash.lux @@ -9,8 +9,8 @@ ["." random (#+ Random)] [number ["n" nat]]]] - {1 - ["." /]}) + [\\ + ["." /]]) (def: #export (spec (^open "\.") random) (All [a] (-> (/.Hash a) (Random a) Test)) diff --git a/stdlib/source/spec/lux/abstract/interval.lux b/stdlib/source/spec/lux/abstract/interval.lux index c80c3ec5b..a3735f50f 100644 --- a/stdlib/source/spec/lux/abstract/interval.lux +++ b/stdlib/source/spec/lux/abstract/interval.lux @@ -6,8 +6,8 @@ ["." order]] [math ["." random (#+ Random)]]] - {1 - ["." /]}) + [\\ + ["." /]]) (def: #export (spec (^open "@//.") gen-sample) (All [a] (-> (/.Interval a) (Random a) Test)) diff --git a/stdlib/source/spec/lux/abstract/monad.lux b/stdlib/source/spec/lux/abstract/monad.lux index a1e5a41e4..4d79a43b0 100644 --- a/stdlib/source/spec/lux/abstract/monad.lux +++ b/stdlib/source/spec/lux/abstract/monad.lux @@ -5,8 +5,8 @@ ["." random] [number ["n" nat]]]] - {1 - ["." / (#+ do)]} + [\\ + ["." / (#+ do)]] [// [functor (#+ Injection Comparison)]]) diff --git a/stdlib/source/spec/lux/abstract/monoid.lux b/stdlib/source/spec/lux/abstract/monoid.lux index 1981c6107..a590f09a1 100644 --- a/stdlib/source/spec/lux/abstract/monoid.lux +++ b/stdlib/source/spec/lux/abstract/monoid.lux @@ -5,10 +5,10 @@ [monad (#+ do)]] [math ["." random (#+ Random)]]] - {1 + [\\ ["." / [// - [equivalence (#+ Equivalence)]]]}) + [equivalence (#+ Equivalence)]]]]) (def: #export (spec (^open "\.") (^open "\.") gen-sample) (All [a] (-> (Equivalence a) (/.Monoid a) (Random a) Test)) diff --git a/stdlib/source/spec/lux/abstract/order.lux b/stdlib/source/spec/lux/abstract/order.lux index 6d259a465..e1a9eea1b 100644 --- a/stdlib/source/spec/lux/abstract/order.lux +++ b/stdlib/source/spec/lux/abstract/order.lux @@ -5,8 +5,8 @@ [monad (#+ do)]] [math ["." random (#+ Random)]]] - {1 - ["." /]}) + [\\ + ["." /]]) (def: #export (spec (^open "@//.") generator) (All [a] (-> (/.Order a) (Random a) Test)) diff --git a/stdlib/source/spec/lux/world/console.lux b/stdlib/source/spec/lux/world/console.lux index 7dedd72cb..cda425364 100644 --- a/stdlib/source/spec/lux/world/console.lux +++ b/stdlib/source/spec/lux/world/console.lux @@ -13,8 +13,8 @@ ["%" format (#+ format)]]] [math ["." random]]] - {1 - ["." /]}) + [\\ + ["." /]]) (def: #export (spec console) (-> (IO (/.Console Promise)) Test) diff --git a/stdlib/source/spec/lux/world/file.lux b/stdlib/source/spec/lux/world/file.lux index 8a13279ad..a207817f1 100644 --- a/stdlib/source/spec/lux/world/file.lux +++ b/stdlib/source/spec/lux/world/file.lux @@ -18,8 +18,7 @@ [encoding ["." utf8 ("#\." codec)]]] ["." binary (#+ Binary) ("#\." equivalence monoid) - {[0 #test] - ["$#" /]}] + ["$#" \test]] [collection ["." list]]] [math @@ -28,8 +27,8 @@ ["n" nat]]] [time ["." instant (#+ Instant) ("#\." equivalence)]]] - {1 - ["." /]}) + [\\ + ["." /]]) (def: (for_path fs) (-> (IO (/.System Promise)) Test) diff --git a/stdlib/source/spec/lux/world/program.lux b/stdlib/source/spec/lux/world/program.lux index 85db051f0..cf413ed55 100644 --- a/stdlib/source/spec/lux/world/program.lux +++ b/stdlib/source/spec/lux/world/program.lux @@ -14,8 +14,8 @@ ["." list]]] [math ["." random]]] - {1 - ["." /]}) + [\\ + ["." /]]) (def: #export (spec subject) (-> (/.Program Promise) Test) diff --git a/stdlib/source/spec/lux/world/shell.lux b/stdlib/source/spec/lux/world/shell.lux index 8ff65a2c7..78bbd5521 100644 --- a/stdlib/source/spec/lux/world/shell.lux +++ b/stdlib/source/spec/lux/world/shell.lux @@ -18,10 +18,10 @@ [number ["n" nat] ["i" int]]]] - {1 + [\\ ["." / [// - [file (#+ Path)]]]}) + [file (#+ Path)]]]]) (template [ ] [(def: -- cgit v1.2.3