diff options
Diffstat (limited to 'new-luxc/source/luxc/lang.lux')
| -rw-r--r-- | new-luxc/source/luxc/lang.lux | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/new-luxc/source/luxc/lang.lux b/new-luxc/source/luxc/lang.lux index 45a8b1860..4aa47754a 100644 --- a/new-luxc/source/luxc/lang.lux +++ b/new-luxc/source/luxc/lang.lux @@ -8,8 +8,8 @@ [text "text/" Eq<Text>] text/format (coll [list])) - [meta] - (meta ["s" syntax #+ syntax:]) + [macro] + (macro ["s" syntax #+ syntax:]) (lang (type ["tc" check]))) (luxc (lang ["la" analysis]))) @@ -23,13 +23,13 @@ (def: #export (fail message) (All [a] (-> Text (Meta a))) - (do meta;Monad<Meta> - [[file line col] meta;cursor + (do macro;Monad<Meta> + [[file line col] macro;cursor #let [location (format file "," (|> line nat-to-int %i) "," (|> col nat-to-int %i))]] - (meta;fail (format message "\n\n" - "@ " location)))) + (macro;fail (format message "\n\n" + "@ " location)))) (def: #export (throw exception message) (All [a] (-> ex;Exception Text (Meta a))) @@ -37,7 +37,7 @@ (syntax: #export (assert exception message test) (wrap (list (` (if (~ test) - (:: meta;Monad<Meta> (~' wrap) []) + (:: macro;Monad<Meta> (~' wrap) []) (;;throw (~ exception) (~ message))))))) (def: #export (with-type expected action) @@ -77,8 +77,8 @@ (def: #export (infer actualT) (-> Type (Meta Unit)) - (do meta;Monad<Meta> - [expectedT meta;expected-type] + (do macro;Monad<Meta> + [expectedT macro;expected-type] (with-type-env (tc;check expectedT actualT)))) |