Mercurial > emacs
annotate lisp/calc/calc-bin.el @ 47576:b31c8ab7336a
Sync with version 2.0.20. Lengthy ChangeLog follows:
2002-09-22 Kai Gro?ohann <grossjoh@ls6.informatik.uni-dortmund.de>
Version 2.0.20 released.
2002-09-20 Kai Gro?ohann <grossjoh@ls6.informatik.uni-dortmund.de>
* net/tramp.el (tramp-completion-function-alist): Escape open
paren in docstring.
(tramp-user-regexp, tramp-host-regexp): Allow empty strings.
(tramp-handle-insert-file-contents): Call tramp-message-for-buffer
instead of tramp-message.
(tramp-open-connection-rsh): Handle empty string as user name.
(tramp-open-connection-su): Handle empty string as host name.
Handle nil user name.
(tramp-handle-file-local-copy, tramp-handle-write-region)
(tramp-completion-handle-file-name-all-completions)
(tramp-open-connection-telnet, tramp-open-connection-rsh)
(tramp-open-connection-su, tramp-post-connection)
(tramp-maybe-open-connection, tramp-method-out-of-band-p)
(tramp-get-connection-function, tramp-get-remote-sh)
(tramp-get-rsh-program, tramp-get-rsh-args)
(tramp-get-rcp-program, tramp-get-rcp-args)
(tramp-get-rcp-keep-date-arg, tramp-get-su-program)
(tramp-get-su-args, tramp-get-telnet-program)
(tramp-get-telnet-args): Use `tramp-find-method', perhaps require
additional args USER, HOST.
(tramp-action-password, tramp-open-connection-telnet)
(tramp-open-connection-su, tramp-open-connection-multi)
(tramp-method-out-of-band-p): `tramp-method-out-of-band-p' now
takes USER and HOST arguments, to be able to use
`tramp-find-method'. Update callers.
(tramp-find-method): New function.
2002-09-20 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-handle-insert-directory): Handle "--dired"
in SWITCHES (by removing it).
2002-09-18 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-file-name-handler): Add `file-remote-p'
property.
2002-09-17 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (top-level): Maybe autoload uudecode-decode-region.
2002-09-16 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-bug): Add tramp-methods.
2002-09-16 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-methods): Update docstring:
tramp-encoding-command, tramp-decoding-command,
tramp-encoding-function and tramp-decoding-function are not
parameters anymore.
(tramp-uuencode-region): Autoload it.
2002-09-13 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
Version 2.0.19 released.
* net/tramp-uu.el: New file, implements uuencode in Lisp.
* net/tramp.el (tramp-coding-commands): Use
`tramp-uuencode-region' as local encoder for the uuencode based
entries.
2002-09-13 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-handle-write-region): Wrong parens.
2002-09-13 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
Version 2.0.18 released.
* net/tramp.el (tramp-perl-decode): Perl changes to accomodate
older versions of Perl. Now tested with 5.004. Suggestion from
Michael Albinus.
2002-09-12 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-find-inline-encoding): Call
tramp-call-local-coding-command with nil for INPUT and OUTPUT.
(tramp-call-local-coding-command): OUTPUT equals nil means to
discard the output. INPUT equals nil means /dev/null.
2002-09-12 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-encoding-shell): Default to environment
variable COMSPEC on Windows.
(tramp-handle-write-region): More debugging output.
(tramp-find-inline-encoding): Ditto.
2002-09-11 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-handle-file-name-all-completions):
Define `result1'.
(tramp-parse-hosts-group): Discard IPv6 entries.
2002-09-11 Kai Gro?ohann <grossjoh@ls6.informatik.uni-dortmund.de>
* net/tramp.el (tramp-post-connection): Only send Perl
mime-encode/decode implementations when using inline method.
(tramp-handle-file-local-copy)
(tramp-handle-write-region, tramp-post-connection)
(tramp-coding-commands, tramp-find-inline-encoding): For the
inline encodings, distinguish between local and remote commands,
instead of between commands and functions. (The local commands
can be functions, too.) If the local host is a Windows machine,
we can't expect the same commands to work there as on the remote
host.
(tramp-call-local-coding-command): New function for calling local
encoding and decoding commands.
(tramp-set-remote-encoding, tramp-get-remote-encoding)
(tramp-set-remote-decoding, tramp-get-remote-decoding)
(tramp-set-local-encoding, tramp-get-local-encoding)
(tramp-set-local-decoding, tramp-get-local-decoding): New
functions.
(tramp-get-encoding-command, tramp-set-encoding-command)
(tramp-get-decoding-command, tramp-set-decoding-command)
(tramp-get-encoding-function, tramp-set-encoding-function)
(tramp-get-decoding-function, tramp-set-decoding-function): Old
functions, removed.
2002-09-10 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-open-connection-setup-interactive-shell):
Change command to invoke /bin/sh slightly to make it compatible
with the `rc' shell. Suggested by Daniel Pittman.
2002-09-10 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-handle-write-region): Added missing
`)'. Hope it's the right place.
2002-09-09 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-open-connection-setup-interactive-shell): Do
"exec env PS1='$ ' /bin/sh" instead of just "exec /bin/sh" in
order to get a sane shell prompt. If people have ${CWD}, say, in
their shell prompt, then the default login shell might display
something harmless, but the /bin/sh will display a dollar sign
which confused the subsequent prompt recognition.
(tramp-multi-action-password): More debugging output.
(tramp-encoding-shell): Renamed from tramp-sh-program. More
documentation. Default to cmd.exe on Windows NT.
(tramp-encoding-command-switch): New variable. Use instead of
hard-wired "-c" which is only good for /bin/sh.
(tramp-encoding-reads-stdin): New variable. If t, commands are
called like "/bin/sh -c COMMAND <INPUT", if nil, they are called
like "/bin/sh -c COMMAND INPUT", ie the input file is the last
argument.
(tramp-multi-sh-program): Always default to tramp-encoding-shell.
(tramp-handle-file-local-copy, tramp-handle-write-region): Respect
tramp-encoding-shell and friends.
(tramp-find-inline-encoding): Use new-style calls for checking if
the local commands work.
2002-09-07 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-methods): Remove `tramp-completion-function'
entries. They are handled now by
`tramp-completion-function-alist'.
(tramp-completion-function): Defvar removed. I've never used
it. Hmm.
(tramp-get-completion-function)
(tramp-get-completion-rsh, tramp-get-completion-ssh)
(tramp-get-completion-telnet, tramp-get-completion-su): Functions
removed as well. Not necessary any longer due to extended
customization means.
(tramp-completion-function-alist): New defcustom. Holds all
FUNCTION FILE pairs used for user and host name completion
relevant for METHOD.
(tramp-completion-function-alist-rsh)
(tramp-completion-function-alist-ssh)
(tramp-completion-function-alist-telnet)
(tramp-completion-function-alist-su): Defconst for initializing
`tramp-completion-function-alist'. Unfortunately, mainly UNIX-like
values are known for me until now. Needs to be completed for at
least VMS++ like operating systems.
(tramp-set-completion-function)
(tramp-get-completion-function): New functions for configuration
of `tramp-completion-function-alist'. The old definition of
`tramp-get-completion-function' has been discarded.
(tramp-completion-handle-file-name-all-completions): Change
function call for user/host completion according to definition in
`tramp-completion-function-alist'.
(tramp-parse-passwd): Added exception handling for "root", because
`tramp-get-completion-su' (the previous place for this stuff)
doesn't exist any longer.
2002-09-07 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-enter-password): Use
`tramp-password-end-of-line' to terminate the line.
(tramp-bug): Include new variable `tramp-password-end-of-line'.
(tramp-password-end-of-line): New variable. People who use plink
under Windows might have to issue "\r\n" after the password, but
they need to send just "\n" after the other commands. So this
variable was introduced to complement `tramp-rsh-end-of-line'.
(tramp-wait-for-output, tramp-post-connection): Allow "\r" at end
of line of the output delimiter.
2002-09-06 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-handle-file-local-copy, tramp-find-shell)
(tramp-open-connection-setup-interactive-shell): Add some comments
about Douglas Grey Stephen's suggestions to make Tramp work better
with plink under Windows. I'm not sure what to think of them, but
now I have a guinea pig to try it out on. Said guinea pig is
having other problems, though... Also remove some commented-out
code.
2002-09-06 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-get-completion-methods): Algorithm slightly
tuned.
(tramp-get-completion-user-host): Accept user names as they are if
typed until "@".
(tramp-completion-mode): Replace `last-input-char' by modern
`last-input-event'. Check for `event-modifiers'.
2002-09-06 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (file-expand-wildcards): Corrected check to see if
advising is necessary.
2002-09-05 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-postfix-single-method-format)
(tramp-postfix-multi-method-format)
(tramp-postfix-multi-hop-format)
(tramp-postfix-user-format): New format strings.
(tramp-postfix-single-method-regexp)
(tramp-postfix-multi-method-regexp)
(tramp-postfix-multi-hop-regexp)
(tramp-postfix-user-regexp)
(tramp-make-multi-tramp-file-format)
(tramp-make-tramp-file-name): Apply them.
(tramp-completion-handle-file-name-all-completions): Fix for
invoking ange-ftp in case of "/ftp:xxx" file names.
2002-09-04 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-prefix-format)
(tramp-postfix-host-format): New format strings.
(tramp-prefix-regexp, tramp-method-regexp)
(tramp-postfix-single-method-regexp)
(tramp-postfix-multi-method-regexp)
(tramp-postfix-multi-hop-regexp)
(tramp-user-regexp, tramp-postfix-user-regexp)
(tramp-host-regexp, tramp-postfix-host-regexp)
(tramp-path-regexp): New atomar regular expressions. If
corresponding format strings exist, derived from them.
(tramp-file-name-structure)
(tramp-multi-file-name-structure)
(tramp-multi-file-name-hop-structure)
(tramp-make-multi-tramp-file-format)
(tramp-completion-mode)
(tramp-completion-dissect-file-name)
(tramp-parse-rhosts-group)
(tramp-parse-shosts-group)
(tramp-parse-hosts-group)
(tramp-parse-passwd-group): Apply these expressions.
(tramp-file-name-structure-unified)
(tramp-file-name-structure-separate)
(tramp-make-tramp-file-format-unified)
(tramp-make-tramp-file-format-separate)
(tramp-make-tramp-file-format)
(tramp-make-tramp-file-user-nil-format-unified)
(tramp-make-tramp-file-user-nil-format-separate)
(tramp-make-tramp-file-user-nil-format)
(tramp-multi-file-name-structure-unified)
(tramp-multi-file-name-structure-separate)
(tramp-multi-file-name-hop-structure-unified)
(tramp-multi-file-name-hop-structure-separate)
(tramp-make-multi-tramp-file-format-unified)
(tramp-make-multi-tramp-file-format-separate): Removed.
(tramp-make-tramp-file-name): Allow partial tramp file
names. Generate tramp file format on-the-fly depending on
parameters. Apply atomar format strings resp expressions.
(tramp-get-completion-methods)
(tramp-get-completion-user-host): Apply
`tramp-make-tramp-file-name'.
(tramp-parse-hosts-group): Take all host names and IP addresses
into account.
(tramp-bug): Remove `tramp-make-tramp-file-format'.
2002-09-01 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-methods): Add `tramp-completion-function'
for "su" and "sudo".
(tramp-get-completion-telnet): Implement it.
(tramp-parse-hosts)
(tramp-parse-hosts-group)
(tramp-get-completion-su)
(tramp-parse-passwd)
(tramp-parse-passwd-group): New functions.
2002-08-31 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-mode): Check for
`last-input-char'.
(tramp-completion-file-name-handler-alist): Add handler for
`file-exists-p.
(tramp-completion-handle-file-exists-p): New function.
(tramp-completion-handle-file-name-completion): Simplified.
(tramp-completion-dissect-file-name): Regexp's reorganised.
(tramp-completion-handle-file-name-all-completions): Call
completion-function only if `user' or `host' is given.
(tramp-get-completion-user-host): New function.
(tramp-get-completion-rsh)
(tramp-get-completion-ssh): Apply it.
2002-08-29 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-file-name-handler-alist): Add
handler for `expand-file-name'.
(tramp-completion-handle-expand-file-name): New function.
2002-08-26 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-mode): New function.
(tramp-completion-handle-file-name-directory)
(tramp-completion-handle-file-name-all-completions): Apply it.
(tramp-methods): Remove double definition of `ssh1-old' and
`ssh2-old'.
(tramp-point-at-eol): New defalias.
(tramp-parse-rhosts-group)
(tramp-parse-shosts-group):: Apply it.
2002-08-25 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-get-completion-methods)
(tramp-get-completion-rsh)
(tramp-get-completion-ssh): Add "[" for Xemacs.
(tramp-completion-file-name-regexp-separate): Expression adapted.
(tramp-completion-file-name-handler-alist): Add handler for
`file-name-directory' and `file-name-nondirectory'.
(tramp-completion-handle-file-name-directory)
(tramp-completion-handle-file-name-nondirectory)
(tramp-completion-run-real-handler): New functions.
(tramp-completion-file-name-handler)
(tramp-completion-handle-file-name-all-completions): Apply
`tramp-completion-run-real-handler'.
(tramp-parse-rhosts)
(tramp-parse-shosts): Use `with-temp-buffer'. `result? renamed to
`res' (otherwise side effects in XEmacs).
2002-08-24 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-file-name-regexp)
(tramp-completion-file-name-handler-alist)
(tramp-flatten-list)
(tramp-completion-dissect-file-name)
(tramp-get-completion-rsh)
(tramp-parse-rhosts)
(tramp-parse-rhosts-group)
(tramp-get-completion-ssh): Doc string tuned.
(tramp-methods): Doc string and custom type extended for
`tramp-completion-function'.
(tramp-completion-function): Variable added. Is it really used?
Other variables like `tramp-completion-function' aren't used.
(tramp-completion-file-name-handler-alist): Add handler for
`file-name-completion'.
(tramp-completion-handle-file-name-completion): New function.
2002-08-18 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-parse-rhosts)
(tramp-parse-rhosts-group)
(tramp-parse-shosts)
(tramp-parse-shosts-group): New functions.
2002-08-17 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-dissect-file-name)
(tramp-completion-dissect-file-name1): New functions.
2002-08-16 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-get-completion-function)
(tramp-get-completion-rsh)
(tramp-get-completion-ssh)
(tramp-get-completion-telnet): New functions.
(tramp-methods): Add `tramp-completion-function' for all methods.
2002-08-15 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-get-completion-methods): New function.
(tramp-find-default-method): Allow host to be nil (like user).
2002-08-14 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-completion-file-name-regexp-unified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp)
(tramp-completion-file-name-handler-alist): New defcustoms.
(tramp-completion-file-name-handler): New function. Add
`tramp-completion-file-name-handler' to `file-name-handler-alist'.
(tramp-run-real-handler): Add `tramp-completion-file-name-handler'
to `inhibit-file-name-handlers'.
(tramp-completion-handle-file-name-all-completions)
(tramp-completion-handle-file-name-completion): New functions.
2002-08-12 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-invoke-ange-ftp): `tramp-disable-ange-ftp'
must be called again after activating `ange-ftp'.
(tramp-ange-ftp-file-name-p): Check for Xemacs.
2002-08-08 Michael Albinus <Michael.Albinus@alcatel.de>
* net/tramp.el (tramp-do-copy-or-rename-file): Don't pass
KEEP-DATE to tramp-invoke-ange-ftp 'rename.
(tramp-handle-write-region): Don't pass LOCKNAME and CONFIRM to
tramp-invoke-ange-ftp 'write-region.
(tramp-handle-set-file-modes): Change order of FILENAME and MODE
passing to tramp-invoke-ange-ftp 'set-file-modes.
(tramp-flatten-list): New function. Maybe this functionality does
exist already elsewhere in the libraries.
(tramp-invoke-ange-ftp): Apply `tramp-flatten-list' to parameter
list in order to avoid nested lists, f.e. when invoked from
`tramp-handle-dired-call-process'.
2002-09-05 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-chunksize): New kluge variable.
(tramp-send-region): If tramp-chunksize is non-nil, send region in
parts and sleep 0.1 seconds between chunks.
2002-09-03 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-handle-insert-directory): Use
`insert-buffer-substring' instead of `insert-buffer', which is not
supposed to be used from Lisp. Remember old point in a variable
instead of using `mark'. Suggestion from Stefan Monnier.
(tramp-unified-filenames): New variable. Use it in default value
of other filename variables.
(file-expand-wildcards): Don't advise unless "[" and "]" are used
in the filename format.
2002-09-01 Kai Gro?ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
* net/tramp.el (tramp-methods): Remove duplicate definition of
ssh1-old and ssh2-old.
author | Kai Großjohann <kgrossjo@eu.uu.net> |
---|---|
date | Sun, 22 Sep 2002 13:23:36 +0000 |
parents | 52bd3d1b9cb9 |
children | f4d68f97221e |
rev | line source |
---|---|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
1 ;;; calc-bin.el --- binary functions for Calc |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
2 |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
4 |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
5 ;; Author: David Gillespie <daveg@synaptics.com> |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
6 ;; Maintainer: Colin Walters <walters@debian.org> |
40785 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is distributed in the hope that it will be useful, | |
11 ;; but WITHOUT ANY WARRANTY. No author or distributor | |
12 ;; accepts responsibility to anyone for the consequences of using it | |
13 ;; or for whether it serves any particular purpose or works at all, | |
14 ;; unless he says so in writing. Refer to the GNU Emacs General Public | |
15 ;; License for full details. | |
16 | |
17 ;; Everyone is granted permission to copy, modify and redistribute | |
18 ;; GNU Emacs, but only under the conditions described in the | |
19 ;; GNU Emacs General Public License. A copy of this license is | |
20 ;; supposed to have been given to you along with GNU Emacs so you | |
21 ;; can know your rights and responsibilities. It should be in a | |
22 ;; file named COPYING. Among other things, the copyright notice | |
23 ;; and this notice must be preserved on all copies. | |
24 | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
25 ;;; Commentary: |
40785 | 26 |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
27 ;;; Code: |
40785 | 28 |
29 ;; This file is autoloaded from calc-ext.el. | |
30 (require 'calc-ext) | |
31 | |
32 (require 'calc-macs) | |
33 | |
34 (defun calc-Need-calc-bin () nil) | |
35 | |
36 | |
37 ;;; b-prefix binary commands. | |
38 | |
39 (defun calc-and (n) | |
40 (interactive "P") | |
41 (calc-slow-wrapper | |
42 (calc-enter-result 2 "and" | |
43 (append '(calcFunc-and) | |
44 (calc-top-list-n 2) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
45 (and n (list (prefix-numeric-value n))))))) |
40785 | 46 |
47 (defun calc-or (n) | |
48 (interactive "P") | |
49 (calc-slow-wrapper | |
50 (calc-enter-result 2 "or" | |
51 (append '(calcFunc-or) | |
52 (calc-top-list-n 2) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
53 (and n (list (prefix-numeric-value n))))))) |
40785 | 54 |
55 (defun calc-xor (n) | |
56 (interactive "P") | |
57 (calc-slow-wrapper | |
58 (calc-enter-result 2 "xor" | |
59 (append '(calcFunc-xor) | |
60 (calc-top-list-n 2) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
61 (and n (list (prefix-numeric-value n))))))) |
40785 | 62 |
63 (defun calc-diff (n) | |
64 (interactive "P") | |
65 (calc-slow-wrapper | |
66 (calc-enter-result 2 "diff" | |
67 (append '(calcFunc-diff) | |
68 (calc-top-list-n 2) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
69 (and n (list (prefix-numeric-value n))))))) |
40785 | 70 |
71 (defun calc-not (n) | |
72 (interactive "P") | |
73 (calc-slow-wrapper | |
74 (calc-enter-result 1 "not" | |
75 (append '(calcFunc-not) | |
76 (calc-top-list-n 1) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
77 (and n (list (prefix-numeric-value n))))))) |
40785 | 78 |
79 (defun calc-lshift-binary (n) | |
80 (interactive "P") | |
81 (calc-slow-wrapper | |
82 (let ((hyp (if (calc-is-hyperbolic) 2 1))) | |
83 (calc-enter-result hyp "lsh" | |
84 (append '(calcFunc-lsh) | |
85 (calc-top-list-n hyp) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
86 (and n (list (prefix-numeric-value n)))))))) |
40785 | 87 |
88 (defun calc-rshift-binary (n) | |
89 (interactive "P") | |
90 (calc-slow-wrapper | |
91 (let ((hyp (if (calc-is-hyperbolic) 2 1))) | |
92 (calc-enter-result hyp "rsh" | |
93 (append '(calcFunc-rsh) | |
94 (calc-top-list-n hyp) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
95 (and n (list (prefix-numeric-value n)))))))) |
40785 | 96 |
97 (defun calc-lshift-arith (n) | |
98 (interactive "P") | |
99 (calc-slow-wrapper | |
100 (let ((hyp (if (calc-is-hyperbolic) 2 1))) | |
101 (calc-enter-result hyp "ash" | |
102 (append '(calcFunc-ash) | |
103 (calc-top-list-n hyp) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
104 (and n (list (prefix-numeric-value n)))))))) |
40785 | 105 |
106 (defun calc-rshift-arith (n) | |
107 (interactive "P") | |
108 (calc-slow-wrapper | |
109 (let ((hyp (if (calc-is-hyperbolic) 2 1))) | |
110 (calc-enter-result hyp "rash" | |
111 (append '(calcFunc-rash) | |
112 (calc-top-list-n hyp) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
113 (and n (list (prefix-numeric-value n)))))))) |
40785 | 114 |
115 (defun calc-rotate-binary (n) | |
116 (interactive "P") | |
117 (calc-slow-wrapper | |
118 (let ((hyp (if (calc-is-hyperbolic) 2 1))) | |
119 (calc-enter-result hyp "rot" | |
120 (append '(calcFunc-rot) | |
121 (calc-top-list-n hyp) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
122 (and n (list (prefix-numeric-value n)))))))) |
40785 | 123 |
124 (defun calc-clip (n) | |
125 (interactive "P") | |
126 (calc-slow-wrapper | |
127 (calc-enter-result 1 "clip" | |
128 (append '(calcFunc-clip) | |
129 (calc-top-list-n 1) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
130 (and n (list (prefix-numeric-value n))))))) |
40785 | 131 |
132 (defun calc-word-size (n) | |
133 (interactive "P") | |
134 (calc-wrapper | |
135 (or n (setq n (read-string (format "Binary word size: (default %d) " | |
136 calc-word-size)))) | |
137 (setq n (if (stringp n) | |
138 (if (equal n "") | |
139 calc-word-size | |
140 (if (string-match "\\`[-+]?[0-9]+\\'" n) | |
141 (string-to-int n) | |
142 (error "Expected an integer"))) | |
143 (prefix-numeric-value n))) | |
144 (or (= n calc-word-size) | |
145 (if (> (math-abs n) 100) | |
146 (calc-change-mode 'calc-word-size n calc-leading-zeros) | |
147 (calc-change-mode '(calc-word-size calc-previous-modulo) | |
148 (list n (math-power-of-2 (math-abs n))) | |
149 calc-leading-zeros))) | |
150 (if (< n 0) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
151 (message "Binary word size is %d bits (2's complement)" (- n)) |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
152 (message "Binary word size is %d bits" n)))) |
40785 | 153 |
154 | |
155 | |
156 | |
157 | |
158 ;;; d-prefix mode commands. | |
159 | |
160 (defun calc-radix (n) | |
161 (interactive "NDisplay radix (2-36): ") | |
162 (calc-wrapper | |
163 (if (and (>= n 2) (<= n 36)) | |
164 (progn | |
165 (calc-change-mode 'calc-number-radix n t) | |
166 ;; also change global value so minibuffer sees it | |
167 (setq-default calc-number-radix calc-number-radix)) | |
168 (setq n calc-number-radix)) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
169 (message "Number radix is %d" n))) |
40785 | 170 |
171 (defun calc-decimal-radix () | |
172 (interactive) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
173 (calc-radix 10)) |
40785 | 174 |
175 (defun calc-binary-radix () | |
176 (interactive) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
177 (calc-radix 2)) |
40785 | 178 |
179 (defun calc-octal-radix () | |
180 (interactive) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
181 (calc-radix 8)) |
40785 | 182 |
183 (defun calc-hex-radix () | |
184 (interactive) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
185 (calc-radix 16)) |
40785 | 186 |
187 (defun calc-leading-zeros (n) | |
188 (interactive "P") | |
189 (calc-wrapper | |
190 (if (calc-change-mode 'calc-leading-zeros n t t) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
191 (message "Zero-padding integers to %d digits (assuming radix %d)" |
40785 | 192 (let* ((calc-internal-prec 6)) |
193 (math-compute-max-digits (math-abs calc-word-size) | |
194 calc-number-radix)) | |
195 calc-number-radix) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
196 (message "Omitting leading zeros on integers")))) |
40785 | 197 |
198 | |
199 (defvar math-power-of-2-cache (list 1 2 4 8 16 32 64 128 256 512 1024)) | |
200 (defvar math-big-power-of-2-cache nil) | |
201 (defun math-power-of-2 (n) ; [I I] [Public] | |
202 (if (and (natnump n) (<= n 100)) | |
203 (or (nth n math-power-of-2-cache) | |
204 (let* ((i (length math-power-of-2-cache)) | |
205 (val (nth (1- i) math-power-of-2-cache))) | |
206 (while (<= i n) | |
207 (setq val (math-mul val 2) | |
208 math-power-of-2-cache (nconc math-power-of-2-cache | |
209 (list val)) | |
210 i (1+ i))) | |
211 val)) | |
212 (let ((found (assq n math-big-power-of-2-cache))) | |
213 (if found | |
214 (cdr found) | |
215 (let ((po2 (math-ipow 2 n))) | |
216 (setq math-big-power-of-2-cache | |
217 (cons (cons n po2) math-big-power-of-2-cache)) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
218 po2))))) |
40785 | 219 |
220 (defun math-integer-log2 (n) ; [I I] [Public] | |
221 (let ((i 0) | |
222 (p math-power-of-2-cache) | |
223 val) | |
224 (while (and p (Math-natnum-lessp (setq val (car p)) n)) | |
225 (setq p (cdr p) | |
226 i (1+ i))) | |
227 (if p | |
228 (and (equal val n) | |
229 i) | |
230 (while (Math-natnum-lessp | |
231 (prog1 | |
232 (setq val (math-mul val 2)) | |
233 (setq math-power-of-2-cache (nconc math-power-of-2-cache | |
234 (list val)))) | |
235 n) | |
236 (setq i (1+ i))) | |
237 (and (equal val n) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
238 i)))) |
40785 | 239 |
240 | |
241 | |
242 | |
243 ;;; Bitwise operations. | |
244 | |
245 (defun calcFunc-and (a b &optional w) ; [I I I] [Public] | |
246 (cond ((Math-messy-integerp w) | |
247 (calcFunc-and a b (math-trunc w))) | |
248 ((and w (not (integerp w))) | |
249 (math-reject-arg w 'fixnump)) | |
250 ((and (integerp a) (integerp b)) | |
251 (math-clip (logand a b) w)) | |
252 ((or (eq (car-safe a) 'mod) (eq (car-safe b) 'mod)) | |
253 (math-binary-modulo-args 'calcFunc-and a b w)) | |
254 ((not (Math-num-integerp a)) | |
255 (math-reject-arg a 'integerp)) | |
256 ((not (Math-num-integerp b)) | |
257 (math-reject-arg b 'integerp)) | |
258 (t (math-clip (cons 'bigpos | |
259 (math-and-bignum (math-binary-arg a w) | |
260 (math-binary-arg b w))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
261 w)))) |
40785 | 262 |
263 (defun math-binary-arg (a w) | |
264 (if (not (Math-integerp a)) | |
265 (setq a (math-trunc a))) | |
266 (if (Math-integer-negp a) | |
267 (math-not-bignum (cdr (math-bignum-test (math-sub -1 a))) | |
268 (math-abs (if w (math-trunc w) calc-word-size))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
269 (cdr (Math-bignum-test a)))) |
40785 | 270 |
271 (defun math-binary-modulo-args (f a b w) | |
272 (let (mod) | |
273 (if (eq (car-safe a) 'mod) | |
274 (progn | |
275 (setq mod (nth 2 a) | |
276 a (nth 1 a)) | |
277 (if (eq (car-safe b) 'mod) | |
278 (if (equal mod (nth 2 b)) | |
279 (setq b (nth 1 b)) | |
280 (math-reject-arg b "*Inconsistent modulos")))) | |
281 (setq mod (nth 2 b) | |
282 b (nth 1 b))) | |
283 (if (Math-messy-integerp mod) | |
284 (setq mod (math-trunc mod)) | |
285 (or (Math-integerp mod) | |
286 (math-reject-arg mod 'integerp))) | |
287 (let ((bits (math-integer-log2 mod))) | |
288 (if bits | |
289 (if w | |
290 (if (/= w bits) | |
291 (calc-record-why | |
292 "*Warning: Modulo inconsistent with word size")) | |
293 (setq w bits)) | |
294 (calc-record-why "*Warning: Modulo is not a power of 2")) | |
295 (math-make-mod (if b | |
296 (funcall f a b w) | |
297 (funcall f a w)) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
298 mod)))) |
40785 | 299 |
300 (defun math-and-bignum (a b) ; [l l l] | |
301 (and a b | |
302 (let ((qa (math-div-bignum-digit a 512)) | |
303 (qb (math-div-bignum-digit b 512))) | |
304 (math-mul-bignum-digit (math-and-bignum (math-norm-bignum (car qa)) | |
305 (math-norm-bignum (car qb))) | |
306 512 | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
307 (logand (cdr qa) (cdr qb)))))) |
40785 | 308 |
309 (defun calcFunc-or (a b &optional w) ; [I I I] [Public] | |
310 (cond ((Math-messy-integerp w) | |
311 (calcFunc-or a b (math-trunc w))) | |
312 ((and w (not (integerp w))) | |
313 (math-reject-arg w 'fixnump)) | |
314 ((and (integerp a) (integerp b)) | |
315 (math-clip (logior a b) w)) | |
316 ((or (eq (car-safe a) 'mod) (eq (car-safe b) 'mod)) | |
317 (math-binary-modulo-args 'calcFunc-or a b w)) | |
318 ((not (Math-num-integerp a)) | |
319 (math-reject-arg a 'integerp)) | |
320 ((not (Math-num-integerp b)) | |
321 (math-reject-arg b 'integerp)) | |
322 (t (math-clip (cons 'bigpos | |
323 (math-or-bignum (math-binary-arg a w) | |
324 (math-binary-arg b w))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
325 w)))) |
40785 | 326 |
327 (defun math-or-bignum (a b) ; [l l l] | |
328 (and (or a b) | |
329 (let ((qa (math-div-bignum-digit a 512)) | |
330 (qb (math-div-bignum-digit b 512))) | |
331 (math-mul-bignum-digit (math-or-bignum (math-norm-bignum (car qa)) | |
332 (math-norm-bignum (car qb))) | |
333 512 | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
334 (logior (cdr qa) (cdr qb)))))) |
40785 | 335 |
336 (defun calcFunc-xor (a b &optional w) ; [I I I] [Public] | |
337 (cond ((Math-messy-integerp w) | |
338 (calcFunc-xor a b (math-trunc w))) | |
339 ((and w (not (integerp w))) | |
340 (math-reject-arg w 'fixnump)) | |
341 ((and (integerp a) (integerp b)) | |
342 (math-clip (logxor a b) w)) | |
343 ((or (eq (car-safe a) 'mod) (eq (car-safe b) 'mod)) | |
344 (math-binary-modulo-args 'calcFunc-xor a b w)) | |
345 ((not (Math-num-integerp a)) | |
346 (math-reject-arg a 'integerp)) | |
347 ((not (Math-num-integerp b)) | |
348 (math-reject-arg b 'integerp)) | |
349 (t (math-clip (cons 'bigpos | |
350 (math-xor-bignum (math-binary-arg a w) | |
351 (math-binary-arg b w))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
352 w)))) |
40785 | 353 |
354 (defun math-xor-bignum (a b) ; [l l l] | |
355 (and (or a b) | |
356 (let ((qa (math-div-bignum-digit a 512)) | |
357 (qb (math-div-bignum-digit b 512))) | |
358 (math-mul-bignum-digit (math-xor-bignum (math-norm-bignum (car qa)) | |
359 (math-norm-bignum (car qb))) | |
360 512 | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
361 (logxor (cdr qa) (cdr qb)))))) |
40785 | 362 |
363 (defun calcFunc-diff (a b &optional w) ; [I I I] [Public] | |
364 (cond ((Math-messy-integerp w) | |
365 (calcFunc-diff a b (math-trunc w))) | |
366 ((and w (not (integerp w))) | |
367 (math-reject-arg w 'fixnump)) | |
368 ((and (integerp a) (integerp b)) | |
369 (math-clip (logand a (lognot b)) w)) | |
370 ((or (eq (car-safe a) 'mod) (eq (car-safe b) 'mod)) | |
371 (math-binary-modulo-args 'calcFunc-diff a b w)) | |
372 ((not (Math-num-integerp a)) | |
373 (math-reject-arg a 'integerp)) | |
374 ((not (Math-num-integerp b)) | |
375 (math-reject-arg b 'integerp)) | |
376 (t (math-clip (cons 'bigpos | |
377 (math-diff-bignum (math-binary-arg a w) | |
378 (math-binary-arg b w))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
379 w)))) |
40785 | 380 |
381 (defun math-diff-bignum (a b) ; [l l l] | |
382 (and a | |
383 (let ((qa (math-div-bignum-digit a 512)) | |
384 (qb (math-div-bignum-digit b 512))) | |
385 (math-mul-bignum-digit (math-diff-bignum (math-norm-bignum (car qa)) | |
386 (math-norm-bignum (car qb))) | |
387 512 | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
388 (logand (cdr qa) (lognot (cdr qb))))))) |
40785 | 389 |
390 (defun calcFunc-not (a &optional w) ; [I I] [Public] | |
391 (cond ((Math-messy-integerp w) | |
392 (calcFunc-not a (math-trunc w))) | |
393 ((eq (car-safe a) 'mod) | |
394 (math-binary-modulo-args 'calcFunc-not a nil w)) | |
395 ((and w (not (integerp w))) | |
396 (math-reject-arg w 'fixnump)) | |
397 ((not (Math-num-integerp a)) | |
398 (math-reject-arg a 'integerp)) | |
399 ((< (or w (setq w calc-word-size)) 0) | |
400 (math-clip (calcFunc-not a (- w)) w)) | |
401 (t (math-normalize | |
402 (cons 'bigpos | |
403 (math-not-bignum (math-binary-arg a w) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
404 w)))))) |
40785 | 405 |
406 (defun math-not-bignum (a w) ; [l l] | |
407 (let ((q (math-div-bignum-digit a 512))) | |
408 (if (<= w 9) | |
409 (list (logand (lognot (cdr q)) | |
410 (1- (lsh 1 w)))) | |
411 (math-mul-bignum-digit (math-not-bignum (math-norm-bignum (car q)) | |
412 (- w 9)) | |
413 512 | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
414 (logxor (cdr q) 511))))) |
40785 | 415 |
416 (defun calcFunc-lsh (a &optional n w) ; [I I] [Public] | |
417 (setq a (math-trunc a) | |
418 n (if n (math-trunc n) 1)) | |
419 (if (eq (car-safe a) 'mod) | |
420 (math-binary-modulo-args 'calcFunc-lsh a n w) | |
421 (setq w (if w (math-trunc w) calc-word-size)) | |
422 (or (integerp w) | |
423 (math-reject-arg w 'fixnump)) | |
424 (or (Math-integerp a) | |
425 (math-reject-arg a 'integerp)) | |
426 (or (Math-integerp n) | |
427 (math-reject-arg n 'integerp)) | |
428 (if (< w 0) | |
429 (math-clip (calcFunc-lsh a n (- w)) w) | |
430 (if (Math-integer-negp a) | |
431 (setq a (math-clip a w))) | |
432 (cond ((or (Math-lessp n (- w)) | |
433 (Math-lessp w n)) | |
434 0) | |
435 ((< n 0) | |
436 (math-quotient (math-clip a w) (math-power-of-2 (- n)))) | |
437 (t | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
438 (math-clip (math-mul a (math-power-of-2 n)) w)))))) |
40785 | 439 |
440 (defun calcFunc-rsh (a &optional n w) ; [I I] [Public] | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
441 (calcFunc-lsh a (math-neg (or n 1)) w)) |
40785 | 442 |
443 (defun calcFunc-ash (a &optional n w) ; [I I] [Public] | |
444 (if (or (null n) | |
445 (not (Math-negp n))) | |
446 (calcFunc-lsh a n w) | |
447 (setq a (math-trunc a) | |
448 n (if n (math-trunc n) 1)) | |
449 (if (eq (car-safe a) 'mod) | |
450 (math-binary-modulo-args 'calcFunc-ash a n w) | |
451 (setq w (if w (math-trunc w) calc-word-size)) | |
452 (or (integerp w) | |
453 (math-reject-arg w 'fixnump)) | |
454 (or (Math-integerp a) | |
455 (math-reject-arg a 'integerp)) | |
456 (or (Math-integerp n) | |
457 (math-reject-arg n 'integerp)) | |
458 (if (< w 0) | |
459 (math-clip (calcFunc-ash a n (- w)) w) | |
460 (if (Math-integer-negp a) | |
461 (setq a (math-clip a w))) | |
462 (let ((two-to-sizem1 (math-power-of-2 (1- w))) | |
463 (sh (calcFunc-lsh a n w))) | |
464 (cond ((Math-natnum-lessp a two-to-sizem1) | |
465 sh) | |
466 ((Math-lessp n (- 1 w)) | |
467 (math-add (math-mul two-to-sizem1 2) -1)) | |
468 (t (let ((two-to-n (math-power-of-2 (- n)))) | |
469 (math-add (calcFunc-lsh (math-add two-to-n -1) | |
470 (+ w n) w) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
471 sh))))))))) |
40785 | 472 |
473 (defun calcFunc-rash (a &optional n w) ; [I I] [Public] | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
474 (calcFunc-ash a (math-neg (or n 1)) w)) |
40785 | 475 |
476 (defun calcFunc-rot (a &optional n w) ; [I I] [Public] | |
477 (setq a (math-trunc a) | |
478 n (if n (math-trunc n) 1)) | |
479 (if (eq (car-safe a) 'mod) | |
480 (math-binary-modulo-args 'calcFunc-rot a n w) | |
481 (setq w (if w (math-trunc w) calc-word-size)) | |
482 (or (integerp w) | |
483 (math-reject-arg w 'fixnump)) | |
484 (or (Math-integerp a) | |
485 (math-reject-arg a 'integerp)) | |
486 (or (Math-integerp n) | |
487 (math-reject-arg n 'integerp)) | |
488 (if (< w 0) | |
489 (math-clip (calcFunc-rot a n (- w)) w) | |
490 (if (Math-integer-negp a) | |
491 (setq a (math-clip a w))) | |
492 (cond ((or (Math-integer-negp n) | |
493 (not (Math-natnum-lessp n w))) | |
494 (calcFunc-rot a (math-mod n w) w)) | |
495 (t | |
496 (math-add (calcFunc-lsh a (- n w) w) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
497 (calcFunc-lsh a n w))))))) |
40785 | 498 |
499 (defun math-clip (a &optional w) ; [I I] [Public] | |
500 (cond ((Math-messy-integerp w) | |
501 (math-clip a (math-trunc w))) | |
502 ((eq (car-safe a) 'mod) | |
503 (math-binary-modulo-args 'math-clip a nil w)) | |
504 ((and w (not (integerp w))) | |
505 (math-reject-arg w 'fixnump)) | |
506 ((not (Math-num-integerp a)) | |
507 (math-reject-arg a 'integerp)) | |
508 ((< (or w (setq w calc-word-size)) 0) | |
509 (setq a (math-clip a (- w))) | |
510 (if (Math-natnum-lessp a (math-power-of-2 (- -1 w))) | |
511 a | |
512 (math-sub a (math-power-of-2 (- w))))) | |
513 ((Math-negp a) | |
514 (math-normalize (cons 'bigpos (math-binary-arg a w)))) | |
515 ((and (integerp a) (< a 1000000)) | |
516 (if (>= w 20) | |
517 a | |
518 (logand a (1- (lsh 1 w))))) | |
519 (t | |
520 (math-normalize | |
521 (cons 'bigpos | |
522 (math-clip-bignum (cdr (math-bignum-test (math-trunc a))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
523 w)))))) |
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
524 |
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
525 (defalias 'calcFunc-clip 'math-clip) |
40785 | 526 |
527 (defun math-clip-bignum (a w) ; [l l] | |
528 (let ((q (math-div-bignum-digit a 512))) | |
529 (if (<= w 9) | |
530 (list (logand (cdr q) | |
531 (1- (lsh 1 w)))) | |
532 (math-mul-bignum-digit (math-clip-bignum (math-norm-bignum (car q)) | |
533 (- w 9)) | |
534 512 | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
535 (cdr q))))) |
40785 | 536 |
537 (defvar math-max-digits-cache nil) | |
538 (defun math-compute-max-digits (w r) | |
539 (let* ((pair (+ (* r 100000) w)) | |
540 (res (assq pair math-max-digits-cache))) | |
541 (if res | |
542 (cdr res) | |
543 (let* ((calc-command-flags nil) | |
544 (digs (math-ceiling (math-div w (math-real-log2 r))))) | |
545 (setq math-max-digits-cache (cons (cons pair digs) | |
546 math-max-digits-cache)) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
547 digs)))) |
40785 | 548 |
549 (defvar math-log2-cache (list '(2 . 1) | |
550 '(4 . 2) | |
551 '(8 . 3) | |
552 '(10 . (float 332193 -5)) | |
553 '(16 . 4) | |
554 '(32 . 5))) | |
555 (defun math-real-log2 (x) ;;; calc-internal-prec must be 6 | |
556 (let ((res (assq x math-log2-cache))) | |
557 (if res | |
558 (cdr res) | |
559 (let* ((calc-symbolic-mode nil) | |
560 (calc-display-working-message nil) | |
561 (log (calcFunc-log x 2))) | |
562 (setq math-log2-cache (cons (cons x log) math-log2-cache)) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
563 log)))) |
40785 | 564 |
565 (defconst math-radix-digits ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9" | |
566 "A" "B" "C" "D" "E" "F" "G" "H" "I" "J" | |
567 "K" "L" "M" "N" "O" "P" "Q" "R" "S" "T" | |
568 "U" "V" "W" "X" "Y" "Z"]) | |
569 | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
570 (defsubst math-format-radix-digit (a) ; [X D] |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
571 (aref math-radix-digits a)) |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
572 |
40785 | 573 (defun math-format-radix (a) ; [X S] |
574 (if (< a calc-number-radix) | |
575 (if (< a 0) | |
576 (concat "-" (math-format-radix (- a))) | |
577 (math-format-radix-digit a)) | |
578 (let ((s "")) | |
579 (while (> a 0) | |
580 (setq s (concat (math-format-radix-digit (% a calc-number-radix)) s) | |
581 a (/ a calc-number-radix))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
582 s))) |
40785 | 583 |
584 (defconst math-binary-digits ["000" "001" "010" "011" | |
585 "100" "101" "110" "111"]) | |
586 (defun math-format-binary (a) ; [X S] | |
587 (if (< a 8) | |
588 (if (< a 0) | |
589 (concat "-" (math-format-binary (- a))) | |
590 (math-format-radix a)) | |
591 (let ((s "")) | |
592 (while (> a 7) | |
593 (setq s (concat (aref math-binary-digits (% a 8)) s) | |
594 a (/ a 8))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
595 (concat (math-format-radix a) s)))) |
40785 | 596 |
597 (defun math-format-bignum-radix (a) ; [X L] | |
598 (cond ((null a) "0") | |
599 ((and (null (cdr a)) | |
600 (< (car a) calc-number-radix)) | |
601 (math-format-radix-digit (car a))) | |
602 (t | |
603 (let ((q (math-div-bignum-digit a calc-number-radix))) | |
604 (concat (math-format-bignum-radix (math-norm-bignum (car q))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
605 (math-format-radix-digit (cdr q))))))) |
40785 | 606 |
607 (defun math-format-bignum-binary (a) ; [X L] | |
608 (cond ((null a) "0") | |
609 ((null (cdr a)) | |
610 (math-format-binary (car a))) | |
611 (t | |
612 (let ((q (math-div-bignum-digit a 512))) | |
613 (concat (math-format-bignum-binary (math-norm-bignum (car q))) | |
614 (aref math-binary-digits (/ (cdr q) 64)) | |
615 (aref math-binary-digits (% (/ (cdr q) 8) 8)) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
616 (aref math-binary-digits (% (cdr q) 8))))))) |
40785 | 617 |
618 (defun math-format-bignum-octal (a) ; [X L] | |
619 (cond ((null a) "0") | |
620 ((null (cdr a)) | |
621 (math-format-radix (car a))) | |
622 (t | |
623 (let ((q (math-div-bignum-digit a 512))) | |
624 (concat (math-format-bignum-octal (math-norm-bignum (car q))) | |
625 (math-format-radix-digit (/ (cdr q) 64)) | |
626 (math-format-radix-digit (% (/ (cdr q) 8) 8)) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
627 (math-format-radix-digit (% (cdr q) 8))))))) |
40785 | 628 |
629 (defun math-format-bignum-hex (a) ; [X L] | |
630 (cond ((null a) "0") | |
631 ((null (cdr a)) | |
632 (math-format-radix (car a))) | |
633 (t | |
634 (let ((q (math-div-bignum-digit a 256))) | |
635 (concat (math-format-bignum-hex (math-norm-bignum (car q))) | |
636 (math-format-radix-digit (/ (cdr q) 16)) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
637 (math-format-radix-digit (% (cdr q) 16))))))) |
40785 | 638 |
639 ;;; Decompose into integer and fractional parts, without depending | |
640 ;;; on calc-internal-prec. | |
641 (defun math-float-parts (a need-frac) ; returns ( int frac fracdigs ) | |
642 (if (>= (nth 2 a) 0) | |
643 (list (math-scale-rounding (nth 1 a) (nth 2 a)) '(float 0 0) 0) | |
644 (let* ((d (math-numdigs (nth 1 a))) | |
645 (n (- (nth 2 a)))) | |
646 (if need-frac | |
647 (if (>= n d) | |
648 (list 0 a n) | |
649 (let ((qr (math-idivmod (nth 1 a) (math-scale-int 1 n)))) | |
650 (list (car qr) (math-make-float (cdr qr) (- n)) n))) | |
651 (list (math-scale-rounding (nth 1 a) (nth 2 a)) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
652 '(float 0 0) 0))))) |
40785 | 653 |
654 (defun math-format-radix-float (a prec) | |
655 (let ((fmt (car calc-float-format)) | |
656 (figs (nth 1 calc-float-format)) | |
657 (point calc-point-char) | |
658 (str nil)) | |
659 (if (eq fmt 'fix) | |
660 (let* ((afigs (math-abs figs)) | |
661 (fp (math-float-parts a (> afigs 0))) | |
662 (calc-internal-prec (+ 3 (max (nth 2 fp) | |
663 (math-convert-radix-digits | |
664 afigs t)))) | |
665 (int (car fp)) | |
666 (frac (math-round (math-mul (math-normalize (nth 1 fp)) | |
667 (math-radix-float-power afigs))))) | |
668 (if (not (and (math-zerop frac) (math-zerop int) (< figs 0))) | |
669 (let ((math-radix-explicit-format nil)) | |
670 (let ((calc-group-digits nil)) | |
671 (setq str (if (> afigs 0) (math-format-number frac) "")) | |
672 (if (< (length str) afigs) | |
673 (setq str (concat (make-string (- afigs (length str)) ?0) | |
674 str)) | |
675 (if (> (length str) afigs) | |
676 (setq str (substring str 1) | |
677 int (math-add int 1)))) | |
678 (setq str (concat (math-format-number int) point str))) | |
44572
9e404d7dbe1d
(math-format-radix-float): Load `calc-ext' before we call `math-group-float'.
Colin Walters <walters@gnu.org>
parents:
41271
diff
changeset
|
679 (when calc-group-digits |
9e404d7dbe1d
(math-format-radix-float): Load `calc-ext' before we call `math-group-float'.
Colin Walters <walters@gnu.org>
parents:
41271
diff
changeset
|
680 (setq str (math-group-float str)))) |
40785 | 681 (setq figs 0)))) |
682 (or str | |
683 (let* ((prec calc-internal-prec) | |
684 (afigs (if (> figs 0) | |
685 figs | |
686 (max 1 (+ figs | |
687 (1- (math-convert-radix-digits | |
688 (max prec | |
689 (math-numdigs (nth 1 a))))))))) | |
690 (calc-internal-prec (+ 3 (math-convert-radix-digits afigs t))) | |
691 (explo -1) (vlo (math-radix-float-power explo)) | |
692 (exphi 1) (vhi (math-radix-float-power exphi)) | |
693 expmid vmid eadj) | |
694 (setq a (math-normalize a)) | |
695 (if (Math-zerop a) | |
696 (setq explo 0) | |
697 (if (math-lessp-float '(float 1 0) a) | |
698 (while (not (math-lessp-float a vhi)) | |
699 (setq explo exphi vlo vhi | |
700 exphi (math-mul exphi 2) | |
701 vhi (math-radix-float-power exphi))) | |
702 (while (math-lessp-float a vlo) | |
703 (setq exphi explo vhi vlo | |
704 explo (math-mul explo 2) | |
705 vlo (math-radix-float-power explo)))) | |
706 (while (not (eq (math-sub exphi explo) 1)) | |
707 (setq expmid (math-div2 (math-add explo exphi)) | |
708 vmid (math-radix-float-power expmid)) | |
709 (if (math-lessp-float a vmid) | |
710 (setq exphi expmid vhi vmid) | |
711 (setq explo expmid vlo vmid))) | |
712 (setq a (math-div-float a vlo))) | |
713 (let* ((sc (math-round (math-mul a (math-radix-float-power | |
714 (1- afigs))))) | |
715 (math-radix-explicit-format nil)) | |
716 (let ((calc-group-digits nil)) | |
717 (setq str (math-format-number sc)))) | |
718 (if (> (length str) afigs) | |
719 (setq str (substring str 0 -1) | |
720 explo (1+ explo))) | |
721 (if (and (eq fmt 'float) | |
722 (math-lessp explo (+ (if (= figs 0) | |
723 (1- (math-convert-radix-digits | |
724 prec)) | |
725 afigs) | |
726 calc-display-sci-high 1)) | |
727 (math-lessp calc-display-sci-low explo)) | |
728 (let ((dpos (1+ explo))) | |
729 (cond ((<= dpos 0) | |
730 (setq str (concat "0" point (make-string (- dpos) ?0) | |
731 str))) | |
732 ((> dpos (length str)) | |
733 (setq str (concat str (make-string (- dpos (length str)) | |
734 ?0) point))) | |
735 (t | |
736 (setq str (concat (substring str 0 dpos) point | |
737 (substring str dpos))))) | |
738 (setq explo nil)) | |
739 (setq eadj (if (eq fmt 'eng) | |
740 (min (math-mod explo 3) (length str)) | |
741 0) | |
742 str (concat (substring str 0 (1+ eadj)) point | |
743 (substring str (1+ eadj))))) | |
744 (setq pos (length str)) | |
745 (while (eq (aref str (1- pos)) ?0) (setq pos (1- pos))) | |
746 (and explo (eq (aref str (1- pos)) ?.) (setq pos (1- pos))) | |
747 (setq str (substring str 0 pos)) | |
44572
9e404d7dbe1d
(math-format-radix-float): Load `calc-ext' before we call `math-group-float'.
Colin Walters <walters@gnu.org>
parents:
41271
diff
changeset
|
748 (when calc-group-digits |
9e404d7dbe1d
(math-format-radix-float): Load `calc-ext' before we call `math-group-float'.
Colin Walters <walters@gnu.org>
parents:
41271
diff
changeset
|
749 (setq str (math-group-float str))) |
40785 | 750 (if explo |
751 (let ((estr (let ((calc-number-radix 10) | |
752 (calc-group-digits nil)) | |
753 (setq estr (math-format-number | |
754 (math-sub explo eadj)))))) | |
755 (setq str (if (or (memq calc-language '(math maple)) | |
756 (> calc-number-radix 14)) | |
757 (format "%s*%d.^%s" str calc-number-radix estr) | |
758 (format "%se%s" str estr))))))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
759 str)) |
40785 | 760 |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
761 (defvar math-radix-digits-cache nil) |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
762 |
40785 | 763 (defun math-convert-radix-digits (n &optional to-dec) |
764 (let ((key (cons n (cons to-dec calc-number-radix)))) | |
765 (or (cdr (assoc key math-radix-digits-cache)) | |
766 (let* ((calc-internal-prec 6) | |
767 (log (math-div (math-real-log2 calc-number-radix) | |
768 '(float 332193 -5)))) | |
769 (cdr (car (setq math-radix-digits-cache | |
770 (cons (cons key (math-ceiling (if to-dec | |
771 (math-mul n log) | |
772 (math-div n log)))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
773 math-radix-digits-cache)))))))) |
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
774 |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41042
diff
changeset
|
775 (defvar math-radix-float-cache-tag nil) |
40785 | 776 |
777 (defun math-radix-float-power (n) | |
778 (if (eq n 0) | |
779 '(float 1 0) | |
780 (or (and (eq calc-number-radix (car math-radix-float-cache-tag)) | |
781 (<= calc-internal-prec (cdr math-radix-float-cache-tag))) | |
782 (setq math-radix-float-cache-tag (cons calc-number-radix | |
783 calc-internal-prec) | |
784 math-radix-float-cache nil)) | |
785 (math-normalize | |
786 (or (cdr (assoc n math-radix-float-cache)) | |
787 (cdr (car (setq math-radix-float-cache | |
788 (cons (cons | |
789 n | |
790 (let ((calc-internal-prec | |
791 (cdr math-radix-float-cache-tag))) | |
792 (if (math-negp n) | |
793 (math-div-float '(float 1 0) | |
794 (math-radix-float-power | |
795 (math-neg n))) | |
796 (math-mul-float (math-sqr-float | |
797 (math-radix-float-power | |
798 (math-div2 n))) | |
799 (if (math-evenp n) | |
800 '(float 1 0) | |
801 (math-float | |
802 calc-number-radix)))))) | |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
803 math-radix-float-cache)))))))) |
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
804 |
40785 | 805 |
41042
a78b609cb4b1
(calcFunc-clip): Use `defalias' instead of `fset' and
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
806 ;;; calc-bin.el ends here |