diff options
Diffstat (limited to 'new-luxc/source')
| -rw-r--r-- | new-luxc/source/luxc/cache/description.lux | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/new-luxc/source/luxc/cache/description.lux b/new-luxc/source/luxc/cache/description.lux index 9ee07c7ad..7706d03b1 100644 --- a/new-luxc/source/luxc/cache/description.lux +++ b/new-luxc/source/luxc/cache/description.lux @@ -9,12 +9,12 @@ text/format (coll [list "list/" Functor<List>])) (macro [code] - ["s" syntax #+ Syntax])) - [///lang]) + ["s" syntax #+ Syntax]) + [lang])) (exception: #export (invalid-lux-version {version Text}) - (format "Expected: " ///lang.version "\n" - " Actual: " version "\n")) + (ex.report ["Expected: " lang.version] + [" Actual: " version])) (def: (write-type type) (-> Type Code) @@ -35,7 +35,7 @@ (^template [<tag> <description>] (<tag> id) (` (<description> (~ (code.nat id))))) - ([#.Bound "Bound"] + ([#.Parameter "Parameter"] [#.Var "Var"] [#.Ex "Ex"]) @@ -71,7 +71,7 @@ (binary "Sum" read-type) (binary "Product" read-type) (binary "Function" read-type) - (indexed "Bound") + (indexed "Parameter") (indexed "Var") (indexed "Ex") (quantified "UnivQ" read-type) @@ -102,7 +102,7 @@ (def: #export (write lux-file module) (-> Text Module Code) - (` {"lux version" (~ (code.text ///lang.version)) + (` {"lux version" (~ (code.text lang.version)) "lux file" (~ (code.text lux-file)) "hash" (~ (code.nat (get@ #.module-hash module))) "aliases" (~ (write-aliases (get@ #.module-aliases module))) @@ -123,7 +123,7 @@ (s.record (do p.Monad<Parser> [lux-version (p.after (s.this (` "lux version")) s.text) _ (p.assert (ex.construct invalid-lux-version lux-version) - (text/= ///lang.version lux-version))] + (text/= lang.version lux-version))] ($_ p.seq (p.after (s.this (` "lux file")) s.text) ($_ p.seq |