From b96beb587c11fcfbce86ce2d62351600cf6cad1b Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 2 Jul 2022 05:38:27 -0400 Subject: More traditional names for unquoting macros. --- .../source/polytypic/lux/abstract/equivalence.lux | 98 ++++++------- stdlib/source/polytypic/lux/abstract/functor.lux | 40 ++--- stdlib/source/polytypic/lux/data/format/json.lux | 162 ++++++++++----------- 3 files changed, 150 insertions(+), 150 deletions(-) (limited to 'stdlib/source/polytypic') diff --git a/stdlib/source/polytypic/lux/abstract/equivalence.lux b/stdlib/source/polytypic/lux/abstract/equivalence.lux index 0c83b9ab5..bc044fe6b 100644 --- a/stdlib/source/polytypic/lux/abstract/equivalence.lux +++ b/stdlib/source/polytypic/lux/abstract/equivalence.lux @@ -48,50 +48,50 @@ inputT .next .let [@Equivalence (is (-> Type Code) (function (_ type) - (` ((~! /.Equivalence) (~ (poly.code *env* type))))))]] + (` ((,! /.Equivalence) (, (poly.code *env* type))))))]] (all <>.either ... Basic types - (~~ (with_template [ ] + (,, (with_template [ ] [(do ! [_ ] - (in (` (is (~ (@Equivalence inputT)) + (in (` (is (, (@Equivalence inputT)) ))))] - [(.exactly Any) (function ((~ g!_) (~ g!_) (~ g!_)) #1)] - [(.sub Bit) (~! bit.equivalence)] - [(.sub Nat) (~! nat.equivalence)] - [(.sub Int) (~! int.equivalence)] - [(.sub Rev) (~! rev.equivalence)] - [(.sub Frac) (~! frac.equivalence)] - [(.sub Text) (~! text.equivalence)])) + [(.exactly Any) (function ((, g!_) (, g!_) (, g!_)) #1)] + [(.sub Bit) (,! bit.equivalence)] + [(.sub Nat) (,! nat.equivalence)] + [(.sub Int) (,! int.equivalence)] + [(.sub Rev) (,! rev.equivalence)] + [(.sub Frac) (,! frac.equivalence)] + [(.sub Text) (,! text.equivalence)])) ... Composite types - (~~ (with_template [ ] + (,, (with_template [ ] [(do ! [[_ argC] (.applied (<>.and (.exactly ) equivalence))] - (in (` (is (~ (@Equivalence inputT)) - ( (~ argC))))))] + (in (` (is (, (@Equivalence inputT)) + ( (, argC))))))] - [.Maybe (~! maybe.equivalence)] - [.List (~! list.equivalence)] - [sequence.Sequence (~! sequence.equivalence)] - [array.Array (~! array.equivalence)] - [queue.Queue (~! queue.equivalence)] - [set.Set (~! set.equivalence)] - [tree.Tree (~! tree.equivalence)] + [.Maybe (,! maybe.equivalence)] + [.List (,! list.equivalence)] + [sequence.Sequence (,! sequence.equivalence)] + [array.Array (,! array.equivalence)] + [queue.Queue (,! queue.equivalence)] + [set.Set (,! set.equivalence)] + [tree.Tree (,! tree.equivalence)] )) (do ! [[_ _ valC] (.applied (all <>.and (.exactly dictionary.Dictionary) .any equivalence))] - (in (` (is (~ (@Equivalence inputT)) - ((~! dictionary.equivalence) (~ valC)))))) + (in (` (is (, (@Equivalence inputT)) + ((,! dictionary.equivalence) (, valC)))))) ... Models - (~~ (with_template [ ] + (,, (with_template [ ] [(do ! [_ (.exactly )] - (in (` (is (~ (@Equivalence inputT)) + (in (` (is (, (@Equivalence inputT)) ))))] [duration.Duration duration.equivalence] @@ -103,7 +103,7 @@ (do ! [_ (.applied (<>.and (.exactly unit.Measure) .any))] - (in (` (is (~ (@Equivalence inputT)) + (in (` (is (, (@Equivalence inputT)) unit.equivalence)))) ... Variants (do ! @@ -112,19 +112,19 @@ g!_ (code.local "_____________") g!left (code.local "_____________left") g!right (code.local "_____________right")]] - (in (` (is (~ (@Equivalence inputT)) - (function ((~ g!_) (~ g!left) (~ g!right)) - (case [(~ g!left) (~ g!right)] - (~+ (list#conjoint (list#each (function (_ [tag g!eq]) + (in (` (is (, (@Equivalence inputT)) + (function ((, g!_) (, g!left) (, g!right)) + (case [(, g!left) (, g!right)] + (,* (list#conjoint (list#each (function (_ [tag g!eq]) (if (nat.= last tag) - (list (` [{(~ (code.nat (-- tag))) #1 (~ g!left)} - {(~ (code.nat (-- tag))) #1 (~ g!right)}]) - (` ((~ g!eq) (~ g!left) (~ g!right)))) - (list (` [{(~ (code.nat tag)) #0 (~ g!left)} - {(~ (code.nat tag)) #0 (~ g!right)}]) - (` ((~ g!eq) (~ g!left) (~ g!right)))))) + (list (` [{(, (code.nat (-- tag))) #1 (, g!left)} + {(, (code.nat (-- tag))) #1 (, g!right)}]) + (` ((, g!eq) (, g!left) (, g!right)))) + (list (` [{(, (code.nat tag)) #0 (, g!left)} + {(, (code.nat tag)) #0 (, g!right)}]) + (` ((, g!eq) (, g!left) (, g!right)))))) (list.enumeration members)))) - (~ g!_) + (, g!_) #0)))))) ... Tuples (do ! @@ -133,33 +133,33 @@ indices (list.indices (list.size g!eqs)) g!lefts (list#each (|>> nat#encoded (text#composite "left") code.local) indices) g!rights (list#each (|>> nat#encoded (text#composite "right") code.local) indices)]] - (in (` (is (~ (@Equivalence inputT)) - (function ((~ g!_) [(~+ g!lefts)] [(~+ g!rights)]) - (and (~+ (|> (list.zipped_3 g!eqs g!lefts g!rights) + (in (` (is (, (@Equivalence inputT)) + (function ((, g!_) [(,* g!lefts)] [(,* g!rights)]) + (and (,* (|> (list.zipped_3 g!eqs g!lefts g!rights) (list#each (function (_ [g!eq g!left g!right]) - (` ((~ g!eq) (~ g!left) (~ g!right))))))))))))) + (` ((, g!eq) (, g!left) (, g!right))))))))))))) ... Type recursion (do ! [[g!self bodyC] (.recursive equivalence) .let [g!_ (code.local "_____________")]] - (in (` (is (~ (@Equivalence inputT)) - ((~! /.rec) (.function ((~ g!_) (~ g!self)) - (~ bodyC))))))) + (in (` (is (, (@Equivalence inputT)) + ((,! /.rec) (.function ((, g!_) (, g!self)) + (, bodyC))))))) .recursive_self ... Type applications (do ! [[funcC argsC] (.applied (<>.and equivalence (<>.many equivalence)))] - (in (` ((~ funcC) (~+ argsC))))) + (in (` ((, funcC) (,* argsC))))) ... Parameters .parameter ... Polymorphism (do ! [[funcC varsC bodyC] (.polymorphic equivalence)] - (in (` (is (All ((~ g!_) (~+ varsC)) - (-> (~+ (list#each (|>> (~) ((~! /.Equivalence)) (`)) varsC)) - ((~! /.Equivalence) ((~ (poly.code *env* inputT)) (~+ varsC))))) - (function ((~ funcC) (~+ varsC)) - (~ bodyC)))))) + (in (` (is (All ((, g!_) (,* varsC)) + (-> (,* (list#each (|>> (,) ((,! /.Equivalence)) (`)) varsC)) + ((,! /.Equivalence) ((, (poly.code *env* inputT)) (,* varsC))))) + (function ((, funcC) (,* varsC)) + (, bodyC)))))) .recursive_call ... If all else fails... (|> .any diff --git a/stdlib/source/polytypic/lux/abstract/functor.lux b/stdlib/source/polytypic/lux/abstract/functor.lux index db17e49ac..43b8b2902 100644 --- a/stdlib/source/polytypic/lux/abstract/functor.lux +++ b/stdlib/source/polytypic/lux/abstract/functor.lux @@ -37,10 +37,10 @@ .let [@Functor (is (-> Type Code) (function (_ unwrappedT) (if (n.= 1 num_vars) - (` ((~! /.Functor) (~ (poly.code *env* unwrappedT)))) + (` ((,! /.Functor) (, (poly.code *env* unwrappedT)))) (let [paramsC (|> num_vars -- list.indices (list#each (|>> %.nat code.local)))] - (` (All ((~ g!_) (~+ paramsC)) - ((~! /.Functor) ((~ (poly.code *env* unwrappedT)) (~+ paramsC))))))))) + (` (All ((, g!_) (,* paramsC)) + ((,! /.Functor) ((, (poly.code *env* unwrappedT)) (,* paramsC))))))))) Arg (is (-> Code (.Parser Code)) (function (Arg valueC) (all <>.either @@ -48,19 +48,19 @@ (do <>.monad [.let [varI (|> num_vars (n.* 2) --)] _ (.this_parameter varI)] - (in (` ((~ funcC) (~ valueC))))) + (in (` ((, funcC) (, valueC))))) ... Variants (do ! [_ (in []) membersC (.variant (<>.many (Arg valueC))) .let [last (-- (list.size membersC))]] - (in (` (case (~ valueC) - (~+ (list#conjoint (list#each (function (_ [tag memberC]) + (in (` (case (, valueC) + (,* (list#conjoint (list#each (function (_ [tag memberC]) (if (n.= last tag) - (list (` {(~ (code.nat (-- tag))) #1 (~ valueC)}) - (` {(~ (code.nat (-- tag))) #1 (~ memberC)})) - (list (` {(~ (code.nat tag)) #0 (~ valueC)}) - (` {(~ (code.nat tag)) #0 (~ memberC)})))) + (list (` {(, (code.nat (-- tag))) #1 (, valueC)}) + (` {(, (code.nat (-- tag))) #1 (, memberC)})) + (list (` {(, (code.nat tag)) #0 (, valueC)}) + (` {(, (code.nat tag)) #0 (, memberC)})))) (list.enumeration membersC)))))))) ... Tuples (do <>.monad @@ -75,9 +75,9 @@ (again (++ idx) (list#composite pairsCC (list [slotC memberC]))))) (in pairsCC)))))] - (in (` (case (~ valueC) - [(~+ (list#each product.left pairsCC))] - [(~+ (list#each product.right pairsCC))])))) + (in (` (case (, valueC) + [(,* (list#each product.left pairsCC))] + [(,* (list#each product.right pairsCC))])))) ... Functions (do ! [_ (in []) @@ -88,13 +88,13 @@ .let [inC+ (|> (list.size inT+) list.indices (list#each (|>> %.nat (format "____________inC") code.local)))]] - (in (` (function ((~ g!) (~+ inC+)) - (let [(~ outL) ((~ valueC) (~+ inC+))] - (~ outC)))))) + (in (` (function ((, g!) (,* inC+)) + (let [(, outL) ((, valueC) (,* inC+))] + (, outC)))))) ... Recursion (do <>.monad [_ .recursive_call] - (in (` ((~' each) (~ funcC) (~ valueC))))) + (in (` ((,' each) (, funcC) (, valueC))))) ... Parameters (do <>.monad [_ .any] @@ -104,7 +104,7 @@ (<>.either (.polymorphic (Arg inputC)) (<>.failure (format "Cannot create Functor for: " (%.type inputT)))))] - (in (` (is (~ (@Functor inputT)) + (in (` (is (, (@Functor inputT)) (implementation - (def ((~' each) (~ funcC) (~ inputC)) - (~ outputC))))))))) + (def ((,' each) (, funcC) (, inputC)) + (, outputC))))))))) diff --git a/stdlib/source/polytypic/lux/data/format/json.lux b/stdlib/source/polytypic/lux/data/format/json.lux index a8eee64d0..5f79d7fe4 100644 --- a/stdlib/source/polytypic/lux/data/format/json.lux +++ b/stdlib/source/polytypic/lux/data/format/json.lux @@ -105,20 +105,20 @@ [(do ! [.let [g!_ (code.local "_______")] _ ] - (in (` (is (~ (@JSON#encoded inputT)) + (in (` (is (, (@JSON#encoded inputT)) ))))] - [(.exactly Any) (function ((~ g!_) (~ (code.symbol ["" "0"]))) {/.#Null})] + [(.exactly Any) (function ((, g!_) (, (code.symbol ["" "0"]))) {/.#Null})] [(.sub Bit) (|>> {/.#Boolean})] - [(.sub Nat) (at (~! ..nat_codec) (~' encoded))] - [(.sub Int) (at (~! ..int_codec) (~' encoded))] + [(.sub Nat) (at (,! ..nat_codec) (,' encoded))] + [(.sub Int) (at (,! ..int_codec) (,' encoded))] [(.sub Frac) (|>> {/.#Number})] [(.sub Text) (|>> {/.#String})])