diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/lux/lang/compiler/analysis/reference.lux | 44 | ||||
| -rw-r--r-- | stdlib/source/lux/macro.lux | 6 |
2 files changed, 35 insertions, 15 deletions
diff --git a/stdlib/source/lux/lang/compiler/analysis/reference.lux b/stdlib/source/lux/lang/compiler/analysis/reference.lux index 6f4908f9d..5652e21fc 100644 --- a/stdlib/source/lux/lang/compiler/analysis/reference.lux +++ b/stdlib/source/lux/lang/compiler/analysis/reference.lux @@ -1,29 +1,49 @@ (.module: lux - (lux (control monad) + (lux (control monad + ["ex" exception #+ exception:]) [macro] (macro [code]) - (lang (type ["tc" check]))) + (lang (type ["tc" check])) + (data [text "text/" Eq<Text>] + text/format)) [///] [// #+ Analysis Operation] [//type] [////reference] [////scope]) +(exception: #export (foreign-module-has-not-been-imported {current Text} {foreign Text}) + (ex.report ["Current" current] + ["Foreign" foreign])) + +(exception: #export (definition-has-not-been-expored {definition Ident}) + (ex.report ["Definition" (%ident definition)])) + ## [Analysers] (def: (definition def-name) (-> Ident (Operation Analysis)) - (do ///.Monad<Operation> - [[actualT def-anns _] (macro.find-def def-name)] - (case (macro.get-symbol-ann (ident-for #.alias) def-anns) - (#.Some real-def-name) - (definition real-def-name) + (with-expansions [<return> (wrap (|> def-name ////reference.constant #//.Reference))] + (do ///.Monad<Operation> + [[actualT def-anns _] (macro.find-def def-name)] + (case (macro.get-symbol-ann (ident-for #.alias) def-anns) + (#.Some real-def-name) + (definition real-def-name) - _ - (do @ - [_ (//type.infer actualT)] - (:: @ map (|>> ////reference.constant #//.Reference) - (macro.normalize def-name)))))) + _ + (do @ + [_ (//type.infer actualT) + (^@ def-name [::module ::name]) (macro.normalize def-name) + current macro.current-module-name] + (if (text/= current ::module) + <return> + (if (macro.export? def-anns) + (do @ + [imported! (macro.imported-by? ::module current)] + (if imported! + <return> + (///.throw foreign-module-has-not-been-imported [current ::module]))) + (///.throw definition-has-not-been-expored def-name)))))))) (def: (variable var-name) (-> Text (Operation (Maybe Analysis))) diff --git a/stdlib/source/lux/macro.lux b/stdlib/source/lux/macro.lux index 9e26a49e4..404d76b32 100644 --- a/stdlib/source/lux/macro.lux +++ b/stdlib/source/lux/macro.lux @@ -721,7 +721,7 @@ #.None (fail ($_ text/compose "Wrong syntax for " <desc> "."))))] - [log-expand expand "log-expand"] - [log-expand-all expand-all "log-expand-all"] - [log-expand-once expand-once "log-expand-once"] + [log-expand! expand "log-expand!"] + [log-expand-all! expand-all "log-expand-all!"] + [log-expand-once! expand-once "log-expand-once!"] ) |