- Fixed some bugs.

- Some small refactoring.

3 files changed, 66 insertions, 66 deletions

diff --git a/luxc/src/lux/analyser/proc/common.clj b/luxc/src/lux/analyser/proc/common.clj
index 0c38132a4..1dce02b2c 100644
--- a/luxc/src/lux/analyser/proc/common.clj
+++ b/luxc/src/lux/analyser/proc/common.clj
@@ -121,8 +121,8 @@
                                            (&/|list =text)
                                            (&/|list)))))))
 
-  ^:private analyse-text-upper-case "upper-case"
-  ^:private analyse-text-lower-case "lower-case"
+  ^:private analyse-text-upper "upper"
+  ^:private analyse-text-lower "lower"
   )
 
 (defn ^:private analyse-text-char [analyse exo-type ?values]
@@ -260,18 +260,18 @@
       (return (&/|list (&&/|meta exo-type _cursor
                                  (&&/$proc (&/T <op>) (&/|list) (&/|list)))))))
 
-  ^:private analyse-nat-min-value            &type/Nat  ["nat"  "min-value"]
-  ^:private analyse-nat-max-value            &type/Nat  ["nat"  "max-value"]
+  ^:private analyse-nat-min                  &type/Nat  ["nat"  "min"]
+  ^:private analyse-nat-max                  &type/Nat  ["nat"  "max"]
 
-  ^:private analyse-int-min-value            &type/Int  ["int"  "min-value"]
-  ^:private analyse-int-max-value            &type/Int  ["int"  "max-value"]
+  ^:private analyse-int-min                  &type/Int  ["int"  "min"]
+  ^:private analyse-int-max                  &type/Int  ["int"  "max"]
 
-  ^:private analyse-deg-min-value           &type/Deg ["deg" "min-value"]
-  ^:private analyse-deg-max-value           &type/Deg ["deg" "max-value"]
+  ^:private analyse-deg-min                 &type/Deg ["deg" "min"]
+  ^:private analyse-deg-max                 &type/Deg ["deg" "max"]
 
-  ^:private analyse-frac-smallest-value     &type/Frac  ["frac"  "smallest-value"]
-  ^:private analyse-frac-min-value          &type/Frac  ["frac"  "min-value"]
-  ^:private analyse-frac-max-value          &type/Frac  ["frac"  "max-value"]
+  ^:private analyse-frac-smallest           &type/Frac  ["frac"  "smallest"]
+  ^:private analyse-frac-min                &type/Frac  ["frac"  "min"]
+  ^:private analyse-frac-max                &type/Frac  ["frac"  "max"]
   ^:private analyse-frac-not-a-number       &type/Frac  ["frac"  "not-a-number"]
   ^:private analyse-frac-positive-infinity  &type/Frac  ["frac"  "positive-infinity"]
   ^:private analyse-frac-negative-infinity  &type/Frac  ["frac"  "negative-infinity"]
@@ -491,8 +491,8 @@
          "lux text hash"                 (analyse-text-hash analyse exo-type ?values)
          "lux text replace-all"          (analyse-text-replace-all analyse exo-type ?values)
          "lux text char"                 (analyse-text-char analyse exo-type ?values)
-         "lux text upper-case"           (analyse-text-upper-case analyse exo-type ?values)
-         "lux text lower-case"           (analyse-text-lower-case analyse exo-type ?values)
+         "lux text upper"           (analyse-text-upper analyse exo-type ?values)
+         "lux text lower"           (analyse-text-lower analyse exo-type ?values)
          "lux text contains?"            (analyse-text-contains? analyse exo-type ?values)
          
          "lux bit count"                (analyse-bit-count analyse exo-type ?values)
@@ -516,8 +516,8 @@
          "lux nat %" (analyse-nat-rem analyse exo-type ?values)
          "lux nat =" (analyse-nat-eq analyse exo-type ?values)
          "lux nat <" (analyse-nat-lt analyse exo-type ?values)
-         "lux nat min-value" (analyse-nat-min-value analyse exo-type ?values)
-         "lux nat max-value" (analyse-nat-max-value analyse exo-type ?values)
+         "lux nat min" (analyse-nat-min analyse exo-type ?values)
+         "lux nat max" (analyse-nat-max analyse exo-type ?values)
          "lux nat to-int" (analyse-nat-to-int analyse exo-type ?values)
          "lux nat to-char" (analyse-nat-to-char analyse exo-type ?values)
          
@@ -528,8 +528,8 @@
          "lux int %" (analyse-int-rem analyse exo-type ?values)
          "lux int =" (analyse-int-eq analyse exo-type ?values)
          "lux int <" (analyse-int-lt analyse exo-type ?values)
