aboutsummaryrefslogtreecommitdiff
path: root/new-luxc/source/luxc/lang/translation/common-lisp
diff options
context:
space:
mode:
authorEduardo Julian2018-07-22 02:52:46 -0400
committerEduardo Julian2018-07-22 02:52:46 -0400
commitb14102eaa2a80f51f160ba293ec01928dbe683c3 (patch)
treebf2640c4503de8c9f0a8f6b048548ef1a0bd4e83 /new-luxc/source/luxc/lang/translation/common-lisp
parent9671d6064dd02dfe6c32492f5b9907b096e5bd89 (diff)
- Some fixes due to recent changes in stdlib.
- Removed some (now) useless modules.
Diffstat (limited to 'new-luxc/source/luxc/lang/translation/common-lisp')
-rw-r--r--new-luxc/source/luxc/lang/translation/common-lisp/procedure.jvm.lux29
-rw-r--r--new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux4
-rw-r--r--new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux12
3 files changed, 8 insertions, 37 deletions
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/procedure.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/procedure.jvm.lux
deleted file mode 100644
index ed8220613..000000000
--- a/new-luxc/source/luxc/lang/translation/common-lisp/procedure.jvm.lux
+++ /dev/null
@@ -1,29 +0,0 @@
-(.module:
- lux
- (lux (control [monad #+ do]
- ["ex" exception #+ exception:])
- (data [maybe]
- text/format
- (coll (dictionary ["dict" unordered #+ Dict]))))
- (luxc ["&" lang]
- (lang ["ls" synthesis]
- (host ["_" common-lisp #+ Expression])))
- [//]
- (/ ["/." common]
- ["/." host]))
-
-(exception: #export (Unknown-Procedure {message Text})
- message)
-
-(def: procedures
- /common.Bundle
- (|> /common.procedures
- (dict.merge /host.procedures)))
-
-(def: #export (translate-procedure translate name args)
- (-> (-> ls.Synthesis (Meta Expression)) Text (List ls.Synthesis)
- (Meta Expression))
- (<| (maybe.default (&.throw Unknown-Procedure (%t name)))
- (do maybe.Monad<Maybe>
- [proc (dict.get name procedures)]
- (wrap (proc translate args)))))
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux
index 9fd2f42ea..6d2a491c6 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux
@@ -34,9 +34,9 @@
(translate-local (.nat var))))
(def: #export global
- (-> Ident SVar)
+ (-> Name SVar)
(|>> //.definition-name _.var))
(def: #export (translate-definition name)
- (-> Ident (Meta Expression))
+ (-> Name (Meta Expression))
(:: macro.Monad<Meta> wrap (@@ (global name))))
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
index 74bf3d118..48ec2a2fa 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
@@ -14,20 +14,20 @@
(-> Text Type Expression Code (Meta Any))
(do macro.Monad<Meta>
[current-module macro.current-module-name
- #let [def-ident [current-module name]]]
- (case (macro.get-identifier-ann (ident-for #.alias) metaV)
+ #let [def-name [current-module name]]]
+ (case (macro.get-identifier-ann (name-of #.alias) metaV)
(#.Some real-def)
(do @
[[realT realA realV] (macro.find-def real-def)
- _ (moduleL.define def-ident [realT metaV realV])]
+ _ (moduleL.define def-name [realT metaV realV])]
(wrap []))
_
(do @
- [#let [def-name (referenceT.global def-ident)]
+ [#let [def-name (referenceT.global def-name)]
_ (//.save (_.defparameter def-name expressionO))
expressionV (evalT.eval (@@ def-name))
- _ (moduleL.define def-ident [expressionT metaV expressionV])
+ _ (moduleL.define def-name [expressionT metaV expressionV])
_ (if (macro.type? metaV)
(case (macro.declared-tags metaV)
#.Nil
@@ -36,7 +36,7 @@
tags
(moduleL.declare-tags tags (macro.export? metaV) (:coerce Type expressionV)))
(wrap []))
- #let [_ (log! (format "DEF " (%ident def-ident)))]]
+ #let [_ (log! (format "DEF " (%name def-name)))]]
(wrap []))
)))