diff options
Diffstat (limited to 'stdlib/source/program/scriptum.lux')
| -rw-r--r-- | stdlib/source/program/scriptum.lux | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/stdlib/source/program/scriptum.lux b/stdlib/source/program/scriptum.lux index dbe3ea022..5083e0afc 100644 --- a/stdlib/source/program/scriptum.lux +++ b/stdlib/source/program/scriptum.lux @@ -51,7 +51,7 @@ (def: type_var_names (Sequence Text) - (|> 0 (sequence.iterations inc) (sequence\map parameter_type_name))) + (|> 0 (sequence.iterations ++) (sequence\map parameter_type_name))) (template [<name> <partition>] [(def: (<name> id) @@ -86,9 +86,9 @@ (if (n.= 0 level) (list) (|> level - dec + -- (enum.range n.enum 0) - (list\map (|>> (n.+ (inc offset)) parameter_type_name))))) + (list\map (|>> (n.+ (++ offset)) parameter_type_name))))) (def: (prefix_lines prefix lines) (-> Text Text Text) @@ -283,28 +283,28 @@ (def: (add_definition [name [exported? def_type def_annotations def_value]] organization) (-> [Text Definition] Organization Organization) (cond (type\= .Type def_type) - (update@ #types - (: (Mutation (List Value)) - (|>> (#.Item [name def_annotations (:as Type def_value)]))) - organization) + (revised@ #types + (: (Mutation (List Value)) + (|>> (#.Item [name def_annotations (:as Type def_value)]))) + organization) (type\= .Macro def_type) - (update@ #macros - (: (Mutation (List [Text Code])) - (|>> (#.Item [name def_annotations]))) - organization) + (revised@ #macros + (: (Mutation (List [Text Code])) + (|>> (#.Item [name def_annotations]))) + organization) (annotation.implementation? def_annotations) - (update@ #implementations - (: (Mutation (List Value)) - (|>> (#.Item [name def_annotations def_type]))) - organization) + (revised@ #implementations + (: (Mutation (List Value)) + (|>> (#.Item [name def_annotations def_type]))) + organization) ... else - (update@ #values - (: (Mutation (List Value)) - (|>> (#.Item [name def_annotations def_type]))) - organization))) + (revised@ #values + (: (Mutation (List Value)) + (|>> (#.Item [name def_annotations def_type]))) + organization))) (def: name_sort (All [r] (-> [Text r] [Text r] Bit)) @@ -319,17 +319,17 @@ #implementations (list) #values (list)}] (|> (list\fold add_definition init defs) - (update@ #types (list.sorted name_sort)) - (update@ #macros (list.sorted name_sort)) - (update@ #implementations (list.sorted name_sort)) - (update@ #values (list.sorted name_sort))))) + (revised@ #types (list.sorted name_sort)) + (revised@ #macros (list.sorted name_sort)) + (revised@ #implementations (list.sorted name_sort)) + (revised@ #values (list.sorted name_sort))))) (def: (unravel_type_func level type) (-> Nat Type Type) (if (n.> 0 level) (case type (#.UnivQ _env _type) - (unravel_type_func (dec level) _type) + (unravel_type_func (-- level) _type) _ type) @@ -371,7 +371,7 @@ (|> type (unravel_type_func nesting) (when> [(new> recursive_type? [])] [unrecurse_type]) - (pprint_type_definition (dec nesting) [_name type_arguments] (maybe.else (list) tags) module interface? recursive_type?) + (pprint_type_definition (-- nesting) [_name type_arguments] (maybe.else (list) tags) module interface? recursive_type?) (text.all_split_by text.new_line) (list\map (|>> (format " "))) (text.interposed text.new_line)) @@ -421,7 +421,7 @@ (template [<singular> <plural> <header>] [(def: (<singular> module type) (-> Text Type (Markdown Block)) - (md.code (pprint_type (dec 0) "?" module type))) + (md.code (pprint_type (-- 0) "?" module type))) (def: (<plural> module values) (-> Text (List Value) (Markdown Block)) @@ -462,7 +462,7 @@ (do meta.monad [.let [(^slots [#types #macros #implementations #values]) organization annotations (|> module - (get@ #.module_annotations) + (value@ #.module_annotations) (maybe.else (' {})) annotation.documentation) description (case annotations |