diff options
| author | Paul Eggert | 2018-08-21 13:44:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-08-21 13:44:32 -0700 |
| commit | f18af6cd5cb7dbbf7420ec2d3efed4e202c4f0dd (patch) | |
| tree | 5f42e48e12a0ec77bd5cd5f32255a534635e89bf /test/src/data-tests.el | |
| parent | 81e7eef8224c8a99a207b7a7b9dae1d598392ef7 (diff) | |
| download | emacs-f18af6cd5cb7dbbf7420ec2d3efed4e202c4f0dd.tar.gz emacs-f18af6cd5cb7dbbf7420ec2d3efed4e202c4f0dd.zip | |
Audit use of lsh and fix glitches
I audited use of lsh in the Lisp source code, and fixed the
glitches that I found. While I was at it, I replaced uses of lsh
with ash when either will do. Replacement is OK when either
argument is known to be nonnegative, or when only the low-order
bits of the result matter, and is a (minor) win since ash is a bit
more solid than lsh nowadays, and is a bit faster.
* lisp/calc/calc-ext.el (math-check-fixnum):
Prefer most-positive-fixnum to (lsh -1 -1).
* lisp/vc/vc-hg.el (vc-hg-state-fast): When testing fixnum width,
prefer (zerop (ash most-positive-fixnum -32)) to (zerop (lsh -1
32)) (Bug#32485#11).
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode):
Tighten sanity-check for bytecode overflow, by checking that the
result of (ash pc -8) is nonnegative. Formerly this check was not
needed since lsh was used and the number overflowed differently.
* lisp/net/dns.el (dns-write): Fix some obvious sign typos in
shift counts. Evidently this part of the code has never been
exercised.
* lisp/progmodes/hideif.el (hif-shiftleft, hif-shiftright):
* lisp/term/common-win.el (x-setup-function-keys):
Simplify.
* admin/unidata/unidata-gen.el, admin/unidata/uvs.el:
* doc/lispref/keymaps.texi, doc/lispref/syntax.texi:
* doc/misc/calc.texi, doc/misc/cl.texi, etc/NEWS.19:
* lisp/arc-mode.el, lisp/calc/calc-bin.el, lisp/calc/calc-comb.el:
* lisp/calc/calc-ext.el, lisp/calc/calc-math.el:
* lisp/cedet/semantic/wisent/comp.el, lisp/composite.el:
* lisp/disp-table.el, lisp/dos-fns.el, lisp/edmacro.el:
* lisp/emacs-lisp/bindat.el, lisp/emacs-lisp/byte-opt.el:
* lisp/emacs-lisp/bytecomp.el, lisp/emacs-lisp/cl-extra.el:
* lisp/erc/erc-dcc.el, lisp/facemenu.el, lisp/gnus/message.el:
* lisp/gnus/nndoc.el, lisp/gnus/nnmaildir.el, lisp/image.el:
* lisp/international/ccl.el, lisp/international/fontset.el:
* lisp/international/mule-cmds.el, lisp/international/mule.el:
* lisp/json.el, lisp/mail/binhex.el, lisp/mail/rmail.el:
* lisp/mail/uudecode.el, lisp/md4.el, lisp/net/dns.el:
* lisp/net/ntlm.el, lisp/net/sasl.el, lisp/net/socks.el:
* lisp/net/tramp.el, lisp/obsolete/levents.el:
* lisp/obsolete/pgg-parse.el, lisp/org/org.el:
* lisp/org/ox-publish.el, lisp/progmodes/cc-defs.el:
* lisp/progmodes/ebnf2ps.el, lisp/progmodes/hideif.el:
* lisp/ps-bdf.el, lisp/ps-print.el, lisp/simple.el:
* lisp/tar-mode.el, lisp/term/common-win.el:
* lisp/term/tty-colors.el, lisp/term/xterm.el, lisp/vc/vc-git.el:
* lisp/vc/vc-hg.el, lisp/x-dnd.el, test/src/data-tests.el:
Prefer ash to lsh when either will do.
Diffstat (limited to 'test/src/data-tests.el')
| -rw-r--r-- | test/src/data-tests.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/src/data-tests.el b/test/src/data-tests.el index 688c32d6eeb..701e579ae2e 100644 --- a/test/src/data-tests.el +++ b/test/src/data-tests.el | |||
| @@ -123,7 +123,7 @@ most-positive-fixnum, which is just less than a power of 2.") | |||
| 123 | (setq byte (lognot byte))) | 123 | (setq byte (lognot byte))) |
| 124 | (if (zerop byte) | 124 | (if (zerop byte) |
| 125 | 0 | 125 | 0 |
| 126 | (+ (logand byte 1) (data-tests-popcnt (lsh byte -1))))) | 126 | (+ (logand byte 1) (data-tests-popcnt (ash byte -1))))) |
| 127 | 127 | ||
| 128 | (ert-deftest data-tests-logcount () | 128 | (ert-deftest data-tests-logcount () |
| 129 | (should (cl-loop for n in (number-sequence -255 255) | 129 | (should (cl-loop for n in (number-sequence -255 255) |
| @@ -186,17 +186,17 @@ most-positive-fixnum, which is just less than a power of 2.") | |||
| 186 | (dotimes (_ 4) | 186 | (dotimes (_ 4) |
| 187 | (aset bv i (> (logand 1 n) 0)) | 187 | (aset bv i (> (logand 1 n) 0)) |
| 188 | (cl-incf i) | 188 | (cl-incf i) |
| 189 | (setf n (lsh n -1))))) | 189 | (setf n (ash n -1))))) |
| 190 | bv)) | 190 | bv)) |
| 191 | 191 | ||
| 192 | (defun test-bool-vector-to-hex-string (bv) | 192 | (defun test-bool-vector-to-hex-string (bv) |
| 193 | (let (nibbles (v (cl-coerce bv 'list))) | 193 | (let (nibbles (v (cl-coerce bv 'list))) |
| 194 | (while v | 194 | (while v |
| 195 | (push (logior | 195 | (push (logior |
| 196 | (lsh (if (nth 0 v) 1 0) 0) | 196 | (ash (if (nth 0 v) 1 0) 0) |
| 197 | (lsh (if (nth 1 v) 1 0) 1) | 197 | (ash (if (nth 1 v) 1 0) 1) |
| 198 | (lsh (if (nth 2 v) 1 0) 2) | 198 | (ash (if (nth 2 v) 1 0) 2) |
| 199 | (lsh (if (nth 3 v) 1 0) 3)) | 199 | (ash (if (nth 3 v) 1 0) 3)) |
| 200 | nibbles) | 200 | nibbles) |
| 201 | (setf v (nthcdr 4 v))) | 201 | (setf v (nthcdr 4 v))) |
| 202 | (mapconcat (lambda (n) (format "%X" n)) | 202 | (mapconcat (lambda (n) (format "%X" n)) |