diff options
| author | Eduardo Julian | 2021-09-10 02:27:34 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2021-09-10 02:27:34 -0400 |
| commit | f71ec9cb4ead1e7f9573a37686c87e6a9206a415 (patch) | |
| tree | 30c716f305a729d1266256ad0f2a504ff66e2f64 | |
| parent | cd71a864ad5be13ed6ec6d046e0a2cb1087bdf94 (diff) | |
Fixed the indentation of variants.
Diffstat (limited to '')
48 files changed, 712 insertions, 711 deletions
diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux index e3244f410..7ae009ad4 100644 --- a/lux-jvm/source/program.lux +++ b/lux-jvm/source/program.lux @@ -153,59 +153,59 @@ write! (: (-> Text Nat Synthesis Synthesis Synthesis) (function (_ element_class index value array) ({#$.Extension "jvm array write object" - (list (jvm_type (jvm/type.array (jvm/type.class element_class (list)))) - (literal_nat index) - value - array)}))) + (list (jvm_type (jvm/type.array (jvm/type.class element_class (list)))) + (literal_nat index) + value + array)}))) object_array (: (-> Text Nat Synthesis) (function (_ class_name size) {#$.Extension "jvm array new object" - (list (class_type class_name) - (literal_nat size))})) + (list (class_type class_name) + (literal_nat size))})) class_of (: (-> Synthesis Synthesis) (function (_ object) {#$.Extension "jvm member invoke virtual" - (list& (class_type "java.lang.Object") - ($.text "getClass") - (class_type "java.lang.Class") - object - (list))})) + (list& (class_type "java.lang.Object") + ($.text "getClass") + (class_type "java.lang.Class") + object + (list))})) input (: (All (_ c) (-> (jvm/type.Type c) Synthesis Synthesis)) (function (_ value_type value) ($.tuple (list (jvm_type value_type) value)))) example_object {#$.Extension "jvm member invoke constructor" - (list& (class_type "java.lang.Object") - (list))} + (list& (class_type "java.lang.Object") + (list))} phase_arity 3 $phase ($.variable/local 1) $archive ($.variable/local 2) $input ($.variable/local 3) $state ($.variable/local 4) apply_method {#$.Extension "jvm member invoke virtual" - (list& (class_type "java.lang.Class") - ($.text "getMethod") - (class_type "java.lang.reflect.Method") - (class_of $phase) - (list (input java/lang/String - ($.text runtime.apply_method)) - (input <java/lang/Class> - (|> (object_array "java.lang.Class" phase_arity) - (write! "java.lang.Class" 0 (class_of example_object)) - (write! "java.lang.Class" 1 (class_of example_object)) - (write! "java.lang.Class" 2 (class_of example_object))))))}] + (list& (class_type "java.lang.Class") + ($.text "getMethod") + (class_type "java.lang.reflect.Method") + (class_of $phase) + (list (input java/lang/String + ($.text runtime.apply_method)) + (input <java/lang/Class> + (|> (object_array "java.lang.Class" phase_arity) + (write! "java.lang.Class" 0 (class_of example_object)) + (write! "java.lang.Class" 1 (class_of example_object)) + (write! "java.lang.Class" 2 (class_of example_object))))))}] {#$.Extension "jvm member invoke virtual" - (list& (class_type "java.lang.reflect.Method") - ($.text "invoke") - (class_type "java.lang.Object") - apply_method - (list (input java/lang/Object - $phase) - (input <java/lang/Object> - (|> (object_array "java.lang.Object" phase_arity) - (write! "java.lang.Object" 0 $archive) - (write! "java.lang.Object" 1 $input) - (write! "java.lang.Object" 2 $state)))))})) + (list& (class_type "java.lang.reflect.Method") + ($.text "invoke") + (class_type "java.lang.Object") + apply_method + (list (input java/lang/Object + $phase) + (input <java/lang/Object> + (|> (object_array "java.lang.Object" phase_arity) + (write! "java.lang.Object" 0 $archive) + (write! "java.lang.Object" 1 $input) + (write! "java.lang.Object" 2 $state)))))})) (def: (phase_wrapper archive) (-> Archive (generation.Operation _.Anchor _.Inst _.Definition phase.Wrapper)) diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el index a98a7a472..a56ea3360 100644 --- a/lux-mode/lux-mode.el +++ b/lux-mode/lux-mode.el @@ -544,11 +544,12 @@ This function also returns nil meaning don't specify the indentation." (last (split-string (substring-no-properties function) "\\."))))) (setq method (get (intern-soft function-tail) 'lux-indent-function)) - (cond ((member (char-after open-paren) '(?\{ ?\[)) + (cond ((member (char-after open-paren) '(?\[ ;; ?\{ + )) (goto-char open-paren) (1+ (current-column))) ((or (eq method 'defun) - (and (null method) + (and (null method) (> (length function) 2) (or (string-match withRE function-tail) (string-match definitionRE function-tail)))) diff --git a/stdlib/source/documentation/lux/data/collection/tree.lux b/stdlib/source/documentation/lux/data/collection/tree.lux index 32b51af56..236e0533b 100644 --- a/stdlib/source/documentation/lux/data/collection/tree.lux +++ b/stdlib/source/documentation/lux/data/collection/tree.lux @@ -36,8 +36,8 @@ [(: (Tree Nat) (tree 12 {34 {} - 56 {} - 78 {90 {}}}))]) + 56 {} + 78 {90 {}}}))]) (.def: .public documentation (.List $.Module) diff --git a/stdlib/source/documentation/lux/world/net/http/client.lux b/stdlib/source/documentation/lux/world/net/http/client.lux index cda303287..bb5ae1db5 100644 --- a/stdlib/source/documentation/lux/world/net/http/client.lux +++ b/stdlib/source/documentation/lux/world/net/http/client.lux @@ -1,4 +1,4 @@ - (.module: +(.module: [library [lux "*" ["$" documentation {"+" [documentation:]}] diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux index 7d94363f3..aa4d89179 100644 --- a/stdlib/source/library/lux.lux +++ b/stdlib/source/library/lux.lux @@ -19,10 +19,10 @@ ("lux def" Any ("lux type check type" {9 #1 - [..prelude_module "Any"] - {8 #0 - {0 #0} - {4 #0 1}}}) + [..prelude_module "Any"] + {8 #0 + {0 #0} + {4 #0 1}}}) #1) ... (type: .public Nothing @@ -30,10 +30,10 @@ ("lux def" Nothing ("lux type check type" {9 #1 - [..prelude_module "Nothing"] - {7 #0 - {0 #0} - {4 #0 1}}}) + [..prelude_module "Nothing"] + {7 #0 + {0 #0} + {4 #0 1}}}) #1) ... (type: .public (List a) @@ -41,77 +41,77 @@ ... {#Item a (List a)}) ("lux def type tagged" List {9 #1 - [..prelude_module "List"] - {7 #0 - {0 #0} - {1 #0 - ... End - Any - ... Item - {2 #0 - {4 #0 1} - {9 #0 - {4 #0 1} - {4 #0 0}}}}}} + [..prelude_module "List"] + {7 #0 + {0 #0} + {1 #0 + ... End + Any + ... Item + {2 #0 + {4 #0 1} + {9 #0 + {4 #0 1} + {4 #0 0}}}}}} {"End" "Item"} #1) ("lux def" Bit ("lux type check type" {9 #1 - [..prelude_module "Bit"] - {0 #0 "#Bit" #End}}) + [..prelude_module "Bit"] + {0 #0 "#Bit" #End}}) #1) ("lux def" I64 ("lux type check type" {9 #1 - [..prelude_module "I64"] - {7 #0 - {0 #0} - {0 #0 "#I64" {#Item {4 #0 1} #End}}}}) + [..prelude_module "I64"] + {7 #0 + {0 #0} + {0 #0 "#I64" {#Item {4 #0 1} #End}}}}) #1) ("lux def" Nat ("lux type check type" {9 #1 - [..prelude_module "Nat"] - {0 #0 "#I64" {#Item {0 #0 "#Nat" #End} #End}}}) + [..prelude_module "Nat"] + {0 #0 "#I64" {#Item {0 #0 "#Nat" #End} #End}}}) #1) ("lux def" Int ("lux type check type" {9 #1 - [..prelude_module "Int"] - {0 #0 "#I64" {#Item {0 #0 "#Int" #End} #End}}}) + [..prelude_module "Int"] + {0 #0 "#I64" {#Item {0 #0 "#Int" #End} #End}}}) #1) ("lux def" Rev ("lux type check type" {9 #1 - [..prelude_module "Rev"] - {0 #0 "#I64" {#Item {0 #0 "#Rev" #End} #End}}}) + [..prelude_module "Rev"] + {0 #0 "#I64" {#Item {0 #0 "#Rev" #End} #End}}}) #1) ("lux def" Frac ("lux type check type" {9 #1 - [..prelude_module "Frac"] - {0 #0 "#Frac" #End}}) + [..prelude_module "Frac"] + {0 #0 "#Frac" #End}}) #1) ("lux def" Text ("lux type check type" {9 #1 - [..prelude_module "Text"] - {0 #0 "#Text" #End}}) + [..prelude_module "Text"] + {0 #0 "#Text" #End}}) #1) ("lux def" Name ("lux type check type" {9 #1 - [..prelude_module "Name"] - {2 #0 Text Text}}) + [..prelude_module "Name"] + {2 #0 Text Text}}) #1) ... (type: .public (Maybe a) @@ -119,14 +119,14 @@ ... {#Some a}) ("lux def type tagged" Maybe {9 #1 - [..prelude_module "Maybe"] - {7 #0 - #End - {1 #0 - ... None - Any - ... Some - {4 #0 1}}}} + [..prelude_module "Maybe"] + {7 #0 + #End + {1 #0 + ... None + Any + ... Some + {4 #0 1}}}} {"None" "Some"} #1) @@ -146,48 +146,48 @@ ... {#Named Name Type}))) ("lux def type tagged" Type {9 #1 [..prelude_module "Type"] - ({Type - ({Type_List - ({Type_Pair - {9 #0 - {0 #0 ["" #End]} - {7 #0 - #End - {1 #0 - ... Primitive - {2 #0 Text Type_List} - {1 #0 - ... Sum - Type_Pair - {1 #0 - ... Product - Type_Pair - {1 #0 - ... Function - Type_Pair - {1 #0 - ... Parameter - Nat - {1 #0 - ... Var - Nat + ({Type + ({Type_List + ({Type_Pair + {9 #0 + {0 #0 ["" #End]} + {7 #0 + #End {1 #0 - ... Ex - Nat - {1 #0 - ... UnivQ - {2 #0 Type_List Type} - {1 #0 - ... ExQ - {2 #0 Type_List Type} + ... Primitive + {2 #0 Text Type_List} {1 #0 - ... Apply - Type_Pair - ... Named - {2 #0 Name Type}}}}}}}}}}}}}} - ("lux type check type" {2 #0 Type Type}))} - ("lux type check type" {9 #0 Type List}))} - ("lux type check type" {9 #0 {0 #0 ["" #End]} {4 #0 0}}))} + ... Sum + Type_Pair + {1 #0 + ... Product + Type_Pair + {1 #0 + ... Function + Type_Pair + {1 #0 + ... Parameter + Nat + {1 #0 + ... Var + Nat + {1 #0 + ... Ex + Nat + {1 #0 + ... UnivQ + {2 #0 Type_List Type} + {1 #0 + ... ExQ + {2 #0 Type_List Type} + {1 #0 + ... Apply + Type_Pair + ... Named + {2 #0 Name Type}}}}}}}}}}}}}} + ("lux type check type" {2 #0 Type Type}))} + ("lux type check type" {9 #0 Type List}))} + ("lux type check type" {9 #0 {0 #0 ["" #End]} {4 #0 0}}))} {"Primitive" "Sum" "Product" "Function" "Parameter" "Var" "Ex" "UnivQ" "ExQ" "Apply" "Named"} #1) @@ -198,7 +198,7 @@ ... #column Nat])) ("lux def type tagged" Location {#Named [..prelude_module "Location"] - {#Product Text {#Product Nat Nat}}} + {#Product Text {#Product Nat Nat}}} ["module" "line" "column"] #1) @@ -208,11 +208,11 @@ ... #datum v])) ("lux def type tagged" Ann {#Named [..prelude_module "Ann"] - {#UnivQ #End - {#UnivQ #End - {#Product - {#Parameter 3} - {#Parameter 1}}}}} + {#UnivQ #End + {#UnivQ #End + {#Product + {#Parameter 3} + {#Parameter 1}}}}} ["meta" "datum"] #1) @@ -230,47 +230,47 @@ ... {#Tuple (List (w (Code' w)))}) ("lux def type tagged" Code' {#Named [..prelude_module "Code'"] - ({Code - ({Code_List - {#UnivQ #End - {#Sum - ... Bit - Bit - {#Sum - ... Nat - Nat - {#Sum - ... Int - Int - {#Sum - ... Rev - Rev - {#Sum - ... Frac - Frac - {#Sum - ... Text - Text - {#Sum - ... Identifier - Name - {#Sum - ... Tag - Name - {#Sum - ... Form - Code_List - {#Sum - ... Variant - Code_List - ... Tuple - Code_List - }}}}}}}}}} - }} - ("lux type check type" {#Apply Code List}))} - ("lux type check type" {#Apply {#Apply {#Parameter 1} - {#Parameter 0}} - {#Parameter 1}}))} + ({Code + ({Code_List + {#UnivQ #End + {#Sum + ... Bit + Bit + {#Sum + ... Nat + Nat + {#Sum + ... Int + Int + {#Sum + ... Rev + Rev + {#Sum + ... Frac + Frac + {#Sum + ... Text + Text + {#Sum + ... Identifier + Name + {#Sum + ... Tag + Name + {#Sum + ... Form + Code_List + {#Sum + ... Variant + Code_List + ... Tuple + Code_List + }}}}}}}}}} + }} + ("lux type check type" {#Apply Code List}))} + ("lux type check type" {#Apply {#Apply {#Parameter 1} + {#Parameter 0}} + {#Parameter 1}}))} {"Bit" "Nat" "Int" "Rev" "Frac" "Text" "Identifier" "Tag" "Form" "Variant" "Tuple"} #1) @@ -279,9 +279,9 @@ ("lux def" Code ("lux type check type" {#Named [..prelude_module "Code"] - ({w - {#Apply {#Apply w Code'} w}} - ("lux type check type" {#Apply Location Ann}))}) + ({w + {#Apply {#Apply w Code'} w}} + ("lux type check type" {#Apply Location Ann}))}) #1) ("lux def" private @@ -303,7 +303,7 @@ ("lux def" _ann ("lux type check" {#Function {#Apply {#Apply Location Ann} Code'} - Code} + Code} ([_ data] [dummy_location data])) #0) @@ -378,7 +378,7 @@ ("lux def" Definition ("lux type check type" {#Named [..prelude_module "Definition"] - {#Product Bit {#Product Type Any}}}) + {#Product Bit {#Product Type Any}}}) .public) ... (type: .public Alias @@ -386,7 +386,7 @@ ("lux def" Alias ("lux type check type" {#Named [..prelude_module "Alias"] - Name}) + Name}) .public) ... (type: .public Label @@ -394,7 +394,7 @@ ("lux def" Label ("lux type check type" {#Named [..prelude_module "Label"] - {#Product Bit {#Product Type {#Product {#Apply Text List} Nat}}}}) + {#Product Bit {#Product Type {#Product {#Apply Text List} Nat}}}}) .public) ... (type: .public Global @@ -406,13 +406,13 @@ ... {#Alias Alias})) ("lux def type tagged" Global {#Named [..prelude_module "Global"] - {#Sum Definition - {#Sum ({labels - {#Product Bit {#Product Type {#Sum labels labels}}}} - {#Product Text {#Apply Text List}}) - {#Sum Label - {#Sum Label - Alias}}}}} + {#Sum Definition + {#Sum ({labels + {#Product Bit {#Product Type {#Sum labels labels}}}} + {#Product Text {#Apply Text List}}) + {#Sum Label + {#Sum Label + Alias}}}}} {"Definition" "Type" "Label" "Slot" "Alias"} .public) @@ -422,15 +422,15 @@ ... #mappings (List [k v])])) ("lux def type tagged" Bindings {#Named [..prelude_module "Bindings"] - {#UnivQ #End - {#UnivQ #End - {#Product - ... counter - Nat - ... mappings - {#Apply {#Product {#Parameter 3} - {#Parameter 1}} - List}}}}} + {#UnivQ #End + {#UnivQ #End + {#Product + ... counter + Nat + ... mappings + {#Apply {#Product {#Parameter 3} + {#Parameter 1}} + List}}}}} ["counter" "mappings"] .public) @@ -439,10 +439,10 @@ ... {#Captured Nat}) ("lux def type tagged" Ref {#Named [..prelude_module "Ref"] - {#Sum ... Local - Nat - ... Captured - Nat}} + {#Sum ... Local + Nat + ... Captured + Nat}} {"Local" "Captured"} .public) @@ -454,14 +454,14 @@ ... #captured (Bindings Text [Type Ref])])) ("lux def type tagged" Scope {#Named [..prelude_module "Scope"] - {#Product ... name - {#Apply Text List} - {#Product ... inner - Nat - {#Product ... locals - {#Apply {#Product Type Nat} {#Apply Text Bindings}} - ... captured - {#Apply {#Product Type Ref} {#Apply Text Bindings}}}}}} + {#Product ... name + {#Apply Text List} + {#Product ... inner + Nat + {#Product ... locals + {#Apply {#Product Type Nat} {#Apply Text Bindings}} + ... captured + {#Apply {#Product Type Ref} {#Apply Text Bindings}}}}}} ["name" "inner" "locals" "captured"] .public) @@ -475,13 +475,13 @@ ... {#Right r}) ("lux def type tagged" Either {#Named [..prelude_module "Either"] - {#UnivQ #End - {#UnivQ #End - {#Sum - ... Left - {#Parameter 3} - ... Right - {#Parameter 1}}}}} + {#UnivQ #End + {#UnivQ #End + {#Sum + ... Left + {#Parameter 3} + ... Right + {#Parameter 1}}}}} {"Left" "Right"} .public) @@ -490,7 +490,7 @@ ("lux def" Source ("lux type check type" {#Named [..prelude_module "Source"] - {#Product Location {#Product Nat Text}}}) + {#Product Location {#Product Nat Text}}}) .public) ... (type: .public Module_State @@ -499,14 +499,14 @@ ... #Cached) ("lux def type tagged" Module_State {#Named [..prelude_module "Module_State"] - {#Sum - ... #Active - Any - {#Sum - ... #Compiled - Any - ... #Cached - Any}}} + {#Sum + ... #Active + Any + {#Sum + ... #Compiled + Any + ... #Cached + Any}}} {"Active" "Compiled" "Cached"} .public) @@ -519,21 +519,21 @@ ... #module_state Module_State])) ("lux def type tagged" Module {#Named [..prelude_module "Module"] - {#Product - ... module_hash - Nat - {#Product - ... module_aliases - {#Apply {#Product Text Text} List} - {#Product - ... definitions - {#Apply {#Product Text Global} List} - {#Product - ... imports - {#Apply Text List} - ... module_state - Module_State - }}}}} + {#Product + ... module_hash + Nat + {#Product + ... module_aliases + {#Apply {#Product Text Text} List} + {#Product + ... definitions + {#Apply {#Product Text Global} List} + {#Product + ... imports + {#Apply Text List} + ... module_state + Module_State + }}}}} ["module_hash" "module_aliases" "definitions" "imports" "module_state"] .public) @@ -544,13 +544,13 @@ ... #var_bindings (List [Nat (Maybe Type)])])) ("lux def type tagged" Type_Context {#Named [..prelude_module "Type_Context"] - {#Product ... ex_counter - Nat - {#Product ... var_counter - Nat - ... var_bindings - {#Apply {#Product Nat {#Apply Type Maybe}} - List}}}} + {#Product ... ex_counter + Nat + {#Product ... var_counter + Nat + ... var_bindings + {#Apply {#Product Nat {#Apply Type Maybe}} + List}}}} ["ex_counter" "var_counter" "var_bindings"] .public) @@ -560,12 +560,12 @@ ... #Interpreter) ("lux def type tagged" Mode {#Named [..prelude_module "Mode"] - {#Sum ... Build - Any - {#Sum ... Eval - Any - ... Interpreter - Any}}} + {#Sum ... Build + Any + {#Sum ... Eval + Any + ... Interpreter + Any}}} {"Build" "Eval" "Interpreter"} .public) @@ -576,14 +576,14 @@ ... #mode Mode])) ("lux def type tagged" Info {#Named [..prelude_module "Info"] - {#Product - ... target - Text - {#Product - ... version - Text - ... mode - Mode}}} + {#Product + ... target + Text + {#Product + ... version + Text + ... mode + Mode}}} ["target" "version" "mode"] .public) @@ -604,51 +604,51 @@ ... #host Any])) ("lux def type tagged" Lux {#Named [..prelude_module "Lux"] - ({Lux - {#Apply {0 #0 ["" #End]} - {#UnivQ #End - {#Product - ... info - Info - {#Product - ... source - Source - {#Product - ... location - Location - {#Product - ... current_module - {#Apply Text Maybe} - {#Product - ... modules - {#Apply {#Product Text Module} List} - {#Product - ... scopes - {#Apply Scope List} - {#Product - ... type_context - Type_Context - {#Product - ... expected - {#Apply Type Maybe} - {#Product - ... seed - Nat - {#Product - ... scope_type_vars - {#Apply Nat List} - {#Product - ... extensions - Any - {#Product - ... eval - {#Function Type - {#Function Code - {#Function Lux - {#Sum Text {#Product Lux Any}}}}} - ... host - Any}}}}}}}}}}}}}}} - {#Apply {0 #0 ["" #End]} {#Parameter 0}})} + ({Lux + {#Apply {0 #0 ["" #End]} + {#UnivQ #End + {#Product + ... info + Info + {#Product + ... source + Source + {#Product + ... location + Location + {#Product + ... current_module + {#Apply Text Maybe} + {#Product + ... modules + {#Apply {#Product Text Module} List} + {#Product + ... scopes + {#Apply Scope List} + {#Product + ... type_context + Type_Context + {#Product + ... expected + {#Apply Type Maybe} + {#Product + ... seed + Nat + {#Product + ... scope_type_vars + {#Apply Nat List} + {#Product + ... extensions + Any + {#Product + ... eval + {#Function Type + {#Function Code + {#Function Lux + {#Sum Text {#Product Lux Any}}}}} + ... host + Any}}}}}}}}}}}}}}} + {#Apply {0 #0 ["" #End]} {#Parameter 0}})} ["info" "source" "location" "current_module" "modules" "scopes" "type_context" "expected" "seed" "scope_type_vars" "extensions" "eval" "host"] .public) @@ -657,10 +657,10 @@ ("lux def" Meta ("lux type check type" {#Named [..prelude_module "Meta"] - {#UnivQ #End - {#Function Lux - {#Apply {#Product Lux {#Parameter 1}} - {#Apply Text Either}}}}}) + {#UnivQ #End + {#Function Lux + {#Apply {#Product Lux {#Parameter 1}} + {#Apply Text Either}}}}}) .public) ... (type: .public Macro' @@ -668,7 +668,7 @@ ("lux def" Macro' ("lux type check type" {#Named [..prelude_module "Macro'"] - {#Function Code_List {#Apply Code_List Meta}}}) + {#Function Code_List {#Apply Code_List Meta}}}) .public) ... (type: .public Macro @@ -676,18 +676,18 @@ ("lux def" Macro ("lux type check type" {#Named [..prelude_module "Macro"] - {#Primitive "#Macro" #End}}) + {#Primitive "#Macro" #End}}) .public) ... Base functions & macros ("lux def" in_meta ("lux type check" {#UnivQ #End - {#Function {#Parameter 1} - {#Function Lux - {#Apply {#Product Lux - {#Parameter 1}} - {#Apply Text Either}}}}} + {#Function {#Parameter 1} + {#Function Lux + {#Apply {#Product Lux + {#Parameter 1}} + {#Apply Text Either}}}}} ([_ val] ([_ state] {#Right state val}))) @@ -696,11 +696,11 @@ ("lux def" failure ("lux type check" {#UnivQ #End - {#Function Text - {#Function Lux - {#Apply {#Product Lux - {#Parameter 1}} - {#Apply Text Either}}}}} + {#Function Text + {#Function Lux + {#Apply {#Product Lux + {#Parameter 1}} + {#Apply Text Either}}}}} ([_ msg] ([_ state] {#Left msg}))) @@ -711,8 +711,8 @@ ([_ tokens] ({{#Item lhs {#Item rhs {#Item body #End}}} (in_meta {#Item (form$ {#Item (variant$ {#Item lhs {#Item body #End}}) - {#Item rhs #End}}) - #End}) + {#Item rhs #End}}) + #End}) _ (failure "Wrong syntax for let''")} @@ -724,31 +724,31 @@ ([_ tokens] ({{#Item [_ {#Tuple {#Item arg args'}}] {#Item body #End}} (in_meta {#Item (_ann {#Form {#Item (_ann {#Tuple {#Item (_ann {#Identifier ["" ""]}) - {#Item arg #End}}}) - {#Item ({#End - body - - _ - (_ann {#Form {#Item (_ann {#Identifier [..prelude_module "function''"]}) - {#Item (_ann {#Tuple args'}) - {#Item body #End}}}})} - args') - #End}}}) - #End}) + {#Item arg #End}}}) + {#Item ({#End + body + + _ + (_ann {#Form {#Item (_ann {#Identifier [..prelude_module "function''"]}) + {#Item (_ann {#Tuple args'}) + {#Item body #End}}}})} + args') + #End}}}) + #End}) {#Item [_ {#Identifier ["" self]}] {#Item [_ {#Tuple {#Item arg args'}}] {#Item body #End}}} (in_meta {#Item (_ann {#Form {#Item (_ann {#Tuple {#Item (_ann {#Identifier ["" self]}) - {#Item arg #End}}}) - {#Item ({#End - body - - _ - (_ann {#Form {#Item (_ann {#Identifier [..prelude_module "function''"]}) - {#Item (_ann {#Tuple args'}) - {#Item body #End}}}})} - args') - #End}}}) - #End}) + {#Item arg #End}}}) + {#Item ({#End + body + + _ + (_ann {#Form {#Item (_ann {#Identifier [..prelude_module "function''"]}) + {#Item (_ann {#Tuple args'}) + {#Item body #End}}}})} + args') + #End}}}) + #End}) _ (failure "Wrong syntax for function''")} @@ -765,8 +765,8 @@ ([_ tag] ([_ value] (tuple$ {#Item location_code - {#Item (form$ {#Item (tag$ tag) {#Item value #End}}) - #End}})))) + {#Item (form$ {#Item (tag$ tag) {#Item value #End}}) + #End}})))) #0) ("lux def" flag_meta @@ -793,17 +793,17 @@ ("lux type check" {#Function Code {#Function {#Apply Code List} {#Function Code Code}}} (function'' [self inputs output] (form$ {#Item (identifier$ [..prelude_module "function''"]) - {#Item self - {#Item (tuple$ inputs) - {#Item output #End}}}}))) + {#Item self + {#Item (tuple$ inputs) + {#Item output #End}}}}))) #0) ("lux def" as_macro ("lux type check" {#Function Code Code} (function'' [expression] (form$ {#Item (text$ "lux macro") - {#Item expression - #End}}))) + {#Item expression + #End}}))) #0) ("lux def" def:'' @@ -833,7 +833,7 @@ ({{#Item export_policy {#Item [_ {#Form {#Item name args}}] {#Item body #End}}} (in_meta {#Item (as_def name (as_macro (as_function name args body)) export_policy) - #End}) + #End}) _ (failure "Wrong syntax for macro:'")} @@ -849,10 +849,10 @@ {#Item x {#Item y xs}} (in_meta {#Item (form$ {#Item (identifier$ [..prelude_module "$'"]) - {#Item (variant$ {#Item (tag$ [..prelude_module "Apply"]) - {#Item y {#Item x #End}}}) - xs}}) - #End}) + {#Item (variant$ {#Item (tag$ [..prelude_module "Apply"]) + {#Item y {#Item x #End}}}) + xs}}) + #End}) _ (failure "Wrong syntax for $'")} @@ -860,10 +860,10 @@ (def:'' .private (list\each f xs) {#UnivQ #End - {#UnivQ #End - {#Function {#Function {#Parameter 3} {#Parameter 1}} - {#Function ($' List {#Parameter 3}) - ($' List {#Parameter 1})}}}} + {#UnivQ #End + {#Function {#Function {#Parameter 3} {#Parameter 1}} + {#Function ($' List {#Parameter 3}) + ($' List {#Parameter 1})}}}} ({#End #End @@ -935,11 +935,11 @@ (def:'' .private (list\mix f init xs) ... (All (_ a b) (-> (-> b a a) a (List b) a)) {#UnivQ #End {#UnivQ #End {#Function {#Function {#Parameter 1} - {#Function {#Parameter 3} - {#Parameter 3}}} - {#Function {#Parameter 3} - {#Function ($' List {#Parameter 1}) - {#Parameter 3}}}}}} + {#Function {#Parameter 3} + {#Parameter 3}}} + {#Function {#Parameter 3} + {#Function ($' List {#Parameter 1}) + {#Parameter 3}}}}}} ({#End init @@ -949,13 +949,13 @@ (def:'' .private (list\size list) {#UnivQ #End - {#Function ($' List {#Parameter 1}) Nat}} + {#Function ($' List {#Parameter 1}) Nat}} (list\mix (function'' [_ acc] ("lux i64 +" 1 acc)) 0 list)) (def:'' .private (let$ binding value body) {#Function Code {#Function Code {#Function Code Code}}} (form$ {#Item (variant$ {#Item binding {#Item body #End}}) - {#Item value #End}})) + {#Item value #End}})) (def:'' .private (UnivQ$ body) {#Function Code Code} @@ -978,11 +978,11 @@ (def:'' .private (quantified_type_parameter idx) {#Function Nat Code} (variant$ {#Item (tag$ [..prelude_module "Parameter"]) - {#Item (form$ {#Item (text$ "lux i64 +") - {#Item (local_identifier$ ..quantification_level) - {#Item (nat$ idx) - #End}}}) - #End}})) + {#Item (form$ {#Item (text$ "lux i64 +") + {#Item (local_identifier$ ..quantification_level) + {#Item (nat$ idx) + #End}}}) + #End}})) (def:'' .private (next_level depth) {#Function Nat Nat} @@ -1003,7 +1003,7 @@ {#Parameter id} ({id' ({#0 {#Parameter id'} - #1 {#Parameter ("lux i64 -" 2 id')}} + #1 {#Parameter ("lux i64 -" 2 id')}} (self_id? id))} ("lux i64 -" ("lux i64 -" depth id) 0)) @@ -1014,27 +1014,27 @@ {#Sum left right} {#Sum (__adjusted_quantified_type__ permission depth left) - (__adjusted_quantified_type__ permission depth right)} + (__adjusted_quantified_type__ permission depth right)} {#Product left right} {#Product (__adjusted_quantified_type__ permission depth left) - (__adjusted_quantified_type__ permission depth right)} + (__adjusted_quantified_type__ permission depth right)} {#Function input output} {#Function (__adjusted_quantified_type__ permission depth input) - (__adjusted_quantified_type__ permission depth output)} + (__adjusted_quantified_type__ permission depth output)} {#UnivQ environment body} {#UnivQ environment - (__adjusted_quantified_type__ permission (next_level depth) body)} + (__adjusted_quantified_type__ permission (next_level depth) body)} {#ExQ environment body} {#ExQ environment - (__adjusted_quantified_type__ permission (next_level depth) body)} + (__adjusted_quantified_type__ permission (next_level depth) body)} {#Apply parameter function} {#Apply (__adjusted_quantified_type__ permission depth parameter) - (__adjusted_quantified_type__ permission depth function)} + (__adjusted_quantified_type__ permission depth function)} ... Leave these alone. {#Named name anonymous} type @@ -1049,22 +1049,22 @@ (def:'' .private (with_correct_quantification body) {#Function Code Code} (form$ {#Item (identifier$ [prelude_module "__adjusted_quantified_type__"]) - {#Item (local_identifier$ ..quantification_level) - {#Item (nat$ 0) - {#Item body - #End}}}})) + {#Item (local_identifier$ ..quantification_level) + {#Item (nat$ 0) + {#Item body + #End}}}})) (def:'' .private (with_quantification depth body) {#Function Nat {#Function Code Code}} ({g!level (let$ g!level (form$ {#Item (text$ "lux i64 +") - {#Item g!level - {#Item (nat$ ("lux type as" Nat - ("lux i64 *" +2 - ("lux type as" Int - depth)))) - #End}}}) + {#Item g!level + {#Item (nat$ ("lux type as" Nat + ("lux i64 *" +2 + ("lux type as" Int + depth)))) + #End}}}) body)} (local_identifier$ ..quantification_level))) @@ -1076,18 +1076,18 @@ #scope_type_vars _ #eval _] (list\mix (function'' [scope verdict] ({#1 #1 - _ ({[#name _ #inner _ #captured _ - #locals [#counter _ - #mappings locals]] - (list\mix (function'' [local verdict] - ({[local _] - ({#1 #1 - _ ("lux text =" ..quantification_level local)} - verdict)} - local)) - #0 - locals)} - scope)} + _ ({[#name _ #inner _ #captured _ + #locals [#counter _ + #mappings locals]] + (list\mix (function'' [local verdict] + ({[local _] + ({#1 #1 + _ ("lux text =" ..quantification_level local)} + verdict)} + local)) + #0 + locals)} + scope)} verdict)) #0 scopes)} @@ -1095,11 +1095,11 @@ (macro:' .public (All tokens lux) ({{#Item [_ {#Form {#Item self_name args}}] - {#Item body #End}} + {#Item body #End}} {#Right [lux {#Item ({raw ({#1 raw - #0 (..quantified raw)} + #0 (..quantified raw)} (initialized_quantification? lux))} ({#End body @@ -1119,7 +1119,7 @@ body)] args))))} args)) - #End}]} + #End}]} _ {#Left "Wrong syntax for All"}} @@ -1127,11 +1127,11 @@ (macro:' .public (Ex tokens lux) ({{#Item [_ {#Form {#Item self_name args}}] - {#Item body #End}} + {#Item body #End}} {#Right [lux {#Item ({raw ({#1 raw - #0 (..quantified raw)} + #0 (..quantified raw)} (initialized_quantification? lux))} ({#End body @@ -1151,7 +1151,7 @@ body)] args))))} args)) - #End}]} + #End}]} _ {#Left "Wrong syntax for Ex"}} @@ -1172,7 +1172,7 @@ (function'' [i o] (variant$ {#Item (tag$ [..prelude_module "Function"]) {#Item i {#Item o #End}}}))) output inputs) - #End}) + #End}) _ (failure "Wrong syntax for ->")} @@ -1181,11 +1181,11 @@ (macro:' .public (list xs) (in_meta {#Item (list\mix (function'' [head tail] (variant$ {#Item (tag$ [..prelude_module "Item"]) - {#Item (tuple$ {#Item [head {#Item [tail #End]}]}) - #End}})) + {#Item (tuple$ {#Item [head {#Item [tail #End]}]}) + #End}})) (tag$ [..prelude_module "End"]) (list\reversed xs)) - #End})) + #End})) (macro:' .public (list& xs) ({{#Item last init} @@ -1311,7 +1311,7 @@ {#Item x xs'} ({#1 #1 - #0 (any? p xs')} + #0 (any? p xs')} (p x))} xs)) @@ -1389,13 +1389,13 @@ ... then))) ("lux def type tagged" Monad {#Named [..prelude_module "Monad"] - (All (_ !) - (Tuple (All (_ a) - (-> a ($' ! a))) - (All (_ a b) - (-> (-> a ($' ! b)) - ($' ! a) - ($' ! b)))))} + (All (_ !) + (Tuple (All (_ a) + (-> a ($' ! a))) + (All (_ a b) + (-> (-> a ($' ! b)) + ($' ! a) + ($' ! b)))))} ["in" "then"] #0) @@ -1407,7 +1407,7 @@ #then (function' [f ma] ({#None #None - {#Some a} (f a)} + {#Some a} (f a)} ma))]) (def:''' .private meta_monad @@ -1967,10 +1967,10 @@ (def:''' .private (digit::format digit) (-> Nat Text) ({0 "0" - 1 "1" 2 "2" 3 "3" - 4 "4" 5 "5" 6 "6" - 7 "7" 8 "8" 9 "9" - _ ("lux io error" "@digit::format Undefined behavior.")} + 1 "1" 2 "2" 3 "3" + 4 "4" 5 "5" 6 "6" + 7 "7" 8 "8" 9 "9" + _ ("lux io error" "@digit::format Undefined behavior.")} digit)) (def:''' .private (nat\encoded value) @@ -2252,31 +2252,31 @@ (` (Tuple (~+ (list\each normal_type members)))) [_ {#Form {#Item [_ {#Text "lux in-module"}] - {#Item [_ {#Text module}] - {#Item type' - #End}}}}] + {#Item [_ {#Text module}] + {#Item type' + #End}}}}] (` ("lux in-module" (~ (text$ module)) (~ (normal_type type')))) [_ {#Form {#Item [_ {#Identifier ["" ":~"]}] {#Item expression #End}}}] expression [_0 {#Form {#Item [_1 {#Variant {#Item binding {#Item body #End}}}] - {#Item value - #End}}}] + {#Item value + #End}}}] [_0 {#Form {#Item [_1 {#Variant {#Item binding {#Item (normal_type body) #End}}}] - {#Item value - #End}}}] + {#Item value + #End}}}] [_0 {#Form {#Item [_1 {#Identifier ["library/lux" "__adjusted_quantified_type__"]}] - {#Item _permission - {#Item _level - {#Item body - #End}}}}}] + {#Item _permission + {#Item _level + {#Item body + #End}}}}}] [_0 {#Form {#Item [_1 {#Identifier [..prelude_module "__adjusted_quantified_type__"]}] - {#Item _permission - {#Item _level - {#Item (normal_type body) - #End}}}}}] + {#Item _permission + {#Item _level + {#Item (normal_type body) + #End}}}}}] [_ {#Form {#Item type_fn args}}] (list\mix ("lux type check" (-> Code Code Code) @@ -2331,7 +2331,7 @@ (All (_ a) (-> ($' List a) Bit)) ({#End #1 - _ #0} + _ #0} xs)) (template [<name> <type> <value>] @@ -2356,7 +2356,7 @@ #seed ("lux i64 +" 1 seed) #expected expected #location location #extensions extensions #scope_type_vars scope_type_vars #eval _eval] - (local_identifier$ ($_ text\composite "__gensym__" prefix (nat\encoded seed)))}} + (local_identifier$ ($_ text\composite "__gensym__" prefix (nat\encoded seed)))}} state)) (macro:' .public (exec tokens) @@ -2413,8 +2413,8 @@ (def:' .private (expander branches) (-> (List Code) (Meta (List Code))) ({{#Item [_ {#Form {#Item [_ {#Identifier name}] args}}] - {#Item body - branches'}} + {#Item body + branches'}} (do meta_monad [??? (macro? name)] (if ??? @@ -3257,7 +3257,7 @@ {#Some type''} (let [typeC (` {#.Named [(~ (text$ module_name)) (~ (text$ name))] - (.type (~ type''))})] + (.type (~ type''))})] (in_meta (list (case labels?? {#Some labels} (` ("lux def type tagged" (~ type_name) @@ -4947,7 +4947,7 @@ (-> (List Code) (Meta Code))) (case (list\reversed elems) {#Item [_ {#Form {#Item [[_ {#Identifier ["" "~+"]}] {#Item [spliced #End]}]}}] - inits} + inits} (do meta_monad [=inits (monad\each meta_monad untemplated_pattern (list\reversed inits))] (in (` [(~ g!meta) {<tag> (~ (untemplated_list& spliced =inits))}]))) diff --git a/stdlib/source/library/lux/control/concurrency/stm.lux b/stdlib/source/library/lux/control/concurrency/stm.lux index 382859176..722a2f78f 100644 --- a/stdlib/source/library/lux/control/concurrency/stm.lux +++ b/stdlib/source/library/lux/control/concurrency/stm.lux @@ -119,11 +119,11 @@ {#.Item [#var (:as (Var Any) _var) #original (:as Any _original) #current (:as Any value)] - tx'} + tx'} {#.Item [#var _var #original _original #current _current] - (with_updated_var var value tx')}))) + (with_updated_var var value tx')}))) (def: .public (write value var) (All (_ a) (-> a (Var a) (STM Any))) diff --git a/stdlib/source/library/lux/control/exception.lux b/stdlib/source/library/lux/control/exception.lux index 3ea07e3e7..5c8231e72 100644 --- a/stdlib/source/library/lux/control/exception.lux +++ b/stdlib/source/library/lux/control/exception.lux @@ -149,7 +149,7 @@ (list\mix (function (_ entry [index next]) [(++ index) {#.Item [(n\encoded index) (format entry)] - next}]) + next}]) [0 #.End]) product.right list.reversed diff --git a/stdlib/source/library/lux/control/region.lux b/stdlib/source/library/lux/control/region.lux index 934daf578..65b8e53e9 100644 --- a/stdlib/source/library/lux/control/region.lux +++ b/stdlib/source/library/lux/control/region.lux @@ -66,7 +66,7 @@ (All (_ r) (Region r ! a)))) (function (_ [region cleaners]) (\ monad in [{#.Item (function (_ region) (cleaner value)) - cleaners} + cleaners} {#try.Success value}]))) (implementation: .public (functor super) diff --git a/stdlib/source/library/lux/control/writer.lux b/stdlib/source/library/lux/control/writer.lux index 6d824d2eb..bcf7e8d77 100644 --- a/stdlib/source/library/lux/control/writer.lux +++ b/stdlib/source/library/lux/control/writer.lux @@ -66,8 +66,8 @@ (: {#.Apply (Writer (:parameter 0) {#.Apply (Writer (:parameter 0) (:parameter 2)) - (:parameter 1)}) - (:parameter 1)} + (:parameter 1)}) + (:parameter 1)} MlMla)] ... On new compiler MlMla) diff --git a/stdlib/source/library/lux/data/collection/array.lux b/stdlib/source/library/lux/data/collection/array.lux index 31cfc865b..73cc3e9d0 100644 --- a/stdlib/source/library/lux/data/collection/array.lux +++ b/stdlib/source/library/lux/data/collection/array.lux @@ -303,7 +303,7 @@ _ (recur (-- idx) {#.Item (maybe.else default (read! idx array)) - output})))) + output})))) (def: .public (list default array) (All (_ a) (-> (Maybe a) (Array a) (List a))) diff --git a/stdlib/source/library/lux/data/collection/dictionary.lux b/stdlib/source/library/lux/data/collection/dictionary.lux index bc78d8032..0b9690eb3 100644 --- a/stdlib/source/library/lux/data/collection/dictionary.lux +++ b/stdlib/source/library/lux/data/collection/dictionary.lux @@ -60,8 +60,8 @@ (Variant {#Hierarchy Nat (Array (Node k v))} {#Base Bit_Map - (Array (Either (Node k v) - [k v]))} + (Array (Either (Node k v) + [k v]))} {#Collisions Hash_Code (Array [k v])})) ... #Hierarchy nodes are meant to point down only to lower-level nodes. @@ -309,8 +309,8 @@ _ [(++ _size) empty_node])] {#Hierarchy _size' - (array\revised idx (node\has (level_up level) hash key val key_hash sub_node) - hierarchy)}) + (array\revised idx (node\has (level_up level) hash key val key_hash sub_node) + hierarchy)}) ... For #Base nodes, check if the corresponding Bit_Position has ... already been used. @@ -361,14 +361,14 @@ ... If so, resize the #Base node to accommodate the ... new KV-pair. {#Base (with_bit_position bit bitmap) - (array\has (base_index bit bitmap) {#.Right [key val]} base)} + (array\has (base_index bit bitmap) {#.Right [key val]} base)} ... Otherwise, promote it to a #Hierarchy node, and add the new ... KV-pair as a singleton node to it. {#Hierarchy (++ base_count) - (|> base - (promotion node\has key_hash level bitmap) - (array.write! (level_index level hash) - (node\has (level_up level) hash key val key_hash empty_node)))})))) + (|> base + (promotion node\has key_hash level bitmap) + (array.write! (level_index level hash) + (node\has (level_up level) hash key val key_hash empty_node)))})))) ... For #Collisions nodes, compare the hashes. {#Collisions _hash _colls} @@ -387,8 +387,8 @@ ... If the hashes are not equal, create a new #Base node that ... contains the old #Collisions node, plus the new KV-pair. (|> {#Base (level_bit_position level _hash) - (|> (array.empty 1) - (array.write! 0 {#.Left node}))} + (|> (array.empty 1) + (array.write! 0 {#.Left node}))} (node\has level hash key val key_hash))) )) @@ -446,11 +446,11 @@ ... But if not, then just unset the position and ... remove the node. {#Base (without_bit_position bit bitmap) - (array\lacks idx base)}) + (array\lacks idx base)}) ... But, if it did not come out empty, then the ... position is kept, and the node gets updated. {#Base bitmap - (array\revised idx {#.Left sub_node'} base)}))) + (array\revised idx {#.Left sub_node'} base)}))) ... If, however, there was a KV-pair instead of a sub-node. {#.Some {#.Right [key' val']}} @@ -458,7 +458,7 @@ (if (\ key_hash = key key') ... If so, remove the KV-pair and unset the Bit_Position. {#Base (without_bit_position bit bitmap) - (array\lacks idx base)} + (array\lacks idx base)} ... Otherwise, there's nothing to remove. node) diff --git a/stdlib/source/library/lux/data/collection/dictionary/plist.lux b/stdlib/source/library/lux/data/collection/dictionary/plist.lux index 85fec4622..bb7f63265 100644 --- a/stdlib/source/library/lux/data/collection/dictionary/plist.lux +++ b/stdlib/source/library/lux/data/collection/dictionary/plist.lux @@ -66,9 +66,9 @@ {#.Item [k' v'] properties'} (if (text\= key k') {#.Item [key val] - properties'} + properties'} {#.Item [k' v'] - (has key val properties')}))) + (has key val properties')}))) (def: .public (revised key f properties) (All (_ a) (-> Text (-> a a) (PList a) (PList a))) @@ -91,7 +91,7 @@ (if (text\= key k') properties' {#.Item [k' v'] - (lacks key properties')}))) + (lacks key properties')}))) (def: .public equivalence (All (_ a) (-> (Equivalence a) (Equivalence (PList a)))) diff --git a/stdlib/source/library/lux/data/collection/list.lux b/stdlib/source/library/lux/data/collection/list.lux index 5c630614b..e2cb06a42 100644 --- a/stdlib/source/library/lux/data/collection/list.lux +++ b/stdlib/source/library/lux/data/collection/list.lux @@ -468,7 +468,7 @@ (case [(~+ list_vars)] (~ pattern) {#.Item [(~+ (each product.left vars+lists))] - ((~ g!step) (~+ list_vars))} + ((~ g!step) (~+ list_vars))} (~ g!blank) #.End))))] @@ -511,7 +511,7 @@ (case [(~+ list_vars)] (~ pattern) {#.Item ((~ g!func) (~+ (each product.left vars+lists))) - ((~ g!step) (~ g!func) (~+ list_vars))} + ((~ g!step) (~ g!func) (~+ list_vars))} (~ g!blank) #.End))))] diff --git a/stdlib/source/library/lux/data/collection/tree/zipper.lux b/stdlib/source/library/lux/data/collection/tree/zipper.lux index 313a61909..60c11d032 100644 --- a/stdlib/source/library/lux/data/collection/tree/zipper.lux +++ b/stdlib/source/library/lux/data/collection/tree/zipper.lux @@ -108,12 +108,12 @@ (Tree (:parameter 0))) (with@ #//.children (list\composite (list.reversed lefts) {#.Item (value@ #node zipper) - rights}))) + rights}))) parent)] (with@ [#node #//.children] (list\composite (list.reversed lefts) {#.Item (value@ #node zipper) - rights}) + rights}) parent)))))) (template [<one> <all> <side> <op_side>] diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index 0ccc11f86..10f8723c0 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -395,7 +395,7 @@ #.None (` {#.Primitive (~ (code.text array.type_name)) - {#.Item (~ (value_type mode elementT)) #.End}}))])) + {#.Item (~ (value_type mode elementT)) #.End}}))])) (undefined) ))) diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux index ce87fcbec..c59ae94e8 100644 --- a/stdlib/source/library/lux/ffi.old.lux +++ b/stdlib/source/library/lux/ffi.old.lux @@ -766,9 +766,9 @@ #member_privacy pm #member_anns annotations] {#VirtualMethod final? strict_fp? - method_vars - this_name arg_decls return_type - body exs}])))) + method_vars + this_name arg_decls return_type + body exs}])))) (def: overriden_method_def^ (Parser [Member_Declaration Method_Definition]) @@ -789,9 +789,9 @@ #member_privacy #PublicP #member_anns annotations] {#OverridenMethod strict_fp? - owner_class method_vars - this_name arg_decls return_type - body exs}])))) + owner_class method_vars + this_name arg_decls return_type + body exs}])))) (def: static_method_def^ (Parser [Member_Declaration Method_Definition]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux index 70623af8a..59ecb1717 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux @@ -153,8 +153,8 @@ (in {#Variant (if right? {#.Some idx} #.None) - (|> (dictionary.empty n.hash) - (dictionary.has idx value_coverage))})))) + (|> (dictionary.empty n.hash) + (dictionary.has idx value_coverage))})))) (def: (xor left right) (-> Bit Bit Bit) @@ -270,7 +270,7 @@ _ allA) - casesM}))))) + casesM}))))) [{#Seq leftA rightA} {#Seq leftSF rightSF}] (case [(coverage/= leftSF leftA) (coverage/= rightSF rightA)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux index c0733c07a..5b1ba0a7b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux @@ -96,7 +96,7 @@ (<| (\ ! each (.function (_ [scope bodyA]) {#/.Function (list\each (|>> /.variable) (//scope.environment scope)) - bodyA})) + bodyA})) /.with_scope ... Functions have access not only to their argument, but ... also to themselves, through a local variable. diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/inference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/inference.lux index 47768945d..68fafe17f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/inference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/inference.lux @@ -87,7 +87,7 @@ (^template [<tag>] [{<tag> env quantified} {<tag> (list\each (replace parameter_idx replacement) env) - (replace (n.+ 2 parameter_idx) replacement quantified)}]) + (replace (n.+ 2 parameter_idx) replacement quantified)}]) ([#.UnivQ] [#.ExQ]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/scope.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/scope.lux index 2b3e9f411..cb737d36d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/scope.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/scope.lux @@ -98,7 +98,7 @@ (|>> (revised@ #.counter ++) (revised@ #.mappings (plist.has name [ref_type (product.left ref+inner)])))) scope) - (product.right ref+inner)}])) + (product.right ref+inner)}])) [init_ref #.End] (list.reversed inner)) scopes (list\composite inner' outer)] @@ -127,7 +127,7 @@ (case (value@ #.scopes state') {#.Item head' tail'} (let [scopes' {#.Item (with@ #.locals (value@ #.locals head) head') - tail'}] + tail'}] {#try.Success [[bundle' (with@ #.scopes scopes' state')] output]}) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux index bc9151306..f9cf0b336 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux @@ -162,7 +162,7 @@ (def: .public (inheritance_relationship_type class super_class super_interfaces) (-> .Type .Type (List .Type) .Type) {#.Primitive ..inheritance_relationship_type_name - (list& class super_class super_interfaces)}) + (list& class super_class super_interfaces)}) ... TODO: Get rid of this template block and use the definition in ... lux/ffi.jvm.lux ASAP @@ -419,7 +419,7 @@ [_ (typeA.infer ..int) arrayA (typeA.with_type {#.Primitive (|> (jvm.array primitive_type) ..reflection) - (list)} + (list)} (analyse archive arrayC))] (in {#/////analysis.Extension extension_name (list arrayA)})) @@ -453,7 +453,7 @@ [lengthA (typeA.with_type ..int (analyse archive lengthC)) _ (typeA.infer {#.Primitive (|> (jvm.array primitive_type) ..reflection) - (list)})] + (list)})] (in {#/////analysis.Extension extension_name (list lengthA)})) _ @@ -485,7 +485,7 @@ (-> .Type (Operation (Type Parameter))) (case objectT (^ {#.Primitive (static array.type_name) - (list elementT)}) + (list elementT)}) (/////analysis.except ..non_parameter objectT) {#.Primitive name parameters} @@ -571,7 +571,7 @@ (phase\in (jvm.class name (list))))) (^ {#.Primitive (static array.type_name) - (list elementT)}) + (list elementT)}) (|> elementT check_jvm (phase\each jvm.array)) @@ -625,7 +625,7 @@ idxA (typeA.with_type ..int (analyse archive idxC)) arrayA (typeA.with_type {#.Primitive (|> (jvm.array jvm_type) ..reflection) - (list)} + (list)} (analyse archive arrayC))] (in {#/////analysis.Extension extension_name (list idxA arrayA)})) @@ -657,7 +657,7 @@ (def: (write_primitive_array_handler lux_type jvm_type) (-> .Type (Type Primitive) Handler) (let [array_type {#.Primitive (|> (jvm.array jvm_type) ..reflection) - (list)}] + (list)}] (function (_ extension_name analyse archive args) (case args (^ (list idxC valueC arrayC)) @@ -886,7 +886,7 @@ #.None (if (java/lang/reflect/Modifier::isInterface (java/lang/Class::getModifiers source_class)) {#.Item (:as java/lang/reflect/Type (ffi.class_for java/lang/Object)) - (array.list #.None (java/lang/Class::getGenericInterfaces source_class))} + (array.list #.None (java/lang/Class::getGenericInterfaces source_class))} (array.list #.None (java/lang/Class::getGenericInterfaces source_class))))))) (def: (inheritance_candidate_parents class_loader fromT target_class toT fromC) @@ -1458,11 +1458,11 @@ (undefined))] outputJT (check_return outputT)] (in {#/////analysis.Extension extension_name - (list& (/////analysis.text (..signature (jvm.class class_name (list)))) - (/////analysis.text method) - (/////analysis.text (..signature outputJT)) - objectA - (decorate_inputs argsT argsA))})))])) + (list& (/////analysis.text (..signature (jvm.class class_name (list)))) + (/////analysis.text method) + (/////analysis.text (..signature outputJT)) + objectA + (decorate_inputs argsT argsA))})))])) (def: (invoke::constructor class_loader) (-> java/lang/ClassLoader Handler) @@ -1967,24 +1967,24 @@ 2 {#/////analysis.Case (/////analysis.unit) - [[#/////analysis.when - {#/////analysis.Bind 2} + [[#/////analysis.when + {#/////analysis.Bind 2} - #/////analysis.then - bodyA] - (list)]} + #/////analysis.then + bodyA] + (list)]} _ {#/////analysis.Case (/////analysis.unit) - [[#/////analysis.when - {#/////analysis.Complex - {#/////analysis.Tuple (|> arity - list.indices - (list\each (|>> (n.+ 2) #/////analysis.Bind)))}} + [[#/////analysis.when + {#/////analysis.Complex + {#/////analysis.Tuple (|> arity + list.indices + (list\each (|>> (n.+ 2) #/////analysis.Bind)))}} - #/////analysis.then - bodyA] - (list)]}))) + #/////analysis.then + bodyA] + (list)]}))) (def: .public (analyse_overriden_method analyse archive selfT mapping supers method) (-> Phase Archive .Type Mapping (List (Type Class)) (Overriden_Method Code) (Operation Analysis)) @@ -2169,10 +2169,10 @@ _ (..require_complete_method_concretion class_loader supers methods) methodsA (monad.each ! (analyse_overriden_method analyse archive selfT mapping supers) methods)] (in {#/////analysis.Extension extension_name - (list (class_analysis super_class) - (/////analysis.tuple (list\each class_analysis super_interfaces)) - (/////analysis.tuple (list\each typed_analysis constructor_argsA+)) - (/////analysis.tuple methodsA))})))])) + (list (class_analysis super_class) + (/////analysis.tuple (list\each class_analysis super_interfaces)) + (/////analysis.tuple (list\each typed_analysis constructor_argsA+)) + (/////analysis.tuple methodsA))})))])) (def: (bundle::class class_loader) (-> java/lang/ClassLoader Bundle) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux index 6d5f5fdd5..0fb66d830 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux @@ -27,7 +27,7 @@ ["[0]" reference] ["//" common_lisp "_" ["[1][0]" runtime {"+" [Operation Phase Handler Bundle - with_vars]}]]] + with_vars]}]]] ["/[1]" // "_" ["[0]" generation] ["//[1]" /// "_" diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux index 994a9f33f..15a73026e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux @@ -132,7 +132,7 @@ (apply (n.+ ..this_offset arity_inputs) additional_inputs) _.areturn)) -... (i.< over_extent (.int stage)) + ... (i.< over_extent (.int stage)) (let [current_environment (|> (list.indices (list.size environment)) (list\each (///foreign.get class)) (monad.all _.monad)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux index 50b89c2e2..6722a4e4e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux @@ -119,7 +119,7 @@ [_ {#/.Alt old_left old_right}] {#/.Alt old_left - (weave new old_right)} + (weave new old_right)} [{#/.Seq preN postN} {#/.Seq preO postO}] @@ -137,30 +137,30 @@ {#/.Bit_Fork old_when old_then old_else}] (if (bit\= new_when old_when) {#/.Bit_Fork old_when - (weave new_then old_then) - (case [new_else old_else] - [#.None #.None] - #.None + (weave new_then old_then) + (case [new_else old_else] + [#.None #.None] + #.None - (^or [{#.Some woven_then} #.None] - [#.None {#.Some woven_then}]) - {#.Some woven_then} + (^or [{#.Some woven_then} #.None] + [#.None {#.Some woven_then}]) + {#.Some woven_then} - [{#.Some new_else} {#.Some old_else}] - {#.Some (weave new_else old_else)})} + [{#.Some new_else} {#.Some old_else}] + {#.Some (weave new_else old_else)})} {#/.Bit_Fork old_when - (case new_else - #.None - old_then - - {#.Some new_else} - (weave new_else old_then)) - {#.Some (case old_else - #.None - new_then - - {#.Some old_else} - (weave new_then old_else))}}) + (case new_else + #.None + old_then + + {#.Some new_else} + (weave new_else old_then)) + {#.Some (case old_else + #.None + new_then + + {#.Some old_else} + (weave new_then old_else))}}) (^template [<tag> <equivalence>] [[{<tag> new_fork} {<tag> old_fork}] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux index 757bdb4c3..17399b478 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux @@ -40,29 +40,29 @@ (function (recur path) (case path {#/.Seq {#/.Bind register} - post} + post} (if (n.= redundant register) (recur post) {#/.Seq {#/.Bind (if (n.> redundant register) (-- register) register)} - (recur post)}) + (recur post)}) (^or {#/.Seq {#/.Access {#/.Member member}} - {#/.Seq {#/.Bind register} - post}} + {#/.Seq {#/.Bind register} + post}} ... This alternative form should never occur in practice. ... Yet, it is "technically" possible to construct it. {#/.Seq {#/.Seq {#/.Access {#/.Member member}} - {#/.Bind register}} - post}) + {#/.Bind register}} + post}) (if (n.= redundant register) (recur post) {#/.Seq {#/.Access {#/.Member member}} - {#/.Seq {#/.Bind (if (n.> redundant register) - (-- register) - register)} - (recur post)}}) + {#/.Seq {#/.Bind (if (n.> redundant register) + (-- register) + register)} + (recur post)}}) (^template [<tag>] [{<tag> left right} @@ -132,8 +132,8 @@ {#/.Branch (case branch {#/.Let input register output} {#/.Let (recur input) - (..prune redundant register) - (recur output)} + (..prune redundant register) + (recur output)} {#/.If test then else} {#/.If (recur test) (recur then) (recur else)} @@ -373,8 +373,8 @@ (in [(dictionary.lacks register redundancy) {#/.Control (if redundant? {#/.Branch {#/.Case input - {#/.Seq #/.Pop - {#/.Then (..remove_local register output)}}}} + {#/.Seq #/.Pop + {#/.Then (..remove_local register output)}}}} {#/.Branch {#/.Let input register output}})}])) {#/.If test then else} diff --git a/stdlib/source/library/lux/type.lux b/stdlib/source/library/lux/type.lux index c99823da1..d01e2948b 100644 --- a/stdlib/source/library/lux/type.lux +++ b/stdlib/source/library/lux/type.lux @@ -250,7 +250,7 @@ (case type {#.Primitive name params} (` {#.Primitive (~ (code.text name)) - (.list (~+ (list\each code params)))}) + (.list (~+ (list\each code params)))}) (^template [<tag>] [{<tag> idx} @@ -260,7 +260,7 @@ (^template [<tag>] [{<tag> left right} (` {<tag> (~ (code left)) - (~ (code right))})]) + (~ (code right))})]) ([#.Sum] [#.Product] [#.Function] [#.Apply]) {#.Named name sub_type} @@ -269,7 +269,7 @@ (^template [<tag>] [{<tag> env body} (` {<tag> (.list (~+ (list\each code env))) - (~ (code body))})]) + (~ (code body))})]) ([#.UnivQ] [#.ExQ]) )) diff --git a/stdlib/source/library/lux/type/abstract.lux b/stdlib/source/library/lux/type/abstract.lux index d3a6b5c35..2b4466d71 100644 --- a/stdlib/source/library/lux/type/abstract.lux +++ b/stdlib/source/library/lux/type/abstract.lux @@ -109,9 +109,9 @@ {#.Item [head_name head] tail} (if (text\= <reference> head_name) {#.Item [head_name <then>] - tail} + tail} {#.Item [head_name head] - (recur tail)}) + (recur tail)}) #.End (undefined)))]) diff --git a/stdlib/source/library/lux/type/check.lux b/stdlib/source/library/lux/type/check.lux index c7001e71f..b0ea2a745 100644 --- a/stdlib/source/library/lux/type/check.lux +++ b/stdlib/source/library/lux/type/check.lux @@ -138,7 +138,7 @@ (-> Var Type_Vars (Maybe (Maybe Type))) (case plist {#.Item [var_id var_type] - plist'} + plist'} (if (!n\= id var_id) {#.Some var_type} (var::get id plist')) @@ -153,12 +153,12 @@ (list [id value]) {#.Item [var_id var_type] - plist'} + plist'} (if (!n\= id var_id) {#.Item [var_id value] - plist'} + plist'} {#.Item [var_id var_type] - (var::put id value plist')}))) + (var::put id value plist')}))) (def: .public (result context proc) (All (_ a) (-> Type_Context (Check a) (Try a))) diff --git a/stdlib/source/library/lux/type/poly.lux b/stdlib/source/library/lux/type/poly.lux index 64c5abe51..1656e88ca 100644 --- a/stdlib/source/library/lux/type/poly.lux +++ b/stdlib/source/library/lux/type/poly.lux @@ -53,7 +53,7 @@ (`` (case type {#.Primitive name params} (` {#.Primitive (~ (code.text name)) - (.list (~+ (list\each (code env) params)))}) + (.list (~+ (list\each (code env) params)))}) (^template [<tag>] [{<tag> idx} @@ -67,7 +67,7 @@ (` (.$ (~ (code.nat (-- idx))))))) {#.Apply {#.Primitive "" #.End} - {#.Parameter idx}} + {#.Parameter idx}} (case (<type>.adjusted_idx env idx) 0 (|> env (dictionary.value 0) maybe.trusted product.left (code env)) idx (undefined)) @@ -75,7 +75,7 @@ (^template [<tag>] [{<tag> left right} (` {<tag> (~ (code env left)) - (~ (code env right))})]) + (~ (code env right))})]) ([#.Function] [#.Apply]) (^template [<macro> <tag> <flattener>] @@ -90,6 +90,6 @@ (^template [<tag>] [{<tag> scope body} (` {<tag> (.list (~+ (list\each (code env) scope))) - (~ (code env body))})]) + (~ (code env body))})]) ([#.UnivQ] [#.ExQ]) ))) diff --git a/stdlib/source/library/lux/world/file/watch.lux b/stdlib/source/library/lux/world/file/watch.lux index 46308d6e3..e014fc157 100644 --- a/stdlib/source/library/lux/world/file/watch.lux +++ b/stdlib/source/library/lux/world/file/watch.lux @@ -279,7 +279,7 @@ (if (n.< size idx) (recur (++ idx) {#.Item (java/util/List::get (.int idx) list) - output}) + output}) output)))) (import: (java/nio/file/WatchEvent$Kind a)) @@ -387,7 +387,7 @@ (:as //.Path))] concern (..default_key_concern key)] (recur {#.Item [concern path] - output})) + output})) (recur output))) #.None diff --git a/stdlib/source/library/lux/world/program.lux b/stdlib/source/library/lux/world/program.lux index eb0fe35cf..4858d01f0 100644 --- a/stdlib/source/library/lux/world/program.lux +++ b/stdlib/source/library/lux/world/program.lux @@ -138,7 +138,7 @@ (All (_ a) (-> (java/util/Iterator a) (List a))) (if (java/util/Iterator::hasNext iterator) {#.Item (java/util/Iterator::next iterator) - (jvm\\consume iterator)} + (jvm\\consume iterator)} #.End)) )] (for [@.old (as_is <jvm>) diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux index 64ff5d7b7..5ac1e126a 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot.lux @@ -46,8 +46,8 @@ (def: local_copy_format XML {#xml.Node <local_copy> - xml.attributes - (list {#xml.Text ..local_copy_value})}) + xml.attributes + (list {#xml.Text ..local_copy_value})}) (def: local_copy_parser (Parser Any) diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index b56c66104..d0bdf887e 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -99,13 +99,13 @@ (def: .public (format value) (-> Metadata XML) {#xml.Node ..<metadata> - xml.attributes - (list (..group_format (value@ #group value)) - (..name_format (value@ #name value)) - {#xml.Node ..<versioning> - xml.attributes - (list (..versions_format (value@ #versions value)) - (..last_updated_format (value@ #last_updated value)))})}) + xml.attributes + (list (..group_format (value@ #group value)) + (..name_format (value@ #name value)) + {#xml.Node ..<versioning> + xml.attributes + (list (..versions_format (value@ #versions value)) + (..last_updated_format (value@ #last_updated value)))})}) (def: (text tag) (-> xml.Tag (Parser Text)) diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux index 58792b042..05a065c6f 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -73,11 +73,11 @@ (-> Metadata XML) (let [(^slots [#///artifact.group #///artifact.name #///artifact.version]) artifact] {#xml.Node ..<metadata> - xml.attributes - (list (..group_format group) - (..name_format name) - (..version_format version) - (///artifact/versioning.format versioning))})) + xml.attributes + (list (..group_format group) + (..name_format name) + (..version_format version) + (///artifact/versioning.format versioning))})) (def: (text tag) (-> xml.Tag (Parser Text)) diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index 62757c9b0..923c69cbc 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -53,12 +53,12 @@ [#origin {#//origin.Local ""} #library [library {#//status.Verified (//hash.sha-1 library) - (//hash.md5 library)}] + (//hash.md5 library)}] #pom (let [binary_pom (|> pom (\ xml.codec encoded) (\ utf8.codec encoded))] [pom binary_pom {#//status.Verified (//hash.sha-1 binary_pom) - (//hash.md5 binary_pom)}])]) + (//hash.md5 binary_pom)}])]) (def: .public dependencies (-> Package (Try (Set Dependency))) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index 49e3793fe..e98730532 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -48,13 +48,13 @@ (def: version XML {#_.Node ["" "modelVersion"] _.attributes - (list {#_.Text "4.0.0"})}) + (list {#_.Text "4.0.0"})}) (def: (property tag value) (-> Text Text XML) {#_.Node ["" tag] - _.attributes - (list {#_.Text value})}) + _.attributes + (list {#_.Text value})}) (def: (artifact value) (-> Artifact (List XML)) @@ -84,9 +84,9 @@ (def: (dependency value) (-> Dependency XML) {#_.Node ["" ..dependency_tag] - _.attributes - (list\composite (..artifact (value@ #//dependency.artifact value)) - (list (..property "type" (value@ #//dependency.type value))))}) + _.attributes + (list\composite (..artifact (value@ #//dependency.artifact value)) + (list (..property "type" (value@ #//dependency.type value))))}) (def: (group tag) (-> Text (-> (List XML) XML)) @@ -144,12 +144,12 @@ {#.Some identity} {#try.Success {#_.Node ["" ..project_tag] _.attributes - ($_ list\composite - (list ..version) - (..artifact identity) - (|> value (value@ #/.repositories) set.list (list\each ..repository) (..group "repositories") list) - (|> value (value@ #/.dependencies) set.list (list\each ..dependency) (..group ..dependencies_tag) list) - )}} + ($_ list\composite + (list ..version) + (..artifact identity) + (|> value (value@ #/.repositories) set.list (list\each ..repository) (..group "repositories") list) + (|> value (value@ #/.dependencies) set.list (list\each ..dependency) (..group ..dependencies_tag) list) + )}} _ (exception.except /.no_identity []))) diff --git a/stdlib/source/specification/compositor/analysis/type.lux b/stdlib/source/specification/compositor/analysis/type.lux index f0856eb1f..007c2fbc4 100644 --- a/stdlib/source/specification/compositor/analysis/type.lux +++ b/stdlib/source/specification/compositor/analysis/type.lux @@ -23,8 +23,8 @@ (def: (check_success+ expander state extension params output_type) (-> Expander State+ Text (List Code) Type Bit) (|> (analysis/scope.with_scope "" - (analysis/type.with_type output_type - (analysis.phase expander (` ((~ (code.text extension)) (~+ params)))))) + (analysis/type.with_type output_type + (analysis.phase expander (` ((~ (code.text extension)) (~+ params)))))) (phase.result state) (case> {#try.Success _} true diff --git a/stdlib/source/specification/compositor/generation/common.lux b/stdlib/source/specification/compositor/generation/common.lux index 9c03349f4..7aad9a7a7 100644 --- a/stdlib/source/specification/compositor/generation/common.lux +++ b/stdlib/source/specification/compositor/generation/common.lux @@ -59,8 +59,8 @@ <binary> (_.test "lux i64 arithmetic-right-shift" (|> {#synthesis.Extension "lux i64 arithmetic-right-shift" - (list (synthesis.i64 subject) - (synthesis.i64 param))} + (list (synthesis.i64 subject) + (synthesis.i64 param))} (run (..safe "lux i64 arithmetic-right-shift")) (case> {#try.Success valueT} ("lux i64 =" @@ -231,8 +231,8 @@ false))) (_.test "Can find index of sub-text." (and (|> {#synthesis.Extension "lux text index" - (list concatenatedS sample_lowerS - (synthesis.i64 +0))} + (list concatenatedS sample_lowerS + (synthesis.i64 +0))} (run (..safe "lux text index")) (case> (^multi {#try.Success valueV} [(:as (Maybe Nat) valueV) @@ -242,8 +242,8 @@ _ false)) (|> {#synthesis.Extension "lux text index" - (list concatenatedS sample_upperS - (synthesis.i64 +0))} + (list concatenatedS sample_upperS + (synthesis.i64 +0))} (run (..safe "lux text index")) (case> (^multi {#try.Success valueV} [(:as (Maybe Nat) valueV) @@ -255,9 +255,9 @@ (let [test_clip (: (-> (I64 Any) (I64 Any) Text Bit) (function (_ offset length expected) (|> {#synthesis.Extension "lux text clip" - (list concatenatedS - (synthesis.i64 offset) - (synthesis.i64 length))} + (list concatenatedS + (synthesis.i64 offset) + (synthesis.i64 length))} (run (..safe "lux text clip")) (case> (^multi {#try.Success valueV} [(:as (Maybe Text) valueV) @@ -271,8 +271,8 @@ (test_clip sample_size sample_size sample_upper)))) (_.test "Can extract individual characters from text." (|> {#synthesis.Extension "lux text char" - (list sample_lowerS - (synthesis.i64 char_idx))} + (list sample_lowerS + (synthesis.i64 char_idx))} (run (..safe "lux text char")) (case> (^multi {#try.Success valueV} [(:as (Maybe Int) valueV) @@ -291,7 +291,7 @@ ($_ _.and (_.test "Can log messages." (|> {#synthesis.Extension "lux io log" - (list (synthesis.text (format "LOG: " message)))} + (list (synthesis.text (format "LOG: " message)))} (run (..safe "lux io log")) (case> {#try.Success valueV} true @@ -300,11 +300,11 @@ false))) (_.test "Can throw runtime errors." (and (|> {#synthesis.Extension "lux try" - (list (synthesis.function/abstraction - [#synthesis.environment (list) - #synthesis.arity 1 - #synthesis.body {#synthesis.Extension "lux io error" - (list (synthesis.text message))}]))} + (list (synthesis.function/abstraction + [#synthesis.environment (list) + #synthesis.arity 1 + #synthesis.body {#synthesis.Extension "lux io error" + (list (synthesis.text message))}]))} (run (..safe "lux try")) (case> (^multi {#try.Success valueV} [(:as (Try Text) valueV) @@ -314,10 +314,10 @@ _ false)) (|> {#synthesis.Extension "lux try" - (list (synthesis.function/abstraction - [#synthesis.environment (list) - #synthesis.arity 1 - #synthesis.body (synthesis.text message)]))} + (list (synthesis.function/abstraction + [#synthesis.environment (list) + #synthesis.arity 1 + #synthesis.body (synthesis.text message)]))} (run (..safe "lux try")) (case> (^multi {#try.Success valueV} [(:as (Try Text) valueV) diff --git a/stdlib/source/test/lux/control/parser/xml.lux b/stdlib/source/test/lux/control/parser/xml.lux index 15c1fdd88..511f56e78 100644 --- a/stdlib/source/test/lux/control/parser/xml.lux +++ b/stdlib/source/test/lux/control/parser/xml.lux @@ -101,16 +101,16 @@ (//.after (/.attribute expected_attribute)) (//\in [])) (list {#xml.Node expected_tag - (|> (dictionary.empty name.hash) - (dictionary.has expected_attribute expected_value)) - (list)})) + (|> (dictionary.empty name.hash) + (dictionary.has expected_attribute expected_value)) + (list)})) (!expect {#try.Success []})))) (!failure /.unknown_attribute [[(/.attribute ["" expected]) {#xml.Node [expected expected] - (|> (dictionary.empty name.hash) - (dictionary.has [expected ""] expected)) - (list)}]]) + (|> (dictionary.empty name.hash) + (dictionary.has [expected ""] expected)) + (list)}]]) (!failure /.empty_input [[(do //.monad [_ /.any] @@ -125,16 +125,16 @@ (/.node [expected expected] (//\in []))) {#xml.Node [expected expected] - (dictionary.empty name.hash) - (list)}] + (dictionary.empty name.hash) + (list)}] [(do //.monad [_ /.any] (/.node [expected expected] (/.attribute [expected expected]))) {#xml.Node [expected expected] - (|> (dictionary.empty name.hash) - (dictionary.has [expected expected] expected)) - (list)}]]) + (|> (dictionary.empty name.hash) + (dictionary.has [expected expected] expected)) + (list)}]]) (!failure /.unexpected_input [[/.text {#xml.Node [expected expected] (dictionary.empty name.hash) (list)}] diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux index 94dd0e61d..004b8e608 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux @@ -58,9 +58,9 @@ pairs) sorted_values (list\each product.right sorted_pairs) (^open "list\[0]") (list.equivalence (: (Equivalence [Nat Nat]) - (function (_ [kr vr] [ks vs]) - (and (n.= kr ks) - (n.= vr vs))))) + (function (_ [kr vr] [ks vs]) + (and (n.= kr ks) + (n.= vr vs))))) (^open "/\[0]") (/.equivalence n.equivalence)]] ($_ _.and (_.for [/.equivalence] diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux index 38320588c..0e18e595e 100644 --- a/stdlib/source/test/lux/data/collection/tree.lux +++ b/stdlib/source/test/lux/data/collection/tree.lux @@ -79,13 +79,13 @@ (list expected/0 expected/1 expected/2) (/.flat (/.tree expected/0 {expected/1 {} - expected/2 {}}))) + expected/2 {}}))) (\ (list.equivalence n.equivalence) = (list expected/0 expected/1 expected/2 expected/3 expected/4 expected/5) (/.flat (/.tree expected/0 {expected/1 {} - expected/2 {expected/3 {} - expected/4 {expected/5 {}}}}))) + expected/2 {expected/3 {} + expected/4 {expected/5 {}}}}))) ))) ))) diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux index 1e5015f46..0b6a33e05 100644 --- a/stdlib/source/test/lux/data/format/json.lux +++ b/stdlib/source/test/lux/data/format/json.lux @@ -175,11 +175,11 @@ )) (\= {#/.Array <array_row>} (/.json [#null <boolean> <number> <string>])) (let [object (/.json {<key0> #null - <key1> <boolean> - <key2> <number> - <key3> <string> - <key4> [#null <boolean> <number> <string>] - <key5> {<key6> <number>}})] + <key1> <boolean> + <key2> <number> + <key3> <string> + <key4> [#null <boolean> <number> <string>] + <key5> {<key6> <number>}})] (<| (try.else false) (do try.monad [value0 (/.field <key0> object) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux index c152bb5c2..481f8a73e 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux @@ -164,10 +164,10 @@ (do phase.monad [_ (//module.declare_tags variant_tags false {#.Named [module_name variant_name] - (type.variant primitivesT)}) + (type.variant primitivesT)}) _ (//module.declare_tags record_tags false {#.Named [module_name record_name] - (type.tuple primitivesT)})]) + (type.tuple primitivesT)})]) (//module.with_module 0 module_name)))] exhaustive_patterns (exhaustive_branches true variantTC inputC) .let [exhaustive_branchesC (list\each (branch outputC) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux index aaf4f1ae6..166aa24f6 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux @@ -36,8 +36,8 @@ [(def: (<name> procedure params output_type) (-> Text (List Code) Type Bit) (|> (////scope.with_scope "" - (////type.with_type output_type - (_primitive.phase archive.empty (` ((~ (code.text procedure)) (~+ params)))))) + (////type.with_type output_type + (_primitive.phase archive.empty (` ((~ (code.text procedure)) (~+ params)))))) (phase.result _primitive.state) (case> {#try.Success _} <success> diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux index 881c2f678..2c59172e6 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux @@ -172,9 +172,9 @@ then random.nat else random.nat] (in [{#synthesis.Alt {#synthesis.Seq (synthesis.path/bit test) - {#synthesis.Then (synthesis.i64 (.i64 then))}} - {#synthesis.Seq (synthesis.path/bit (not test)) - {#synthesis.Then (synthesis.i64 (.i64 else))}}} + {#synthesis.Then (synthesis.i64 (.i64 then))}} + {#synthesis.Seq (synthesis.path/bit (not test)) + {#synthesis.Then (synthesis.i64 (.i64 else))}}} [[#analysis.when (analysis.pattern/bit test) #analysis.then (analysis.nat then)] (list [#analysis.when (analysis.pattern/bit (not test)) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux index 5396c5b9c..687fc849c 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux @@ -57,7 +57,7 @@ (list\each (|>> #variable.Foreign) (list.indices arity_1)) (list {#variable.Local 1})) - body})) + body})) body (list.reversed (list.indices arity)))) @@ -212,29 +212,29 @@ synthesis.path/pop (synthesis.path/then expected_output))))]) {#analysis.Case actual_input - [[#analysis.when (analysis.pattern/unit) - #analysis.then actual_output] - (list [#analysis.when (analysis.pattern/bit bit_test) - #analysis.then actual_output] - [#analysis.when (analysis.pattern/nat (.nat i64_test)) - #analysis.then actual_output] - [#analysis.when (analysis.pattern/frac f64_test) - #analysis.then actual_output] - [#analysis.when (analysis.pattern/text text_test) - #analysis.then actual_output] - [#analysis.when {#analysis.Bind 2} - #analysis.then actual_output] - [#analysis.when (analysis.pattern/variant - [#analysis.lefts lefts - #analysis.right? right? - #analysis.value {#analysis.Bind 2}]) - #analysis.then actual_output] - [#analysis.when (analysis.pattern/tuple - (list\composite (list.repeated lefts (analysis.pattern/unit)) - (if right? - (list (analysis.pattern/unit) {#analysis.Bind 2}) - (list {#analysis.Bind 2} (analysis.pattern/unit))))) - #analysis.then actual_output])]}]))) + [[#analysis.when (analysis.pattern/unit) + #analysis.then actual_output] + (list [#analysis.when (analysis.pattern/bit bit_test) + #analysis.then actual_output] + [#analysis.when (analysis.pattern/nat (.nat i64_test)) + #analysis.then actual_output] + [#analysis.when (analysis.pattern/frac f64_test) + #analysis.then actual_output] + [#analysis.when (analysis.pattern/text text_test) + #analysis.then actual_output] + [#analysis.when {#analysis.Bind 2} + #analysis.then actual_output] + [#analysis.when (analysis.pattern/variant + [#analysis.lefts lefts + #analysis.right? right? + #analysis.value {#analysis.Bind 2}]) + #analysis.then actual_output] + [#analysis.when (analysis.pattern/tuple + (list\composite (list.repeated lefts (analysis.pattern/unit)) + (if right? + (list (analysis.pattern/unit) {#analysis.Bind 2}) + (list {#analysis.Bind 2} (analysis.pattern/unit))))) + #analysis.then actual_output])]}]))) (def: (random_let arity random_value output?) (-> Arity Scenario Scenario) @@ -247,9 +247,9 @@ (++ arity) expected_output]) {#analysis.Case actual_input - [[#analysis.when {#analysis.Bind 2} - #analysis.then actual_output] - (list)]}]))) + [[#analysis.when {#analysis.Bind 2} + #analysis.then actual_output] + (list)]}]))) (def: (random_if random_value output?) (-> Scenario Scenario) @@ -266,15 +266,15 @@ expected_else]) (if flip? {#analysis.Case actual_test - [[#analysis.when (analysis.pattern/bit false) - #analysis.then actual_else] - (list [#analysis.when (analysis.pattern/bit true) - #analysis.then actual_then])]} + [[#analysis.when (analysis.pattern/bit false) + #analysis.then actual_else] + (list [#analysis.when (analysis.pattern/bit true) + #analysis.then actual_then])]} {#analysis.Case actual_test - [[#analysis.when (analysis.pattern/bit true) - #analysis.then actual_then] - (list [#analysis.when (analysis.pattern/bit false) - #analysis.then actual_else])]})]))) + [[#analysis.when (analysis.pattern/bit true) + #analysis.then actual_then] + (list [#analysis.when (analysis.pattern/bit false) + #analysis.then actual_else])]})]))) (def: (random_get random_value output?) (-> Scenario Scenario) @@ -288,13 +288,13 @@ {#.Left lefts})) expected_record]) {#analysis.Case actual_record - [[#analysis.when (analysis.pattern/tuple - (list\composite (list.repeated lefts (analysis.pattern/unit)) - (if right? - (list (analysis.pattern/unit) {#analysis.Bind 2}) - (list {#analysis.Bind 2} (analysis.pattern/unit))))) - #analysis.then {#analysis.Reference (reference.local 2)}] - (list)]}]))) + [[#analysis.when (analysis.pattern/tuple + (list\composite (list.repeated lefts (analysis.pattern/unit)) + (if right? + (list (analysis.pattern/unit) {#analysis.Bind 2}) + (list {#analysis.Bind 2} (analysis.pattern/unit))))) + #analysis.then {#analysis.Reference (reference.local 2)}] + (list)]}]))) (def: (random_branch arity random_value output?) (-> Arity Scenario Scenario) @@ -357,7 +357,7 @@ #synthesis.inits (list) #synthesis.iteration expected_output])]) {#analysis.Function environment - actual_output}]))) + actual_output}]))) (def: (random_apply random_value output?) (-> Scenario Scenario) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux index b7713c5bd..85fef40c0 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux @@ -75,13 +75,13 @@ [expected_output actual_output] (scenario (revised@ #redundants ++ context))] (in [(synthesis.branch/case [expected_input {#synthesis.Seq #synthesis.Pop - {#synthesis.Then expected_output}}]) + {#synthesis.Then expected_output}}]) (if let? (synthesis.branch/let [actual_input fake_register actual_output]) (synthesis.branch/case [actual_input {#synthesis.Seq {#synthesis.Bind fake_register} - {#synthesis.Seq #synthesis.Pop - {#synthesis.Then actual_output}}}]))])) + {#synthesis.Seq #synthesis.Pop + {#synthesis.Then actual_output}}}]))])) (scenario context)))) (def: (variant_scenario scenario context) @@ -161,9 +161,9 @@ [_ (in []) [expected_then actual_then] (scenario context)] (in [{#synthesis.Seq #synthesis.Pop - {#synthesis.Then expected_then}} + {#synthesis.Then expected_then}} {#synthesis.Seq #synthesis.Pop - {#synthesis.Then actual_then}}])) + {#synthesis.Then actual_then}}])) (do [! random.monad] [_ (in []) .let [real_register (dictionary.size (value@ #necessary context)) @@ -171,20 +171,20 @@ (dictionary.size (value@ #necessary context)))] [expected_then actual_then] (scenario (revised@ #necessary (dictionary.has real_register fake_register) context))] (in [{#synthesis.Seq {#synthesis.Bind real_register} - {#synthesis.Seq #synthesis.Pop - {#synthesis.Then expected_then}}} + {#synthesis.Seq #synthesis.Pop + {#synthesis.Then expected_then}}} {#synthesis.Seq {#synthesis.Bind fake_register} - {#synthesis.Seq #synthesis.Pop - {#synthesis.Then actual_then}}}]))) + {#synthesis.Seq #synthesis.Pop + {#synthesis.Then actual_then}}}]))) ($_ random.either (~~ (template [<tag> <random>] [(do [! random.monad] [test <random> [expected_then actual_then] (scenario context)] (in [{#synthesis.Seq {#synthesis.Test {<tag> test}} - {#synthesis.Then expected_then}} + {#synthesis.Then expected_then}} {#synthesis.Seq {#synthesis.Test {<tag> test}} - {#synthesis.Then actual_then}}]))] + {#synthesis.Then actual_then}}]))] [#synthesis.Bit random.bit] [#synthesis.I64 (\ ! each .i64 random.nat)] @@ -196,16 +196,16 @@ [side ..random_side [expected_next actual_next] (path_scenario scenario context)] (in [{#synthesis.Seq {#synthesis.Access {#synthesis.Side side}} - expected_next} + expected_next} {#synthesis.Seq {#synthesis.Access {#synthesis.Side side}} - actual_next}])) + actual_next}])) (do [! random.monad] [member ..random_member [expected_next actual_next] (path_scenario scenario context)] (in [{#synthesis.Seq {#synthesis.Access {#synthesis.Member member}} - expected_next} + expected_next} {#synthesis.Seq {#synthesis.Access {#synthesis.Member member}} - actual_next}]))) + actual_next}]))) (do [! random.monad] [_ (in []) [expected_left actual_left] (path_scenario scenario context) diff --git a/stdlib/source/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux index 1f5c396e6..ed52a7d78 100644 --- a/stdlib/source/test/lux/type/check.lux +++ b/stdlib/source/test/lux/type/check.lux @@ -670,7 +670,7 @@ body random.nat] (in (function (_ holeT) {<tag> (list (funcT holeT) (argT holeT)) - {#.Parameter body}})))] + {#.Parameter body}})))] [#.UnivQ] [#.ExQ] |