-         "lux int min-value" (analyse-int-min-value analyse exo-type ?values)
-         "lux int max-value" (analyse-int-max-value analyse exo-type ?values)
+         "lux int min" (analyse-int-min analyse exo-type ?values)
+         "lux int max" (analyse-int-max analyse exo-type ?values)
          "lux int to-nat" (analyse-int-to-nat analyse exo-type ?values)
          "lux int to-frac" (analyse-int-to-frac analyse exo-type ?values)
          
@@ -540,8 +540,8 @@
          "lux deg %" (analyse-deg-rem analyse exo-type ?values)
          "lux deg =" (analyse-deg-eq analyse exo-type ?values)
          "lux deg <" (analyse-deg-lt analyse exo-type ?values)
-         "lux deg min-value" (analyse-deg-min-value analyse exo-type ?values)
-         "lux deg max-value" (analyse-deg-max-value analyse exo-type ?values)
+         "lux deg min" (analyse-deg-min analyse exo-type ?values)
+         "lux deg max" (analyse-deg-max analyse exo-type ?values)
          "lux deg to-frac" (analyse-deg-to-frac analyse exo-type ?values)
          "lux deg scale" (analyse-deg-scale analyse exo-type ?values)
          "lux deg reciprocal" (analyse-deg-reciprocal analyse exo-type ?values)
@@ -555,9 +555,9 @@
          "lux frac <" (analyse-frac-lt analyse exo-type ?values)
          "lux frac encode" (analyse-frac-encode analyse exo-type ?values)
          "lux frac decode" (analyse-frac-decode analyse exo-type ?values)
-         "lux frac smallest-value" (analyse-frac-smallest-value analyse exo-type ?values)
-         "lux frac min-value" (analyse-frac-min-value analyse exo-type ?values)
-         "lux frac max-value" (analyse-frac-max-value analyse exo-type ?values)
+         "lux frac smallest" (analyse-frac-smallest analyse exo-type ?values)
+         "lux frac min" (analyse-frac-min analyse exo-type ?values)
+         "lux frac max" (analyse-frac-max analyse exo-type ?values)
          "lux frac not-a-number" (analyse-frac-not-a-number analyse exo-type ?values)
          "lux frac positive-infinity" (analyse-frac-positive-infinity analyse exo-type ?values)
          "lux frac negative-infinity" (analyse-frac-negative-infinity 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 af4ff99e9..1fe6f2e5e 100644
--- a/luxc/src/lux/compiler/js/proc/common.clj
+++ b/luxc/src/lux/compiler/js/proc/common.clj
@@ -156,18 +156,18 @@
     (|do [:let [(&/$Nil) ?values]]
       (<compiler> <value>)))
 
-  ^:private compile-nat-min-value &&lux/compile-nat  0
-  ^:private compile-nat-max-value &&lux/compile-nat -1
+  ^:private compile-nat-min &&lux/compile-nat  0
+  ^:private compile-nat-max &&lux/compile-nat -1
 
-  ^:private compile-int-min-value &&lux/compile-int Long/MIN_VALUE
-  ^:private compile-int-max-value &&lux/compile-int Long/MAX_VALUE
+  ^:private compile-int-min &&lux/compile-int Long/MIN_VALUE
+  ^:private compile-int-max &&lux/compile-int Long/MAX_VALUE
   
-  ^:private compile-deg-min-value &&lux/compile-deg  0
-  ^:private compile-deg-max-value &&lux/compile-deg -1
+  ^:private compile-deg-min &&lux/compile-deg  0
+  ^:private compile-deg-max &&lux/compile-deg -1
 
-  ^:private compile-frac-smallest-value &&lux/compile-frac Double/MIN_VALUE
-  ^:private compile-frac-min-value &&lux/compile-frac (* -1.0 Double/MAX_VALUE)
-  ^:private compile-frac-max-value &&lux/compile-frac Double/MAX_VALUE
+  ^:private compile-frac-smallest &&lux/compile-frac Double/MIN_VALUE
+  ^:private compile-frac-min &&lux/compile-frac (* -1.0 Double/MAX_VALUE)
+  ^:private compile-frac-max &&lux/compile-frac Double/MAX_VALUE
 
   ^:private compile-frac-not-a-number      &&lux/compile-frac "NaN" 
   ^:private compile-frac-positive-infinity &&lux/compile-frac "Infinity"
@@ -295,8 +295,8 @@
       (return (str "(" =text ")." <method> "()"))))
 
   ^:private compile-text-trim       "trim"
