diff options
| author | Eduardo Julian | 2015-04-26 18:36:50 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2015-04-26 18:36:50 -0400 |
| commit | 6e72c1363efae036bf511cbc53aa9a10c1c93eb9 (patch) | |
| tree | 56302c4226524c26c4ee993dfcf763358a8ab90e /src/lux/lexer.clj | |
| parent | 8b7f5c6d38d45c1f38aa2c416afbd8c38f0bfafb (diff) | |
- lux/analyser/def has been renamed to lux/analyser/module.
- Renamed a few defs in lux.lux.
- No more type-test shortcut inside lux/analyser/lux.
- Defs are now being classified as either (#ValueD <type>) or (#MacroD <macro>).
Diffstat (limited to '')
| -rw-r--r-- | src/lux/lexer.clj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lux/lexer.clj b/src/lux/lexer.clj index cae2fdcaf..ca63576ef 100644 --- a/src/lux/lexer.clj +++ b/src/lux/lexer.clj @@ -2,7 +2,7 @@ (:require [clojure.template :refer [do-template]] (lux [base :as & :refer [|do return* return fail fail*]] [reader :as &reader]) - [lux.analyser.def :as &def])) + [lux.analyser.module :as &module])) ;; [Utils] (defn ^:private escape-char [escaped] @@ -85,9 +85,9 @@ (|do [[_ [meta token]] (&reader/read-regex +ident-re+)] (&/try-all% (&/|list (|do [_ (&reader/read-text ";") [_ [_ local-token]] (&reader/read-regex +ident-re+)] - (&/try-all% (&/|list (|do [unaliased (&def/unalias-module token)] + (&/try-all% (&/|list (|do [unaliased (&module/dealias token)] (return (&/V "lux;Meta" (&/T meta (&/T unaliased local-token))))) - (|do [? (&def/module-exists? token)] + (|do [? (&module/exists? token)] (if ? (return (&/V "lux;Meta" (&/T meta (&/T token local-token)))) (fail (str "[Lexer Error] Unknown module: " token)))) |