From f5a6fe62a612c0727063fa9e530d53ddda5fcd82 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 6 May 2018 02:01:02 -0400 Subject: - Removed "lux text upper" and "lux text lower" procedures. --- new-luxc/source/luxc/lang/extension/analysis/common.lux | 2 -- new-luxc/source/luxc/lang/translation/common-lisp.lux | 2 +- .../source/luxc/lang/translation/common-lisp/eval.jvm.lux | 2 +- .../lang/translation/common-lisp/procedure/common.jvm.lux | 2 -- .../luxc/lang/translation/js/procedure/common.jvm.lux | 5 ----- .../luxc/lang/translation/jvm/procedure/common.jvm.lux | 4 ---- .../luxc/lang/translation/lua/procedure/common.jvm.lux | 8 -------- .../luxc/lang/translation/php/procedure/common.jvm.lux | 2 -- .../luxc/lang/translation/python/procedure/common.jvm.lux | 2 -- .../source/luxc/lang/translation/r/procedure/common.jvm.lux | 2 -- .../luxc/lang/translation/ruby/procedure/common.jvm.lux | 5 ----- .../luxc/lang/translation/scheme/procedure/common.jvm.lux | 2 -- new-luxc/test/test/luxc/lang/translation/common.lux | 13 ------------- 13 files changed, 2 insertions(+), 49 deletions(-) (limited to 'new-luxc') diff --git a/new-luxc/source/luxc/lang/extension/analysis/common.lux b/new-luxc/source/luxc/lang/extension/analysis/common.lux index aa6b6a547..220613dbf 100644 --- a/new-luxc/source/luxc/lang/extension/analysis/common.lux +++ b/new-luxc/source/luxc/lang/extension/analysis/common.lux @@ -294,8 +294,6 @@ (install "replace-all" (trinary Text Text Text Text)) (install "char" (binary Text Nat (type (Maybe Nat)))) (install "clip" (trinary Text Nat Nat (type (Maybe Text)))) - (install "upper" (unary Text Text)) - (install "lower" (unary Text Text)) ))) (def: (array//get proc) diff --git a/new-luxc/source/luxc/lang/translation/common-lisp.lux b/new-luxc/source/luxc/lang/translation/common-lisp.lux index 4e18c48cf..704dfe91e 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp.lux @@ -178,7 +178,7 @@ [interpret #interpreter LispObject] ) -(def: #export variant-tag "lux-variant") +(def: #export variant-tag "LUX-VARIANT") (def: #export unit Text "") diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux index 262f3f284..ee2aac932 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux @@ -101,7 +101,7 @@ (-> (-> Object (Error Top)) Cons (Error Top)) (let [variant-tag (Cons::car host-object)] (if (and (host.instance? org/armedbear/lisp/Symbol variant-tag) - (text/= //.variant-tag (text.lower-case (Symbol::getName [] (:! Symbol variant-tag))))) + (text/= //.variant-tag (Symbol::getName [] (:! Symbol variant-tag)))) (do e.Monad [#let [host-object (:! Cons (Cons::cdr host-object))] tag (lux-object (Cons::car host-object)) diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux index 895ed8d72..fe9fe43be 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux @@ -345,8 +345,6 @@ ## (install "replace-all" (trinary text//replace-all)) (install "char" (binary text//char)) (install "clip" (trinary text//clip)) - (install "upper" (unary _.string-upcase/1)) - (install "lower" (unary _.string-downcase/1)) ))) ## [[Math]] diff --git a/new-luxc/source/luxc/lang/translation/js/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/js/procedure/common.jvm.lux index 8e40799f2..15c48a138 100644 --- a/new-luxc/source/luxc/lang/translation/js/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/js/procedure/common.jvm.lux @@ -325,9 +325,6 @@ (format inputJS ))] [text//size ".length"] - [text//trim ".trim()"] - [text//upper ".toUpperCase()"] - [text//lower ".toLowerCase()"] ) (do-template [ ] @@ -567,8 +564,6 @@ (install "replace-all" (trinary text//replace-all)) (install "char" (binary text//char)) (install "clip" (trinary text//clip)) - (install "upper" (unary text//upper)) - (install "lower" (unary text//lower)) ))) (def: array-procs diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux index 9764045e7..8289fdf5a 100644 --- a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux @@ -383,8 +383,6 @@ [text//size "java.lang.String" "length" lux-intI $t.int] [text//hash "java.lang.Object" "hashCode" lux-intI $t.int] - [text//upper "java.lang.String" "toUpperCase" id $String] - [text//lower "java.lang.String" "toLowerCase" id $String] ) (do-template [ ] @@ -710,8 +708,6 @@ (install "replace-all" (trinary text//replace-all)) (install "char" (binary text//char)) (install "clip" (trinary text//clip)) - (install "upper" (unary text//upper)) - (install "lower" (unary text//lower)) ))) (def: array-procs diff --git a/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux index 91906d899..2bef7cbcf 100644 --- a/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux @@ -331,14 +331,8 @@ (|>> (list) (lua.apply )))] [text//size "string.len"] - [text//upper "string.upper"] - [text//lower "string.lower"] ) -(def: (text//trim inputO) - Unary - (lua.apply "string.match" (list inputO "^%s*(.-)%s*$"))) - (def: (text//concat [subjectO paramO]) Binary (format "(" subjectO " .. " paramO ")")) @@ -557,8 +551,6 @@ (install "replace-all" (trinary text//replace-all)) (install "char" (binary text//char)) (install "clip" (trinary text//clip)) - (install "upper" (unary text//upper)) - (install "lower" (unary text//lower)) ))) (def: array-procs diff --git a/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux index bcbea37cf..33c7d645e 100644 --- a/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux @@ -366,8 +366,6 @@ ## (install "replace-all" (trinary text//replace-all)) ## (install "char" (binary text//char)) ## (install "clip" (trinary text//clip)) -## (install "upper" (unary (send0 "upper"))) -## (install "lower" (unary (send0 "lower"))) ## ))) ## ## [[Math]] diff --git a/new-luxc/source/luxc/lang/translation/python/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/python/procedure/common.jvm.lux index 24e4197d1..c9ebd6fd7 100644 --- a/new-luxc/source/luxc/lang/translation/python/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/python/procedure/common.jvm.lux @@ -457,8 +457,6 @@ (install "replace-all" (trinary text//replace-all)) (install "char" (binary text//char)) (install "clip" (trinary text//clip)) - (install "upper" (unary (send0 "upper"))) - (install "lower" (unary (send0 "lower"))) ))) ## [[Math]] diff --git a/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux index f190f88ed..bd11bca21 100644 --- a/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux @@ -428,8 +428,6 @@ (install "replace-all" (trinary text//replace-all)) (install "char" (binary text//char)) (install "clip" (trinary text//clip)) - (install "upper" (unary (apply1 (r.global "toupper")))) - (install "lower" (unary (apply1 (r.global "tolower")))) ))) ## [[Math]] diff --git a/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux index 8e58c06d4..ccd2699ce 100644 --- a/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux @@ -452,9 +452,6 @@ (ruby.send (list)))] [text//size "length"] - [text//upper "upcase"] - [text//lower "downcase"] - [text//trim "strip"] [text//hash "hash"] ) @@ -501,8 +498,6 @@ (install "replace-all" (trinary text//replace-all)) (install "char" (binary text//char)) (install "clip" (trinary text//clip)) - (install "upper" (unary text//upper)) - (install "lower" (unary text//lower)) ))) ## [[Math]] diff --git a/new-luxc/source/luxc/lang/translation/scheme/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/scheme/procedure/common.jvm.lux index 5d8e2ac66..7387b6530 100644 --- a/new-luxc/source/luxc/lang/translation/scheme/procedure/common.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/scheme/procedure/common.jvm.lux @@ -414,8 +414,6 @@ ## (install "replace-all" (trinary text//replace-all)) ## (install "char" (binary text//char)) ## (install "clip" (trinary text//clip)) - (install "upper" (unary (_.apply1 (_.global "string-upcase")))) - (install "lower" (unary (_.apply1 (_.global "string-downcase")))) ))) ## [[Math]] diff --git a/new-luxc/test/test/luxc/lang/translation/common.lux b/new-luxc/test/test/luxc/lang/translation/common.lux index be552f1f0..964be4af3 100644 --- a/new-luxc/test/test/luxc/lang/translation/common.lux +++ b/new-luxc/test/test/luxc/lang/translation/common.lux @@ -235,19 +235,6 @@ _ false))) - (test "Can change case of text." - (and (|> (run (` ("lux text =" (~ sample0S) ("lux text upper" (~ sample0S))))) - (case> (#e.Success valueV) - (not (:! Bool valueV)) - - _ - false)) - (|> (run (` ("lux text =" (~ sample0S) ("lux text lower" ("lux text upper" (~ sample0S)))))) - (case> (#e.Success valueV) - (:! Bool valueV) - - _ - false)))) (test "Can get length of text." (|> (run (` ("lux text size" (~ sample0S)))) (case> (#e.Success valueV) -- cgit v1.2.3