Mercurial > hg > xemacs-beta

diff lisp/mule/ccl.el @ 5366:f00192e1cd49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Examining the result of #'length: `eql', not `=', it's better style & cheaper 2011-03-08 Aidan Kehoe <kehoea@parhasard.net> * buff-menu.el (list-buffers-noselect): * byte-optimize.el (byte-optimize-identity): * byte-optimize.el (byte-optimize-if): * byte-optimize.el (byte-optimize-nth): * byte-optimize.el (byte-optimize-nthcdr): * bytecomp.el (byte-compile-warn-wrong-args): * bytecomp.el (byte-compile-two-args-19->20): * bytecomp.el (byte-compile-list): * bytecomp.el (byte-compile-beginning-of-line): * bytecomp.el (byte-compile-set): * bytecomp.el (byte-compile-set-default): * bytecomp.el (byte-compile-values): * bytecomp.el (byte-compile-values-list): * bytecomp.el (byte-compile-integerp): * bytecomp.el (byte-compile-multiple-value-list-internal): * bytecomp.el (byte-compile-throw): * cl-macs.el (cl-do-arglist): * cl-macs.el (cl-parse-loop-clause): * cl-macs.el (multiple-value-bind): * cl-macs.el (multiple-value-setq): * cl-macs.el (get-setf-method): * cmdloop.el (command-error): * cmdloop.el (y-or-n-p-minibuf): * cmdloop.el (yes-or-no-p-minibuf): * coding.el (unencodable-char-position): * cus-edit.el (custom-face-prompt): * cus-edit.el (custom-buffer-create-internal): * cus-edit.el (widget-face-action): * cus-edit.el (custom-group-value-create): * descr-text.el (describe-char-unicode-data): * dialog-gtk.el (popup-builtin-question-dialog): * dragdrop.el (experimental-dragdrop-drop-log-function): * dragdrop.el (experimental-dragdrop-drop-mime-default): * easymenu.el (easy-menu-add): * easymenu.el (easy-menu-remove): * faces.el (read-face-name): * faces.el (set-face-stipple): * files.el (file-name-non-special): * font.el (font-combine-fonts): * font.el (font-set-face-font): * font.el (font-parse-rgb-components): * font.el (font-rgb-color-p): * font.el (font-color-rgb-components): * gnuserv.el (gnuserv-edit-files): * help.el (key-or-menu-binding): * help.el (function-documentation-1): * help.el (function-documentation): * info.el (info): * isearch-mode.el (isearch-exit): * isearch-mode.el (isearch-edit-string): * isearch-mode.el (isearch-*-char): * isearch-mode.el (isearch-complete1): * ldap.el (ldap-encode-country-string): * ldap.el (ldap-decode-string): * minibuf.el (read-file-name-internal-1): * minibuf.el (read-non-nil-coding-system): * minibuf.el (get-user-response): * mouse.el (drag-window-divider): * mule/ccl.el: * mule/ccl.el (ccl-compile-if): * mule/ccl.el (ccl-compile-break): * mule/ccl.el (ccl-compile-repeat): * mule/ccl.el (ccl-compile-write-repeat): * mule/ccl.el (ccl-compile-call): * mule/ccl.el (ccl-compile-end): * mule/ccl.el (ccl-compile-read-multibyte-character): * mule/ccl.el (ccl-compile-write-multibyte-character): * mule/ccl.el (ccl-compile-translate-character): * mule/ccl.el (ccl-compile-mule-to-unicode): * mule/ccl.el (ccl-compile-unicode-to-mule): * mule/ccl.el (ccl-compile-lookup-integer): * mule/ccl.el (ccl-compile-lookup-character): * mule/ccl.el (ccl-compile-map-multiple): * mule/ccl.el (ccl-compile-map-single): * mule/devan-util.el (devanagari-compose-to-one-glyph): * mule/devan-util.el (devanagari-composition-component): * mule/mule-cmds.el (finish-set-language-environment): * mule/viet-util.el: * mule/viet-util.el (viet-encode-viscii-char): * multicast.el (open-multicast-group): * newcomment.el (comment-quote-nested): * newcomment.el (comment-region): * newcomment.el (comment-dwim): * regexp-opt.el (regexp-opt-group): * replace.el (map-query-replace-regexp): * specifier.el (derive-device-type-from-tag-set): * subr.el (skip-chars-quote): * test-harness.el (test-harness-from-buffer): * test-harness.el (batch-test-emacs): * wid-edit.el (widget-choice-action): * wid-edit.el (widget-symbol-prompt-internal): * wid-edit.el (widget-color-action): * window-xemacs.el (push-window-configuration): * window-xemacs.el (pop-window-configuration): * window.el (quit-window): * x-compose.el (electric-diacritic): It's better style, and cheaper (often one assembler instruction vs. a C funcall in the byte code), to use `eql' instead of `=' when it's clear what numerical type a given result will be. Change much of our code to do this, with the help of a byte-compiler change (not comitted) that looked for calls to #'length (which always returns an integer) in its args.
author Aidan Kehoe <kehoea@parhasard.net>
date Tue, 08 Mar 2011 23:41:52 +0000
parents 476d0799d704
children 3889ef128488 ac37a5f7e5be
line wrap: on
line diff
--- a/lisp/mule/ccl.el	Tue Mar 08 22:32:49 2011 +0000
+++ b/lisp/mule/ccl.el	Tue Mar 08 23:41:52 2011 +0000
@@ -473,7 +473,7 @@
 ;; If READ-FLAG is non-nil, this statement has the form
 ;; `(read-if (REG OPERATOR ARG) TRUE-PART FALSE-PART)'.
 (defun ccl-compile-if (cmd &optional read-flag)
-  (if (and (/= (length cmd) 3) (/= (length cmd) 4))
+  (if (and (not (<= 3 (length cmd) 4)))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((condition (nth 1 cmd))
 	(true-cmds (nth 2 cmd))
@@ -646,7 +646,7 @@
 
 ;; Compile BREAK statement.
 (defun ccl-compile-break (cmd)
-  (if (/= (length cmd) 1)
+  (if (not (eql (length cmd) 1))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (if (null ccl-loop-head)
       (error "CCL: No outer loop: %s" cmd))
@@ -656,7 +656,7 @@
 
 ;; Compile REPEAT statement.
 (defun ccl-compile-repeat (cmd)
-  (if (/= (length cmd) 1)
+  (if (not (eql (length cmd) 1))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (if (null ccl-loop-head)
       (error "CCL: No outer loop: %s" cmd))
@@ -665,7 +665,7 @@
 
 ;; Compile WRITE-REPEAT statement.
 (defun ccl-compile-write-repeat (cmd)
-  (if (/= (length cmd) 2)
+  (if (not (eql (length cmd) 2))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (if (null ccl-loop-head)
       (error "CCL: No outer loop: %s" cmd))
@@ -783,7 +783,7 @@
 
 ;; Compile CALL statement.
 (defun ccl-compile-call (cmd)
-  (if (/= (length cmd) 2)
+  (if (not (eql (length cmd) 2))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (if (not (symbolp (nth 1 cmd)))
       (error "CCL: Subroutine should be a symbol: %s" cmd))
@@ -793,14 +793,14 @@
 
 ;; Compile END statement.
 (defun ccl-compile-end (cmd)
-  (if (/= (length cmd) 1)
+  (if (not (eql (length cmd) 1))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (ccl-embed-code 'end 0 0)
   t)
 
 ;; Compile read-multibyte-character
 (defun ccl-compile-read-multibyte-character (cmd)
-  (if (/= (length cmd) 3)
+  (if (not (eql (length cmd) 3))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((RRR (nth 1 cmd))
 	(rrr (nth 2 cmd)))
@@ -811,7 +811,7 @@
 
 ;; Compile write-multibyte-character
 (defun ccl-compile-write-multibyte-character (cmd)
-  (if (/= (length cmd) 3)
+  (if (not (eql (length cmd) 3))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((RRR (nth 1 cmd))
 	(rrr (nth 2 cmd)))
@@ -822,7 +822,7 @@
 
 ;; Compile translate-character
 (defun ccl-compile-translate-character (cmd)
-  (if (/= (length cmd) 4)
+  (if (not (eql (length cmd) 4))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((Rrr (nth 1 cmd))
 	(RRR (nth 2 cmd))
@@ -840,7 +840,7 @@
 
 ;; Compile mule-to-unicode
 (defun ccl-compile-mule-to-unicode (cmd)
-  (if (/= (length cmd) 3)
+  (if (not (eql (length cmd) 3))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((RRR (nth 1 cmd))
 	(rrr (nth 2 cmd)))
@@ -852,7 +852,7 @@
 ;; Given a Unicode code point in register rrr, write the charset ID of the
 ;; corresponding character in RRR, and the Mule-CCL form of its code in rrr.
 (defun ccl-compile-unicode-to-mule (cmd)
-  (if (/= (length cmd) 3)
+  (if (not (eql (length cmd) 3))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((rrr (nth 1 cmd))
 	(RRR (nth 2 cmd)))
@@ -863,7 +863,7 @@
 
 ;; Compile lookup-integer
 (defun ccl-compile-lookup-integer (cmd)
-  (if (/= (length cmd) 4)
+  (if (not (eql (length cmd) 4))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((Rrr (nth 1 cmd))
 	(RRR (nth 2 cmd))
@@ -883,7 +883,7 @@
 
 ;; Compile lookup-character
 (defun ccl-compile-lookup-character (cmd)
-  (if (/= (length cmd) 4)
+  (if (not (eql (length cmd) 4))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((Rrr (nth 1 cmd))
 	(RRR (nth 2 cmd))
@@ -906,7 +906,7 @@
   nil)
 
 (defun ccl-compile-map-multiple (cmd)
-  (if (/= (length cmd) 4)
+  (if (not (eql (length cmd) 4))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let (func arg)
     (setq func
@@ -932,7 +932,7 @@
   nil)
 
 (defun ccl-compile-map-single (cmd)
-  (if (/= (length cmd) 4)
+  (if (not (eql (length cmd) 4))
       (error "CCL: Invalid number of arguments: %s" cmd))
   (let ((RRR (nth 1 cmd))
 	(rrr (nth 2 cmd))
@@ -1562,4 +1562,4 @@
 
 (provide 'ccl)
 
-;; ccl.el ends here
\ No newline at end of file
+;; ccl.el ends here