-  ^:private compile-text-upper-case "toUpperCase"
-  ^:private compile-text-lower-case "toLowerCase"
+  ^:private compile-text-upper "toUpperCase"
+  ^:private compile-text-lower "toLowerCase"
   )
 
 (defn ^:private compile-char-to-text [compile ?values special-args]
@@ -455,8 +455,8 @@
       "replace-all"          (compile-text-replace-all compile ?values special-args)
       "trim"                 (compile-text-trim compile ?values special-args)
       "char"                 (compile-text-char compile ?values special-args)
-      "upper-case"           (compile-text-upper-case compile ?values special-args)
-      "lower-case"           (compile-text-lower-case compile ?values special-args)
+      "upper"           (compile-text-upper compile ?values special-args)
+      "lower"           (compile-text-lower compile ?values special-args)
       "contains?"            (compile-text-contains? compile ?values special-args)
       )
     
@@ -487,8 +487,8 @@
       "%"         (compile-nat-rem compile ?values special-args)
       "="         (compile-nat-eq compile ?values special-args)
       "<"         (compile-nat-lt compile ?values special-args)
-      "max-value" (compile-nat-max-value compile ?values special-args)
-      "min-value" (compile-nat-min-value compile ?values special-args)
+      "max" (compile-nat-max compile ?values special-args)
+      "min" (compile-nat-min compile ?values special-args)
       "to-int"    (compile-nat-to-int compile ?values special-args)
       "to-char"   (compile-nat-to-char compile ?values special-args)
       )
@@ -502,8 +502,8 @@
       "%"         (compile-int-rem compile ?values special-args)
       "="         (compile-int-eq compile ?values special-args)
       "<"         (compile-int-lt compile ?values special-args)
-      "max-value" (compile-int-max-value compile ?values special-args)
-      "min-value" (compile-int-min-value compile ?values special-args)
+      "max" (compile-int-max compile ?values special-args)
+      "min" (compile-int-min compile ?values special-args)
       "to-nat"    (compile-int-to-nat compile ?values special-args)
       "to-frac"   (compile-int-to-frac compile ?values special-args)
       )
@@ -517,8 +517,8 @@
       "%"         (compile-deg-rem compile ?values special-args)
       "="         (compile-deg-eq compile ?values special-args)
       "<"         (compile-deg-lt compile ?values special-args)
-      "max-value" (compile-deg-max-value compile ?values special-args)
-      "min-value" (compile-deg-min-value compile ?values special-args)
+      "max" (compile-deg-max compile ?values special-args)
+      "min" (compile-deg-min compile ?values special-args)
       "to-frac"   (compile-deg-to-frac compile ?values special-args)
       "scale"     (compile-deg-scale compile ?values special-args)
       "reciprocal" (compile-deg-reciprocal compile ?values special-args)
@@ -535,9 +535,9 @@
       "<"         (compile-frac-lt compile ?values special-args)
       "encode"    (compile-frac-encode compile ?values special-args)
       "decode"    (compile-frac-decode compile ?values special-args)
-      "smallest-value" (compile-frac-smallest-value compile ?values special-args)
-      "max-value" (compile-frac-max-value compile ?values special-args)
-      "min-value" (compile-frac-min-value compile ?values special-args)
+      "smallest" (compile-frac-smallest compile ?values special-args)
+      "max" (compile-frac-max compile ?values special-args)
+      "min" (compile-frac-min compile ?values special-args)
       "not-a-number" (compile-frac-not-a-number compile ?values special-args)
       "positive-infinity" (compile-frac-positive-infinity compile ?values special-args)
       "negative-infinity" (compile-frac-negative-infinity 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 16774a479..3c948e8bc 100644
--- a/luxc/src/lux/compiler/jvm/proc/common.clj
+++ b/luxc/src/lux/compiler/jvm/proc/common.clj
@@ -334,18 +334,18 @@
                     <wrapper>)]]
       (return nil)))
 
-  ^:private compile-nat-min-value (.visitLdcInsn 0)  &&/wrap-long
-  ^:private compile-nat-max-value (.visitLdcInsn -1) &&/wrap-long
+  ^:private compile-nat-min (.visitLdcInsn 0)  &&/wrap-long
+  ^:private compile-nat-max (.visitLdcInsn -1) &&/wrap-long
 
-  ^:private compile-int-min-value (.visitLdcInsn Long/MIN_VALUE)  &&/wrap-long
-  ^:private compile-int-max-value (.visitLdcInsn Long/MAX_VALUE) &&/wrap-long
+  ^:private compile-int-min (.visitLdcInsn Long/MIN_VALUE)  &&/wrap-long
+  ^:private compile-int-max (.visitLdcInsn Long/MAX_VALUE) &&/wrap-long
   
-  ^:private compile-deg-min-value (.visitLdcInsn 0)  &&/wrap-long
-  ^:private compile-deg-max-value (.visitLdcInsn -1) &&/wrap-long
+  ^:private compile-deg-min (.visitLdcInsn 0)  &&/wrap-long
+  ^:private compile-deg-max (.visitLdcInsn -1) &&/wrap-long
 
