diff options
| author | Eduardo Julian | 2017-02-20 19:51:03 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2017-02-20 19:51:03 -0400 |
| commit | 0bfb1b4b1431c51441e4b47160e8c7dc8109da1b (patch) | |
| tree | 3f923d86ea1d55088a9c2c175437b13ff9c1c8ee | |
| parent | c15092022b484eaf52a34bd3ac1bec2ecf15efd9 (diff) | |
- Changed the order the cache is loaded.
| -rw-r--r-- | luxc/src/lux/compiler/cache.clj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/luxc/src/lux/compiler/cache.clj b/luxc/src/lux/compiler/cache.clj index 09b688832..77e4221e8 100644 --- a/luxc/src/lux/compiler/cache.clj +++ b/luxc/src/lux/compiler/cache.clj @@ -139,7 +139,8 @@ (if (= [""] def-entries) &/$Nil (&/->list def-entries)))] - (|do [_ (install-module load-def-value module-name module-hash + (|do [_ (install-all-defs-in-module module-name) + _ (install-module load-def-value module-name module-hash imports tag-groups module-anns def-entries) =module (&/find-module module-name)] (return (&/T [true (assoc cache-table* module-name =module)])))) @@ -150,7 +151,7 @@ (let [children (for [^File child (seq (.listFiles parent)) entry (enumerate-cached-modules!* child)] entry)] - (if (.exists (new File parent "_.class")) + (if (.exists (new File parent &&core/lux-module-descriptor-name)) (list* (.getAbsolutePath parent) children) children)) @@ -177,7 +178,6 @@ :else (|do [^String descriptor (&&core/read-module-descriptor! module-name) - installed-classes (install-all-defs-in-module module-name) :let [[_compiler _hash _imports-section _tags-section _module-anns-section _defs-section] (.split descriptor &&core/section-separator) drop-cache! (|do [_ (uninstall-cache module-name) _ (uninstall-all-defs-in-module module-name)] |