diff options
| author | Eduardo Julian | 2017-11-13 20:02:18 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2017-11-13 20:02:18 -0400 |
| commit | 2a3946e713821880ecc47580e754315349f2fe73 (patch) | |
| tree | 7c32a522dff9d09293a5265baa968bc04137c944 /luxc/src | |
| parent | ca297162d5416a8c7b8af5f27757900d82d3ad03 (diff) | |
- Type-vars no longer get deleted.
- Fixed some bugs.
Diffstat (limited to 'luxc/src')
| -rw-r--r-- | luxc/src/lux/analyser/proc/common.clj | 4 | ||||
| -rw-r--r-- | luxc/src/lux/compiler/js/proc/common.clj | 4 | ||||
| -rw-r--r-- | luxc/src/lux/compiler/jvm/proc/common.clj | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/luxc/src/lux/analyser/proc/common.clj b/luxc/src/lux/analyser/proc/common.clj index 871dec4b3..182c08d63 100644 --- a/luxc/src/lux/analyser/proc/common.clj +++ b/luxc/src/lux/analyser/proc/common.clj @@ -41,7 +41,7 @@ ^:private analyse-text-eq ["text" "="] &type/Text &type/Bool ^:private analyse-text-lt ["text" "<"] &type/Text &type/Bool - ^:private analyse-text-append ["text" "append"] &type/Text &type/Text + ^:private analyse-text-concat ["text" "concat"] &type/Text &type/Text ) (do-template [<name> <proc-name> <output-type>] @@ -486,7 +486,7 @@ "lux text =" (analyse-text-eq analyse exo-type ?values) "lux text <" (analyse-text-lt analyse exo-type ?values) - "lux text append" (analyse-text-append analyse exo-type ?values) + "lux text concat" (analyse-text-concat analyse exo-type ?values) "lux text clip" (analyse-text-clip analyse exo-type ?values) "lux text index" (analyse-text-index analyse exo-type ?values) "lux text last-index" (analyse-text-last-index analyse exo-type ?values) diff --git a/luxc/src/lux/compiler/js/proc/common.clj b/luxc/src/lux/compiler/js/proc/common.clj index a45bc2993..af4ff99e9 100644 --- a/luxc/src/lux/compiler/js/proc/common.clj +++ b/luxc/src/lux/compiler/js/proc/common.clj @@ -230,7 +230,7 @@ ^:private compile-char-lt "<" ) -(defn ^:private compile-text-append [compile ?values special-args] +(defn ^:private compile-text-concat [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Cons ?y (&/$Nil))) ?values] =x (compile ?x) =y (compile ?y)] @@ -446,7 +446,7 @@ (case proc "=" (compile-text-eq compile ?values special-args) "<" (compile-text-lt compile ?values special-args) - "append" (compile-text-append compile ?values special-args) + "concat" (compile-text-concat compile ?values special-args) "clip" (compile-text-clip compile ?values special-args) "index" (compile-text-index compile ?values special-args) "last-index" (compile-text-last-index compile ?values special-args) diff --git a/luxc/src/lux/compiler/jvm/proc/common.clj b/luxc/src/lux/compiler/jvm/proc/common.clj index 757f66afd..d7821e9af 100644 --- a/luxc/src/lux/compiler/jvm/proc/common.clj +++ b/luxc/src/lux/compiler/jvm/proc/common.clj @@ -484,7 +484,7 @@ (.visitLabel $end))]] (return nil))) -(defn compile-text-append [compile ?values special-args] +(defn compile-text-concat [compile ?values special-args] (|do [:let [(&/$Cons ?x (&/$Cons ?y (&/$Nil))) ?values] ^MethodVisitor *writer* &/get-writer _ (compile ?x) @@ -825,7 +825,7 @@ (case proc "=" (compile-text-eq compile ?values special-args) "<" (compile-text-lt compile ?values special-args) - "append" (compile-text-append compile ?values special-args) + "concat" (compile-text-concat compile ?values special-args) "clip" (compile-text-clip compile ?values special-args) "index" (compile-text-index compile ?values special-args) "last-index" (compile-text-last-index compile ?values special-args) |