From 9a835bde8908e4ebd1c8972211acadc5895d720a Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Tue, 14 Jun 2022 10:17:32 -0400 Subject: De-sigil-ification: suffix : [Part 8] --- lux-cl/source/program.lux | 2 +- lux-js/source/program.lux | 2 +- lux-lua/source/program.lux | 2 +- lux-mode/lux-mode.el | 12 +- lux-php/source/program.lux | 2 +- lux-python/source/program.lux | 2 +- lux-scheme/source/program.lux | 2 +- stdlib/source/documentation/lux/ffi.jvm.lux | 6 +- stdlib/source/documentation/lux/ffi.old.lux | 6 +- stdlib/source/documentation/lux/type/poly.lux | 2 +- stdlib/source/library/lux/ffi.jvm.lux | 2 +- stdlib/source/library/lux/ffi.old.lux | 2 +- .../language/lux/phase/generation/extension.lux | 2 +- stdlib/source/library/lux/type/poly.lux | 111 +++-- .../source/polytypic/lux/abstract/equivalence.lux | 247 ++++++------ stdlib/source/polytypic/lux/abstract/functor.lux | 173 ++++---- stdlib/source/polytypic/lux/data/format/json.lux | 446 +++++++++++---------- stdlib/source/test/lux/ffi.jvm.lux | 14 +- stdlib/source/test/lux/ffi.old.lux | 4 +- 19 files changed, 518 insertions(+), 521 deletions(-) diff --git a/lux-cl/source/program.lux b/lux-cl/source/program.lux index 4b82594fc..d61caab05 100644 --- a/lux-cl/source/program.lux +++ b/lux-cl/source/program.lux @@ -145,7 +145,7 @@ (ffi.import org/armedbear/lisp/Closure "[1]::[0]") -(ffi.interface: LuxADT +(ffi.interface LuxADT (getValue [] java/lang/Object)) (ffi.import program/LuxADT diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux index b8ba06d2c..52f5d49ef 100644 --- a/lux-js/source/program.lux +++ b/lux-js/source/program.lux @@ -141,7 +141,7 @@ "[1]::[0]") (with_template [] - [(ffi.interface: + [(ffi.interface (getValue [] java/lang/Object)) (import diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux index dc909805f..7a2f2712e 100644 --- a/lux-lua/source/program.lux +++ b/lux-lua/source/program.lux @@ -172,7 +172,7 @@ "Class" (ffi.of_string (java/lang/Object::toString (java/lang/Object::getClass object))) "Object" (ffi.of_string (java/lang/Object::toString object)))) - (ffi.interface: LuxValue + (ffi.interface LuxValue (getValue [] java/lang/Object)) (ffi.import LuxValue diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el index 7d9f18203..8b79a6cf5 100644 --- a/lux-mode/lux-mode.el +++ b/lux-mode/lux-mode.el @@ -376,7 +376,7 @@ Called by `imenu--generic-function'." (type//checking (altRE "is" "as" "let" "as_expected" "type_of" "sharing" "by_example" "hole")) (type//primitive (altRE "primitive:" "abstraction" "representation" "transmutation")) (type//unit (altRE "unit:" "scale:")) - (type//poly (altRE "poly:")) + (type//poly (altRE "polytypic")) (type//dynamic (altRE "dynamic" "static")) (type//capability (altRE "capability:")) ;; Data @@ -389,7 +389,7 @@ Called by `imenu--generic-function'." (code//super-quotation (altRE "``" "~~")) (code//template (altRE "with_template" "template")) ;; Miscellaneous - (jvm-host (altRE "import" "export" "class:" "interface:" "object" "do_to" "synchronized" "class_for")) + (jvm-host (altRE "import" "export" "class:" "interface" "object" "do_to" "synchronized" "class_for")) (alternative-format (altRE "char" "bin" "oct" "hex")) (documentation (altRE "comment" "documentation:")) (function-application (altRE "|>" "<|" "left" "right" "all")) @@ -579,18 +579,20 @@ This function also returns nil meaning don't specify the indentation." (define-lux-indent ("function" 'defun) + ("macro" 'defun) ("syntax" 'defun) ("template" 'defun) - ("message" 'defun) + ("polytypic" 'defun) ("analysis" 'defun) ("synthesis" 'defun) ("generation" 'defun) ("directive" 'defun) - (import 'defun) - (export 'defun) + ("interface" 'defun) + ("import" 'defun) + ("export" 'defun) (let 'defun) (case 'defun) diff --git a/lux-php/source/program.lux b/lux-php/source/program.lux index 24f215fb5..1e117c033 100644 --- a/lux-php/source/program.lux +++ b/lux-php/source/program.lux @@ -167,7 +167,7 @@ (call [php/runtime/env/Environment [php/runtime/Memory]] "try" php/runtime/Memory)) (with_template [] - [(ffi.interface: + [(ffi.interface (getValue [] java/lang/Object)) (`` (ffi.import (~~ (template.symbol ["program/" ])) diff --git a/lux-python/source/program.lux b/lux-python/source/program.lux index 2704b0e80..ecb78d6f4 100644 --- a/lux-python/source/program.lux +++ b/lux-python/source/program.lux @@ -199,7 +199,7 @@ _ (exception.except ..unknown_kind_of_object [(as java/lang/Object host_object)]))) - (ffi.interface: LuxValue + (ffi.interface LuxValue (value [] java/lang/Object)) (import LuxValue diff --git a/lux-scheme/source/program.lux b/lux-scheme/source/program.lux index b70e6f17c..c0145adf7 100644 --- a/lux-scheme/source/program.lux +++ b/lux-scheme/source/program.lux @@ -160,7 +160,7 @@ false)) (with_template [] - [(ffi.interface: + [(ffi.interface (getValue [] java/lang/Object)) (`` (ffi.import (~~ (template.symbol ["program/" ])) diff --git a/stdlib/source/documentation/lux/ffi.jvm.lux b/stdlib/source/documentation/lux/ffi.jvm.lux index 254f5d7a1..72a5e15cd 100644 --- a/stdlib/source/documentation/lux/ffi.jvm.lux +++ b/stdlib/source/documentation/lux/ffi.jvm.lux @@ -110,9 +110,9 @@ "(::new! []) for calling the class's constructor." "(::resolve! container [value]) for calling the 'resolve' method."]) -(documentation: /.interface: +(documentation: /.interface "Allows defining JVM interfaces." - [(interface: TestInterface + [(interface TestInterface ([] foo [boolean String] void "throws" [Exception]))]) (documentation: /.object @@ -306,7 +306,7 @@ ..short_to_char ..class: - ..interface: + ..interface ..object ..null ..null? diff --git a/stdlib/source/documentation/lux/ffi.old.lux b/stdlib/source/documentation/lux/ffi.old.lux index 36282f92d..a93ecbe95 100644 --- a/stdlib/source/documentation/lux/ffi.old.lux +++ b/stdlib/source/documentation/lux/ffi.old.lux @@ -74,9 +74,9 @@ "(::new! []) for calling the class's constructor." "(::resolve! container [value]) for calling the 'resolve' method."]) -(documentation: /.interface: +(documentation: /.interface "Allows defining JVM interfaces." - [(interface: TestInterface + [(interface TestInterface ([] foo [boolean String] void "throws" [Exception]))]) (documentation: /.object @@ -240,7 +240,7 @@ ..char_to_int ..char_to_long ..class: - ..interface: + ..interface ..object ..null ..null? diff --git a/stdlib/source/documentation/lux/type/poly.lux b/stdlib/source/documentation/lux/type/poly.lux index e08c1d058..92183f398 100644 --- a/stdlib/source/documentation/lux/type/poly.lux +++ b/stdlib/source/documentation/lux/type/poly.lux @@ -26,5 +26,5 @@ ($.module /._ "" [..code - ($.default /.poly:)] + ($.default /.polytypic)] [])) diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index 4753e6f14..32b5410ee 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -1230,7 +1230,7 @@ [(~+ (list#each field_decl$ fields))] [(~+ methods)]))))))) -(def: .public interface: +(def: .public interface (syntax (_ [.let [! <>.monad] [full_class_name class_vars] (at ! each parser.declaration ..declaration^) supers (<>.else (list) diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux index db6bfb42e..1933ba032 100644 --- a/stdlib/source/library/lux/ffi.old.lux +++ b/stdlib/source/library/lux/ffi.old.lux @@ -1232,7 +1232,7 @@ (with_brackets (spaced (list#each (method_def$ replacer super) methods))))))]] (in (list (` ((~ (code.text def_code))))))))) -(def: .public interface: +(def: .public interface (syntax (_ [class_decl ..class_decl^ .let [class_vars (product.right class_decl)] supers (<>.else (list) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux index 8f5c9db8a..aa9829172 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux @@ -53,7 +53,7 @@ list.together))] ((~' in) ((~ g!extension) [(~+ g!input+)]))) - (~' _) + (~ g!_) (///.except ///extension.incorrect_arity [(~ g!name) 1 (list.size (~ g!inputs))]))))))))))) (arity: 0 nullary ..Nullary) diff --git a/stdlib/source/library/lux/type/poly.lux b/stdlib/source/library/lux/type/poly.lux index fa27e032b..aeb27188b 100644 --- a/stdlib/source/library/lux/type/poly.lux +++ b/stdlib/source/library/lux/type/poly.lux @@ -24,75 +24,66 @@ [number ["n" nat]]]]]) -(def: polyP - (Parser [Code Text Code]) - (let [private (all <>.and - .local - .any)] - (<>.either (<>.and .any private) - (<>.and (<>#in (` .private)) private)))) - -(def: .public poly: - (syntax (_ [[export_policy name body] ..polyP]) +(def: .public polytypic + (syntax (_ [name .local + body .any]) (with_symbols [g!_ g!type g!output] (let [g!name (code.symbol ["" name])] - (in (.list (` (def: (~ export_policy) (~ g!name) - ((~! syntax) ((~ g!name) [(~ g!type) (~! .any)]) - ((~! do) (~! meta.monad) - [(~ g!type) ((~! meta.eval) .Type (~ g!type))] - (case (is (.Either .Text .Code) - ((~! .result) ((~! <>.rec) - (function ((~ g!_) (~ g!name)) - (~ body))) - (.as .Type (~ g!type)))) - {.#Left (~ g!output)} - ((~! meta.failure) (~ g!output)) + (in (.list (` ((~! syntax) ((~ g!_) [(~ g!type) (~! .any)]) + ((~! do) (~! meta.monad) + [(~ g!type) ((~! meta.eval) .Type (~ g!type))] + (case (is (.Either .Text .Code) + ((~! .result) ((~! <>.rec) + (function ((~ g!_) (~ g!name)) + (~ body))) + (.as .Type (~ g!type)))) + {.#Right (~ g!output)} + ((~' in) (.list (~ g!output))) - {.#Right (~ g!output)} - ((~' in) (.list (~ g!output)))))))))))))) + {.#Left (~ g!output)} + ((~! meta.failure) (~ g!output)))))))))))) (def: .public (code env type) (-> Env Type Code) - (`` (case type - {.#Primitive name params} - (` {.#Primitive (~ (code.text name)) - (.list (~+ (list#each (code env) params)))}) + (case type + {.#Primitive name params} + (` {.#Primitive (~ (code.text name)) + (.list (~+ (list#each (code env) params)))}) - (^.with_template [] - [{ idx} - (` { (~ (code.nat idx))})]) - ([.#Var] [.#Ex]) + (^.with_template [] + [{ idx} + (` { (~ (code.nat idx))})]) + ([.#Var] [.#Ex]) - {.#Parameter idx} - (let [idx (.argument env idx)] - (if (n.= 0 idx) - (|> (dictionary.value idx env) maybe.trusted product.left (code env)) - (` (.$ (~ (code.nat (-- idx))))))) + {.#Parameter idx} + (let [idx (.argument env idx)] + (if (n.= 0 idx) + (|> (dictionary.value idx env) maybe.trusted product.left (code env)) + (` (.$ (~ (code.nat (-- idx))))))) - {.#Apply {.#Primitive "" {.#End}} - {.#Parameter idx}} - (case (.argument env idx) - 0 (|> env (dictionary.value 0) maybe.trusted product.left (code env)) - idx (undefined)) - - (^.with_template [] - [{ left right} - (` { (~ (code env left)) - (~ (code env right))})]) - ([.#Function] [.#Apply]) + {.#Apply {.#Primitive "" {.#End}} + {.#Parameter idx}} + (case (.argument env idx) + 0 (|> env (dictionary.value 0) maybe.trusted product.left (code env)) + idx (undefined)) + + (^.with_template [] + [{ left right} + (` { (~ (code env left)) + (~ (code env right))})]) + ([.#Function] [.#Apply]) - (^.with_template [ ] - [{ left right} - (` ( (~+ (list#each (code env) ( type)))))]) - ([.Union .#Sum type.flat_variant] - [.Tuple .#Product type.flat_tuple]) + (^.with_template [ ] + [{ left right} + (` ( (~+ (list#each (code env) ( type)))))]) + ([.Union .#Sum type.flat_variant] + [.Tuple .#Product type.flat_tuple]) - {.#Named name sub_type} - (code.symbol name) + {.#Named name sub_type} + (code.symbol name) - (^.with_template [] - [{ scope body} - (` { (.list (~+ (list#each (code env) scope))) - (~ (code env body))})]) - ([.#UnivQ] [.#ExQ]) - ))) + (^.with_template [] + [{ scope body} + (` { (.list (~+ (list#each (code env) scope))) + (~ (code env body))})]) + ([.#UnivQ] [.#ExQ]))) diff --git a/stdlib/source/polytypic/lux/abstract/equivalence.lux b/stdlib/source/polytypic/lux/abstract/equivalence.lux index 119142267..03d3dd3de 100644 --- a/stdlib/source/polytypic/lux/abstract/equivalence.lux +++ b/stdlib/source/polytypic/lux/abstract/equivalence.lux @@ -35,133 +35,134 @@ ["[0]" day] ["[0]" month]] ["[0]" type (.only) - ["[0]" poly (.only poly:)] + ["[0]" poly (.only polytypic)] ["[0]" unit]]]] [\\library ["[0]" /]]) -(poly: .public equivalence - (`` (do [! <>.monad] - [.let [g!_ (code.local "_____________")] - *env* .env - inputT .next - .let [@Equivalence (is (-> Type Code) - (function (_ type) - (` ((~! /.Equivalence) (~ (poly.code *env* type))))))]] - (all <>.either - ... Basic types - (~~ (with_template [ ] - [(do ! - [_ ] - (in (` (is (~ (@Equivalence inputT)) - ))))] +(def: .public equivalence + (polytypic equivalence + (`` (do [! <>.monad] + [.let [g!_ (code.local "_____________")] + *env* .env + inputT .next + .let [@Equivalence (is (-> Type Code) + (function (_ type) + (` ((~! /.Equivalence) (~ (poly.code *env* type))))))]] + (all <>.either + ... Basic types + (~~ (with_template [ ] + [(do ! + [_ ] + (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)])) - ... Composite types - (~~ (with_template [ ] - [(do ! - [[_ argC] (.applied (<>.and (.exactly ) - equivalence))] - (in (` (is (~ (@Equivalence inputT)) - ( (~ argC))))))] + [(.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 [ ] + [(do ! + [[_ argC] (.applied (<>.and (.exactly ) + equivalence))] + (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)] - )) - (do ! - [[_ _ valC] (.applied (all <>.and - (.exactly dictionary.Dictionary) - .any - equivalence))] - (in (` (is (~ (@Equivalence inputT)) - ((~! dictionary.equivalence) (~ valC)))))) - ... Models - (~~ (with_template [ ] - [(do ! - [_ (.exactly )] - (in (` (is (~ (@Equivalence inputT)) - ))))] + [.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)))))) + ... Models + (~~ (with_template [ ] + [(do ! + [_ (.exactly )] + (in (` (is (~ (@Equivalence inputT)) + ))))] - [duration.Duration duration.equivalence] - [instant.Instant instant.equivalence] - [date.Date date.equivalence] - [day.Day day.equivalence] - [month.Month month.equivalence] - )) - (do ! - [_ (.applied (<>.and (.exactly unit.Qty) - .any))] - (in (` (is (~ (@Equivalence inputT)) - unit.equivalence)))) - ... Variants - (do ! - [members (.variant (<>.many equivalence)) - .let [last (-- (list.size members)) - 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]) - (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.enumeration members)))) - (~ g!_) - #0)))))) - ... Tuples - (do ! - [g!eqs (.tuple (<>.many equivalence)) - .let [g!_ (code.local "_____________") - 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) - (list#each (function (_ [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))))))) - .recursive_self - ... Type applications - (do ! - [[funcC argsC] (.applied (<>.and equivalence (<>.many equivalence)))] - (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)))))) - .recursive_call - ... If all else fails... - (|> .any - (at ! each (|>> %.type (format "Cannot create Equivalence for: ") <>.failure)) - (at ! conjoint)) - )))) + [duration.Duration duration.equivalence] + [instant.Instant instant.equivalence] + [date.Date date.equivalence] + [day.Day day.equivalence] + [month.Month month.equivalence] + )) + (do ! + [_ (.applied (<>.and (.exactly unit.Qty) + .any))] + (in (` (is (~ (@Equivalence inputT)) + unit.equivalence)))) + ... Variants + (do ! + [members (.variant (<>.many equivalence)) + .let [last (-- (list.size members)) + 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]) + (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.enumeration members)))) + (~ g!_) + #0)))))) + ... Tuples + (do ! + [g!eqs (.tuple (<>.many equivalence)) + .let [g!_ (code.local "_____________") + 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) + (list#each (function (_ [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))))))) + .recursive_self + ... Type applications + (do ! + [[funcC argsC] (.applied (<>.and equivalence (<>.many equivalence)))] + (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)))))) + .recursive_call + ... If all else fails... + (|> .any + (at ! each (|>> %.type (format "Cannot create Equivalence for: ") <>.failure)) + (at ! conjoint)) + ))))) diff --git a/stdlib/source/polytypic/lux/abstract/functor.lux b/stdlib/source/polytypic/lux/abstract/functor.lux index 3ad598a91..fc7cae722 100644 --- a/stdlib/source/polytypic/lux/abstract/functor.lux +++ b/stdlib/source/polytypic/lux/abstract/functor.lux @@ -19,92 +19,93 @@ [number ["n" nat]]] ["[0]" type (.only) - ["[0]" poly (.only poly:)]]]] + ["[0]" poly (.only polytypic)]]]] [\\library ["[0]" /]]) -(poly: .public functor - (do [! p.monad] - [.let [g!_ (code.local "____________") - type_funcC (code.local "____________type_funcC") - funcC (code.local "____________funcC") - inputC (code.local "____________inputC")] - *env* .env - inputT .next - [polyC varsC non_functorT] (.local (list inputT) - (.polymorphic .any)) - .let [num_vars (list.size varsC)] - .let [@Functor (is (-> Type Code) - (function (_ unwrappedT) - (if (n.= 1 num_vars) - (` ((~! /.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))))))))) - Arg (is (-> Code (.Parser Code)) - (function (Arg valueC) - (all p.either - ... Type-var - (do p.monad - [.let [varI (|> num_vars (n.* 2) --)] - _ (.this_parameter varI)] - (in (` ((~ funcC) (~ valueC))))) - ... Variants - (do ! - [_ (in []) - membersC (.variant (p.many (Arg valueC))) - .let [last (-- (list.size membersC))]] - (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.enumeration membersC)))))))) - ... Tuples - (do p.monad - [pairsCC (is (.Parser (List [Code Code])) - (.tuple (loop (again [idx 0 - pairsCC (is (List [Code Code]) - (list))]) - (p.either (let [slotC (|> idx %.nat (format "____________slot") code.local)] - (do ! - [_ (in []) - memberC (Arg slotC)] - (again (++ idx) - (list#composite pairsCC (list [slotC memberC]))))) - (in pairsCC)))))] - (in (` (case (~ valueC) - [(~+ (list#each product.left pairsCC))] - [(~+ (list#each product.right pairsCC))])))) - ... Functions - (do ! - [_ (in []) - .let [g! (code.local "____________") - outL (code.local "____________outL")] - [inT+ outC] (.function (p.many .any) - (Arg outL)) - .let [inC+ (|> (list.size inT+) - list.indices - (list#each (|>> %.nat (format "____________inC") code.local)))]] - (in (` (function ((~ g!) (~+ inC+)) - (let [(~ outL) ((~ valueC) (~+ inC+))] - (~ outC)))))) - ... Recursion - (do p.monad - [_ .recursive_call] - (in (` ((~' each) (~ funcC) (~ valueC))))) - ... Parameters - (do p.monad - [_ .any] - (in valueC)) - )))] - [_ _ outputC] (is (.Parser [Code (List Code) Code]) - (p.either (.polymorphic - (Arg inputC)) - (p.failure (format "Cannot create Functor for: " (%.type inputT)))))] - (in (` (is (~ (@Functor inputT)) - (implementation - (def: ((~' each) (~ funcC) (~ inputC)) - (~ outputC)))))))) +(def: .public functor + (polytypic functor + (do [! p.monad] + [.let [g!_ (code.local "____________") + type_funcC (code.local "____________type_funcC") + funcC (code.local "____________funcC") + inputC (code.local "____________inputC")] + *env* .env + inputT .next + [polyC varsC non_functorT] (.local (list inputT) + (.polymorphic .any)) + .let [num_vars (list.size varsC)] + .let [@Functor (is (-> Type Code) + (function (_ unwrappedT) + (if (n.= 1 num_vars) + (` ((~! /.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))))))))) + Arg (is (-> Code (.Parser Code)) + (function (Arg valueC) + (all p.either + ... Type-var + (do p.monad + [.let [varI (|> num_vars (n.* 2) --)] + _ (.this_parameter varI)] + (in (` ((~ funcC) (~ valueC))))) + ... Variants + (do ! + [_ (in []) + membersC (.variant (p.many (Arg valueC))) + .let [last (-- (list.size membersC))]] + (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.enumeration membersC)))))))) + ... Tuples + (do p.monad + [pairsCC (is (.Parser (List [Code Code])) + (.tuple (loop (again [idx 0 + pairsCC (is (List [Code Code]) + (list))]) + (p.either (let [slotC (|> idx %.nat (format "____________slot") code.local)] + (do ! + [_ (in []) + memberC (Arg slotC)] + (again (++ idx) + (list#composite pairsCC (list [slotC memberC]))))) + (in pairsCC)))))] + (in (` (case (~ valueC) + [(~+ (list#each product.left pairsCC))] + [(~+ (list#each product.right pairsCC))])))) + ... Functions + (do ! + [_ (in []) + .let [g! (code.local "____________") + outL (code.local "____________outL")] + [inT+ outC] (.function (p.many .any) + (Arg outL)) + .let [inC+ (|> (list.size inT+) + list.indices + (list#each (|>> %.nat (format "____________inC") code.local)))]] + (in (` (function ((~ g!) (~+ inC+)) + (let [(~ outL) ((~ valueC) (~+ inC+))] + (~ outC)))))) + ... Recursion + (do p.monad + [_ .recursive_call] + (in (` ((~' each) (~ funcC) (~ valueC))))) + ... Parameters + (do p.monad + [_ .any] + (in valueC)) + )))] + [_ _ outputC] (is (.Parser [Code (List Code) Code]) + (p.either (.polymorphic + (Arg inputC)) + (p.failure (format "Cannot create Functor for: " (%.type inputT)))))] + (in (` (is (~ (@Functor inputT)) + (implementation + (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 801a16e19..b86f256a2 100644 --- a/stdlib/source/polytypic/lux/data/format/json.lux +++ b/stdlib/source/polytypic/lux/data/format/json.lux @@ -35,7 +35,7 @@ ["[0]" month]] ["[0]" type (.only) ["[0]" unit] - ["[0]" poly (.only poly:)]]]] + ["[0]" poly (.only polytypic)]]]] [\\library ["[0]" / (.only JSON)]]) @@ -96,233 +96,235 @@ (|>> (at ..int_codec decoded) (at try.functor each (debug.private unit.in')))))) -(poly: encoded - (with_expansions - [ (with_template [ ] - [(do ! - [.let [g!_ (code.local "_______")] - _ ] - (in (` (is (~ (@JSON#encoded inputT)) - ))))] +(def: encoded + (polytypic encoded + (with_expansions + [ (with_template [ ] + [(do ! + [.let [g!_ (code.local "_______")] + _ ] + (in (` (is (~ (@JSON#encoded inputT)) + ))))] - [(.exactly Any) (function ((~ g!_) (~ (code.symbol ["" "0"]))) {/.#Null})] - [(.sub Bit) (|>> {/.#Boolean})] - [(.sub Nat) (at (~! ..nat_codec) (~' encoded))] - [(.sub Int) (at (~! ..int_codec) (~' encoded))] - [(.sub Frac) (|>> {/.#Number})] - [(.sub Text) (|>> {/.#String})]) -