From e65e734e5df3746ffb7df2cc9fa33826e0083fcd Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 6 May 2018 03:30:47 -0400 Subject: - Re-named shift-left -> left-shift, shift-right -> logical-right-shift, signed-shift-right -> arithmetic-right-shift. --- .../source/luxc/lang/translation/js/eval.jvm.lux | 4 +-- .../luxc/lang/translation/js/primitive.jvm.lux | 4 +-- .../lang/translation/js/procedure/common.jvm.lux | 12 ++++----- .../luxc/lang/translation/js/runtime.jvm.lux | 30 +++++++++++----------- 4 files changed, 25 insertions(+), 25 deletions(-) (limited to 'new-luxc/source/luxc/lang/translation/js') diff --git a/new-luxc/source/luxc/lang/translation/js/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/js/eval.jvm.lux index 3d4dbc782..5b2499eb0 100644 --- a/new-luxc/source/luxc/lang/translation/js/eval.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/js/eval.jvm.lux @@ -64,9 +64,9 @@ [[(Number::longValue [] (:! Number high)) (Number::longValue [] (:! Number low))] [high low]]) - (#.Some (nat-to-int (n/+ (|> high (:! Nat) (bit.shift-left +32)) + (#.Some (nat-to-int (n/+ (|> high (:! Nat) (bit.left-shift +32)) (if (i/< 0 (:! Int low)) - (|> low (:! Nat) (bit.shift-left +32) (bit.shift-right +32)) + (|> low (:! Nat) (bit.left-shift +32) (bit.logical-right-shift +32)) (|> low (:! Nat)))))) _ diff --git a/new-luxc/source/luxc/lang/translation/js/primitive.jvm.lux b/new-luxc/source/luxc/lang/translation/js/primitive.jvm.lux index 2e1bf8389..270fa510d 100644 --- a/new-luxc/source/luxc/lang/translation/js/primitive.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/js/primitive.jvm.lux @@ -13,12 +13,12 @@ (-> Bool (Meta Expression)) (|>> %b meta/wrap)) -(def: low-mask Nat (n/dec (bit.shift-left +32 +1))) +(def: low-mask Nat (n/dec (bit.left-shift +32 +1))) (def: #export (translate-nat value) (-> Nat (Meta Expression)) (let [high (|> value - (bit.shift-right +32) + (bit.logical-right-shift +32) nat-to-int %i) low (|> value (bit.and low-mask) 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 15c48a138..14e37efb8 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 @@ -163,9 +163,9 @@ (let [simple-param (format runtimeT.int//to-number "(" paramJS ")")] (format "(" subjectJS "," simple-param ")")))] - [bit//shift-left runtimeT.bit//shift-left] - [bit//shift-right runtimeT.bit//signed-shift-right] - [bit//unsigned-shift-right runtimeT.bit//shift-right] + [bit//left-shift runtimeT.bit//left-shift] + [bit//arithmetic-right-shift runtimeT.bit//arithmetic-right-shift] + [bit//logical-right-shift runtimeT.bit//logical-right-shift] ) (def: (bit//count subjectJS) @@ -474,9 +474,9 @@ (install "and" (binary bit//and)) (install "or" (binary bit//or)) (install "xor" (binary bit//xor)) - (install "shift-left" (binary bit//shift-left)) - (install "unsigned-shift-right" (binary bit//unsigned-shift-right)) - (install "shift-right" (binary bit//shift-right)) + (install "left-shift" (binary bit//left-shift)) + (install "logical-right-shift" (binary bit//logical-right-shift)) + (install "arithmetic-right-shift" (binary bit//arithmetic-right-shift)) ))) (def: nat-procs diff --git a/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux index 2adb118f8..afb3cd538 100644 --- a/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux @@ -310,7 +310,7 @@ "return " cast ";" "})"))) -(runtime: bit//shift-left "shlI64" +(runtime: bit//left-shift "shlI64" (format "(function " @ "(input,shift) {" "shift &= 63;" (format "if(shift === 0) {" @@ -329,7 +329,7 @@ "}") "})")) -(runtime: bit//signed-shift-right "shrI64" +(runtime: bit//arithmetic-right-shift "shrI64" (format "(function " @ "(input,shift) {" "shift &= 63;" (format "if(shift === 0) {" @@ -349,7 +349,7 @@ "}") "})")) -(runtime: bit//shift-right "ushrI64" +(runtime: bit//logical-right-shift "ushrI64" (format "(function " @ "(input,shift) {" "shift &= 63;" (format "if(shift === 0) {" @@ -379,9 +379,9 @@ __bit//not __bit//count32 __bit//count - __bit//shift-left - __bit//signed-shift-right - __bit//shift-right)) + __bit//left-shift + __bit//arithmetic-right-shift + __bit//logical-right-shift)) (runtime: int//- "subI64" (format "(function " @ "(l,r) {" @@ -494,8 +494,8 @@ [(=I int//min "parameter") (js.return! int//one)]) (js.block! (list (js.var! "approximation" - (#.Some (js.apply bit//shift-left - (list (recur (js.apply bit//signed-shift-right + (#.Some (js.apply bit//left-shift + (list (recur (js.apply bit//arithmetic-right-shift (list "subject" (js.number 1.0))) "parameter") (js.number 1.0))))) @@ -628,7 +628,7 @@ [(>N "subject" "parameter") (js.return! int//zero)] - [(>N (js.apply bit//shift-right + [(>N (js.apply bit//logical-right-shift (list "subject" (js.number 1.0))) "parameter") (js.return! int//one)]) @@ -684,11 +684,11 @@ "var lH = " int//from-number "(l.H);" "var rH = " int//from-number "(r.H);" - "var bottom = " bit//shift-right "(" int//* "(lL,rL),32);" + "var bottom = " bit//logical-right-shift "(" int//* "(lL,rL),32);" "var middle = " int//+ "(" int//* "(lH,rL)," int//* "(lL,rH));" "var top = " int//* "(lH,rH);" - "var bottomAndMiddle = " bit//shift-right "(" int//+ "(middle,bottom),32);" + "var bottomAndMiddle = " bit//logical-right-shift "(" int//+ "(middle,bottom),32);" "return " int//+ "(top,bottomAndMiddle);" "})")) @@ -698,7 +698,7 @@ "var zeroes = 64;" (format "while(!" int//= "(input," int//zero ")) {" "zeroes--;" - "input = " bit//shift-right "(input,1);" + "input = " bit//logical-right-shift "(input,1);" "}") "return zeroes;" "})")) @@ -710,9 +710,9 @@ "}" "else {" "var minShift = Math.min(" deg//leading-zeroes "(l), " deg//leading-zeroes "(r));" - "l = " bit//shift-left "(l,minShift);" - "r = " bit//shift-left "(r,minShift);" - "return " bit//shift-left "(" int/// "(l," int//from-number "(r.H)),32);" + "l = " bit//left-shift "(l,minShift);" + "r = " bit//left-shift "(r,minShift);" + "return " bit//left-shift "(" int/// "(l," int//from-number "(r.H)),32);" "}") "})")) -- cgit v1.2.3