diff options
author | Eduardo Julian | 2020-11-17 20:23:53 -0400 |
---|---|---|
committer | Eduardo Julian | 2020-11-17 20:23:53 -0400 |
commit | d89d837de3475b75587a4293e094d755d2cd4626 (patch) | |
tree | 0975a487d987cfe855c4f6e87f05478346913a16 /stdlib/source/program/scriptum.lux | |
parent | 2e5852abb1ac0ae5abdd8709238aca447f62520e (diff) |
Made the syntax of ^template more consistent.
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/program/scriptum.lux | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/stdlib/source/program/scriptum.lux b/stdlib/source/program/scriptum.lux index 9ad2c59a4..8cc7e3afb 100644 --- a/stdlib/source/program/scriptum.lux +++ b/stdlib/source/program/scriptum.lux @@ -168,24 +168,24 @@ (parameter->name type-func-info level idx) (^template [<tag> <pre> <post>] - [_ (<tag> id)] - (format <pre> (%.nat id) <post>)) + [[_ (<tag> id)] + (format <pre> (%.nat id) <post>)]) ([#.Var "⌈v:" "⌋"] [#.Ex "⟨e:" "⟩"]) (^template [<tag> <name> <flatten>] - [_ (<tag> _)] - (let [[level' body] (<flatten> type) - args (level->args level level') - body-doc (pprint-type-definition (n.+ level level') type-func-info tags module signature? recursive-type? body)] - (format "(" <name> " " "[" (text.join-with " " args) "]" - (case tags - #.Nil - (format " " body-doc) - - _ - (format text.new-line (prefix-lines " " body-doc))) - ")"))) + [[_ (<tag> _)] + (let [[level' body] (<flatten> type) + args (level->args level level') + body-doc (pprint-type-definition (n.+ level level') type-func-info tags module signature? recursive-type? body)] + (format "(" <name> " " "[" (text.join-with " " args) "]" + (case tags + #.Nil + (format " " body-doc) + + _ + (format text.new-line (prefix-lines " " body-doc))) + ")"))]) ([#.UnivQ "All" type.flatten-univ-q] [#.ExQ "Ex" type.flatten-ex-q]) @@ -233,19 +233,19 @@ (parameter->name [type-func-name (list)] level idx) (^template [<tag> <pre> <post>] - (<tag> id) - (format <pre> (%.nat id) <post>)) + [(<tag> id) + (format <pre> (%.nat id) <post>)]) ([#.Var "⌈" "⌋"] [#.Ex "⟨" "⟩"]) (^template [<tag> <name> <flatten>] - (<tag> _) - (let [[level' body] (<flatten> type) - args (level->args level level') - body-doc (pprint-type (n.+ level level') type-func-name module body)] - (format "(" <name> " " "[" (|> args (list.interpose " ") (text.join-with "")) "]" - (format " " body-doc) - ")"))) + [(<tag> _) + (let [[level' body] (<flatten> type) + args (level->args level level') + body-doc (pprint-type (n.+ level level') type-func-name module body)] + (format "(" <name> " " "[" (|> args (list.interpose " ") (text.join-with "")) "]" + (format " " body-doc) + ")"))]) ([#.UnivQ "All" type.flatten-univ-q] [#.ExQ "Ex" type.flatten-ex-q]) |