diff options
| author | Eduardo Julian | 2020-11-24 05:18:04 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2020-11-24 05:18:04 -0400 |
| commit | c4bbfea18d995948012f45a6afda7a6e6ba56f84 (patch) | |
| tree | b3c425471830788965776fd173169f084d9f6af4 /luxc/src | |
| parent | d89d837de3475b75587a4293e094d755d2cd4626 (diff) | |
Better error messages when re-using a name when making a definition.
Diffstat (limited to 'luxc/src')
| -rw-r--r-- | luxc/src/lux/analyser/lux.clj | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/luxc/src/lux/analyser/lux.clj b/luxc/src/lux/analyser/lux.clj index fb2a2dd9e..b7d78aa23 100644 --- a/luxc/src/lux/analyser/lux.clj +++ b/luxc/src/lux/analyser/lux.clj @@ -539,8 +539,15 @@ (defn ^:private ensure-undefined! [module-name local-name] (|do [verdict (&&module/defined? module-name local-name)] - (&/assert! (not verdict) - (str "[Analyser Error] Cannot re-define " module-name &/+name-separator+ local-name)))) + (if verdict + (|do [[[real-module real-name] _] (&&module/find-def module-name local-name) + :let [wanted-name (str module-name &/+name-separator+ local-name) + source-name (str real-module &/+name-separator+ real-name)]] + (&/assert! false (str "[Analyser Error] Cannot re-define " wanted-name + (if (= wanted-name source-name) + "" + (str "\nThis is an alias for " source-name))))) + (return &/$Nil)))) (defn analyse-def* [analyse optimize eval! compile-def ?name ?value ?meta exported? & [?expected-type]] (|do [_ &/ensure-directive |