- Re-named shift-left -> left-shift, shift-right -> logical-right-shift, signed-shift-right -> arithmetic-right-shift.

3 files changed, 18 insertions, 18 deletions

diff --git a/luxc/src/lux/analyser/proc/common.clj b/luxc/src/lux/analyser/proc/common.clj
index 80271f9e7..9a90c219e 100644
--- a/luxc/src/lux/analyser/proc/common.clj
+++ b/luxc/src/lux/analyser/proc/common.clj
@@ -154,9 +154,9 @@
       (return (&/|list (&&/|meta exo-type _cursor
                                  (&&/$proc (&/T ["bit" <op>]) (&/|list =input =shift) (&/|list)))))))
 
-  ^:private analyse-bit-shift-left           "shift-left"           &type/Nat
-  ^:private analyse-bit-shift-right          "shift-right"          &type/Int
-  ^:private analyse-bit-unsigned-shift-right "unsigned-shift-right" &type/Nat
+  ^:private analyse-bit-left-shift             "left-shift"             &type/Nat
+  ^:private analyse-bit-arithmetic-right-shift "arithmetic-right-shift" &type/Int
+  ^:private analyse-bit-logical-right-shift    "logical-right-shift"    &type/Nat
   )
 
 (do-template [<name> <proc> <input-type> <output-type>]
@@ -502,9 +502,9 @@
          "lux bit and"                  (analyse-bit-and analyse exo-type ?values)
          "lux bit or"                   (analyse-bit-or analyse exo-type ?values)
          "lux bit xor"                  (analyse-bit-xor analyse exo-type ?values)
-         "lux bit shift-left"           (analyse-bit-shift-left analyse exo-type ?values)
-         "lux bit shift-right"          (analyse-bit-shift-right analyse exo-type ?values)
-         "lux bit unsigned-shift-right" (analyse-bit-unsigned-shift-right analyse exo-type ?values)
+         "lux bit left-shift"           (analyse-bit-left-shift analyse exo-type ?values)
+         "lux bit arithmetic-right-shift" (analyse-bit-arithmetic-right-shift analyse exo-type ?values)
+         "lux bit logical-right-shift" (analyse-bit-logical-right-shift analyse exo-type ?values)
          
          "lux array new"    (analyse-array-new analyse exo-type ?values)
          "lux array get"    (analyse-array-get 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 7044f8447..c70ea6f9e 100644
--- a/luxc/src/lux/compiler/js/proc/common.clj
+++ b/luxc/src/lux/compiler/js/proc/common.clj
@@ -33,9 +33,9 @@
           =param (compile ?param)]
       (return (str "LuxRT$" <op> "(" =input "," =param ".L)"))))
 
-  ^:private compile-bit-shift-left           "shlI64"
-  ^:private compile-bit-shift-right          "shrI64"
-  ^:private compile-bit-unsigned-shift-right "ushrI64"
+  ^:private compile-bit-left-shift           "shlI64"
+  ^:private compile-bit-arithmetic-right-shift          "shrI64"
+  ^:private compile-bit-logical-right-shift "ushrI64"
   )
 
 (defn ^:private compile-bit-count [compile ?values special-args]
@@ -445,9 +445,9 @@
       "and"                  (compile-bit-and compile ?values special-args)
       "or"                   (compile-bit-or compile ?values special-args)
       "xor"                  (compile-bit-xor compile ?values special-args)
-      "shift-left"           (compile-bit-shift-left compile ?values special-args)
-      "shift-right"          (compile-bit-shift-right compile ?values special-args)
-      "unsigned-shift-right" (compile-bit-unsigned-shift-right compile ?values special-args))
+      "left-shift"           (compile-bit-left-shift compile ?values special-args)
+      "arithmetic-right-shift" (compile-bit-arithmetic-right-shift compile ?values special-args)
+      "logical-right-shift" (compile-bit-logical-right-shift compile ?values special-args))
     
     "array"
     (case proc
diff --git a/luxc/src/lux/compiler/jvm/proc/common.clj b/luxc/src/lux/compiler/jvm/proc/common.clj
index 138a56a26..fdd5f8c8a 100644
--- a/luxc/src/lux/compiler/jvm/proc/common.clj
+++ b/luxc/src/lux/compiler/jvm/proc/common.clj
@@ -156,9 +156,9 @@
                     &&/wrap-long)]]
       (return nil)))
 
-  ^:private compile-bit-shift-left           Opcodes/LSHL
-  ^:private compile-bit-shift-right          Opcodes/LSHR
-  ^:private compile-bit-unsigned-shift-right Opcodes/LUSHR
+  ^:private compile-bit-left-shift           Opcodes/LSHL
+  ^:private compile-bit-arithmetic-right-shift          Opcodes/LSHR
+  ^:private compile-bit-logical-right-shift Opcodes/LUSHR
   )
 
 (defn ^:private compile-lux-is [compile ?values special-args]
@@ -836,9 +836,9 @@
       "and"                  (compile-bit-and compile ?values special-args)
       "or"                   (compile-bit-or compile ?values special-args)
       "xor"                  (compile-bit-xor compile ?values special-args)
-      "shift-left"           (compile-bit-shift-left compile ?values special-args)
-      "shift-right"          (compile-bit-shift-right compile ?values special-args)
-      "unsigned-shift-right" (compile-bit-unsigned-shift-right compile ?values special-args))
+      "left-shift"           (compile-bit-left-shift compile ?values special-args)
+      "arithmetic-right-shift" (compile-bit-arithmetic-right-shift compile ?values special-args)
+      "logical-right-shift" (compile-bit-logical-right-shift compile ?values special-args))
     
     "array"
     (case proc