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. --- .../lang/translation/common-lisp/procedure/common.jvm.lux | 14 +++++++------- .../luxc/lang/translation/common-lisp/runtime.jvm.lux | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'new-luxc/source/luxc/lang/translation/common-lisp') 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 fe9fe43be..27a92c1cc 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 @@ -157,18 +157,18 @@ [bit//xor _.logxor] ) -(def: (bit//shift-left [subjectO paramO]) +(def: (bit//left-shift [subjectO paramO]) Binary (_.ash (_.rem (_.int 64) paramO) subjectO)) -(def: (bit//signed-shift-right [subjectO paramO]) +(def: (bit//arithmetic-right-shift [subjectO paramO]) Binary (_.ash (|> paramO (_.rem (_.int 64)) (_.* (_.int -1))) subjectO)) -(def: (bit//shift-right [subjectO paramO]) +(def: (bit//logical-right-shift [subjectO paramO]) Binary - (runtimeT.bit//shift-right (_.rem (_.int 64) paramO) subjectO)) + (runtimeT.bit//logical-right-shift (_.rem (_.int 64) paramO) subjectO)) (def: bit-procs Bundle @@ -177,9 +177,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//shift-right)) - (install "shift-right" (binary bit//signed-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)) ))) ## [[Arrays]] diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux index 33f72b995..96393c970 100644 --- a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux +++ b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux @@ -195,7 +195,7 @@ @@product//right @@sum//get))) -(runtime: (bit//shift-right shift input) +(runtime: (bit//logical-right-shift shift input) (_.if (_.= (_.int 0) (@@ shift)) (@@ input) (|> (@@ input) @@ -204,7 +204,7 @@ (def: runtime//bit Runtime - (_.progn (list @@bit//shift-right))) + (_.progn (list @@bit//logical-right-shift))) (do-template [ ] [(def: ( top value) -- cgit v1.2.3