-  ^:private compile-frac-smallest-value (.visitLdcInsn Double/MIN_VALUE)  &&/wrap-double
-  ^:private compile-frac-min-value (.visitLdcInsn (* -1.0 Double/MAX_VALUE))  &&/wrap-double
-  ^:private compile-frac-max-value (.visitLdcInsn Double/MAX_VALUE) &&/wrap-double
+  ^:private compile-frac-smallest (.visitLdcInsn Double/MIN_VALUE)  &&/wrap-double
+  ^:private compile-frac-min (.visitLdcInsn (* -1.0 Double/MAX_VALUE))  &&/wrap-double
+  ^:private compile-frac-max (.visitLdcInsn Double/MAX_VALUE) &&/wrap-double
 
   ^:private compile-frac-not-a-number (.visitLdcInsn Double/NaN) &&/wrap-double
   ^:private compile-frac-positive-infinity (.visitLdcInsn Double/POSITIVE_INFINITY) &&/wrap-double
@@ -606,8 +606,8 @@
                     (.visitMethodInsn Opcodes/INVOKEVIRTUAL "java/lang/String" <method> "()Ljava/lang/String;"))]]
       (return nil)))
 
-  ^:private compile-text-upper-case "toUpperCase"
-  ^:private compile-text-lower-case "toLowerCase"
+  ^:private compile-text-upper "toUpperCase"
+  ^:private compile-text-lower "toLowerCase"
   )
 
 (defn ^:private compile-text-char [compile ?values special-args]
@@ -830,8 +830,8 @@
       "hash"                 (compile-text-hash compile ?values special-args)
       "replace-all"          (compile-text-replace-all compile ?values special-args)
       "char"                 (compile-text-char compile ?values special-args)
-      "upper-case"           (compile-text-upper-case compile ?values special-args)
-      "lower-case"           (compile-text-lower-case compile ?values special-args)
+      "upper"           (compile-text-upper compile ?values special-args)
+      "lower"           (compile-text-lower compile ?values special-args)
       "contains?"            (compile-text-contains? compile ?values special-args)
       )
     
@@ -862,8 +862,8 @@
       "%"         (compile-nat-rem compile ?values special-args)
       "="         (compile-nat-eq compile ?values special-args)
       "<"         (compile-nat-lt compile ?values special-args)
-      "max-value" (compile-nat-max-value compile ?values special-args)
-      "min-value" (compile-nat-min-value compile ?values special-args)
+      "max" (compile-nat-max compile ?values special-args)
+      "min" (compile-nat-min compile ?values special-args)
       "to-int"    (compile-nat-to-int compile ?values special-args)
       "to-char"   (compile-nat-to-char compile ?values special-args)
       )
@@ -877,8 +877,8 @@
       "%"         (compile-deg-rem compile ?values special-args)
       "="         (compile-deg-eq compile ?values special-args)
       "<"         (compile-deg-lt compile ?values special-args)
-      "max-value" (compile-deg-max-value compile ?values special-args)
-      "min-value" (compile-deg-min-value compile ?values special-args)
+      "max" (compile-deg-max compile ?values special-args)
+      "min" (compile-deg-min compile ?values special-args)
       "to-frac"   (compile-deg-to-frac compile ?values special-args)
       "scale"     (compile-deg-scale compile ?values special-args)
       "reciprocal" (compile-deg-reciprocal compile ?values special-args)
@@ -893,8 +893,8 @@
       "%"         (compile-int-rem compile ?values special-args)
       "="         (compile-int-eq compile ?values special-args)
       "<"         (compile-int-lt compile ?values special-args)
-      "max-value" (compile-int-max-value compile ?values special-args)
-      "min-value" (compile-int-min-value compile ?values special-args)
+      "max" (compile-int-max compile ?values special-args)
+      "min" (compile-int-min compile ?values special-args)
       "to-nat"    (compile-int-to-nat compile ?values special-args)
       "to-frac"   (compile-int-to-frac compile ?values special-args)
       )
@@ -908,9 +908,9 @@
       "%"         (compile-frac-rem compile ?values special-args)
       "="         (compile-frac-eq compile ?values special-args)
       "<"         (compile-frac-lt compile ?values special-args)
-      "smallest-value" (compile-frac-smallest-value compile ?values special-args)
-      "max-value" (compile-frac-max-value compile ?values special-args)
-      "min-value" (compile-frac-min-value compile ?values special-args)
+      "smallest" (compile-frac-smallest compile ?values special-args)
+      "max" (compile-frac-max compile ?values special-args)
+      "min" (compile-frac-min compile ?values special-args)
       "not-a-number" (compile-frac-not-a-number compile ?values special-args)
       "positive-infinity" (compile-frac-positive-infinity compile ?values special-args)
       "negative-infinity" (compile-frac-negative-infinity compile ?values special-args)