diff options
| author | Eduardo Julian | 2015-08-08 18:54:09 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2015-08-08 18:54:09 -0400 |
| commit | 4b96f550165bcea089a78a6901d40850d06a4b05 (patch) | |
| tree | 705280a7b3f24e8fb606fe5a664e230d5805cee5 /src/lux/compiler | |
| parent | eb1290b70e26e7cf176e12873aca1593a70f2276 (diff) | |
Refactored the tags of definitions.
Diffstat (limited to 'src/lux/compiler')
| -rw-r--r-- | src/lux/compiler/cache.clj | 6 | ||||
| -rw-r--r-- | src/lux/compiler/lux.clj | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lux/compiler/cache.clj b/src/lux/compiler/cache.clj index 2b6f2e919..742ac69d8 100644 --- a/src/lux/compiler/cache.clj +++ b/src/lux/compiler/cache.clj @@ -118,16 +118,16 @@ (|do [_ (case _ann "T" (let [def-class (&&/load-class! loader (str module* "." (&/normalize-name _name))) def-value (get-field "_datum" def-class)] - (&a-module/define module _name (&/V "lux;TypeD" def-value) &type/Type)) + (&a-module/define module _name (&/V &/$TypeD def-value) &type/Type)) "M" (let [def-class (&&/load-class! loader (str module* "." (&/normalize-name _name))) def-value (get-field "_datum" def-class)] - (|do [_ (&a-module/define module _name (&/V "lux;ValueD" (&/T &type/Macro def-value)) &type/Macro)] + (|do [_ (&a-module/define module _name (&/V &/$ValueD (&/T &type/Macro def-value)) &type/Macro)] (&a-module/declare-macro module _name))) "V" (let [def-class (&&/load-class! loader (str module* "." (&/normalize-name _name))) ;; _ (println "Fetching _meta" module _name (str module* "." (&/normalize-name _name)) def-class) def-meta (get-field "_meta" def-class)] (|case def-meta - ("lux;ValueD" def-type _) + (&/$ValueD def-type _) (&a-module/define module _name def-meta def-type))) ;; else (let [[_ __module __name] (re-find #"^A(.*);(.*)$" _ann)] diff --git a/src/lux/compiler/lux.clj b/src/lux/compiler/lux.clj index 9a3a7a6f2..2d28f8b3f 100644 --- a/src/lux/compiler/lux.clj +++ b/src/lux/compiler/lux.clj @@ -147,7 +147,7 @@ (.visitTypeInsn Opcodes/ANEWARRAY "java/lang/Object") ;; V (.visitInsn Opcodes/DUP) ;; VV (.visitLdcInsn (int 0)) ;; VVI - (.visitLdcInsn "lux;TypeD") ;; VVIT + (.visitLdcInsn &/$TypeD) ;; VVIT (.visitInsn Opcodes/AASTORE) ;; V (.visitInsn Opcodes/DUP) ;; VV (.visitLdcInsn (int 1)) ;; VVI @@ -173,7 +173,7 @@ (.visitTypeInsn Opcodes/ANEWARRAY "java/lang/Object") ;; V (.visitInsn Opcodes/DUP) ;; VV (.visitLdcInsn (int 0)) ;; VVI - (.visitLdcInsn "lux;ValueD") ;; VVIT + (.visitLdcInsn &/$ValueD) ;; VVIT (.visitInsn Opcodes/AASTORE) ;; V (.visitInsn Opcodes/DUP) ;; VV (.visitLdcInsn (int 1)) ;; VVI |