From: Raimon Grau <raimon@konghq.com>
To: 37649@debbugs.gnu.org
Subject: bug#37649: [PATCH] Fix optional parameter passing in calc-fin-* functions
Date: Mon, 07 Oct 2019 20:55:33 +0100 [thread overview]
Message-ID: <87wodgqqiy.fsf@konghq.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
Hi,
I noticed some calc financial functions are not accepting the
optional flag on calc "stack" mode. The docs talk about them, and
they work in algebraic mode, so there's no need to modify any
docs.
Here's a patch that enables the option flag that varies the number
of parameters passed from 3 to 4 in those cases.
Cheers,
Raimon Grau
[-- Attachment #2: 0001-Fix-optional-parameter-passing-in-calc-fin-functions.patch --]
[-- Type: text/plain, Size: 4135 bytes --]
From a25e86f4e8a5d729f1933864330c382e845bfd46 Mon Sep 17 00:00:00 2001
From: Raimon Grau <raimonster@gmail.com>
Date: Thu, 3 Oct 2019 19:52:25 +0100
Subject: [PATCH] Fix optional parameter passing in calc-fin-* functions
* lisp/calc/calc-fin.el (calc-fin-pv, calc-fin-fv, calc-fin-pmt)
(calc-fin-pner, calc-fin-rate): Add support for an optional
parameter standing for an initial lump. The functions already
support it but the extra parameter was not taken into account in
stack mode. This commit it takes into consideration when deciding
if a function takes 3 or 4 parameters.
---
lisp/calc/calc-fin.el | 53 +++++++++++++++++++++++++++++----------------------
1 file changed, 30 insertions(+), 23 deletions(-)
diff --git a/lisp/calc/calc-fin.el b/lisp/calc/calc-fin.el
index 813da28..4302cbc 100644
--- a/lisp/calc/calc-fin.el
+++ b/lisp/calc/calc-fin.el
@@ -35,9 +35,10 @@ calc-fin-pv
(calc-slow-wrapper
(if (calc-is-hyperbolic)
(calc-enter-result 3 "pvl" (cons 'calcFunc-pvl (calc-top-list-n 3)))
- (if (calc-is-inverse)
- (calc-enter-result 3 "pvb" (cons 'calcFunc-pvb (calc-top-list-n 3)))
- (calc-enter-result 3 "pv" (cons 'calcFunc-pv (calc-top-list-n 3)))))))
+ (let ((n (if (calc-is-option) 4 3)))
+ (if (calc-is-inverse)
+ (calc-enter-result n "pvb" (cons 'calcFunc-pvb (calc-top-list-n n)))
+ (calc-enter-result n "pv" (cons 'calcFunc-pv (calc-top-list-n n))))))))
(defun calc-fin-npv (arg)
(interactive "p")
@@ -51,42 +52,48 @@ calc-fin-fv
(calc-slow-wrapper
(if (calc-is-hyperbolic)
(calc-enter-result 3 "fvl" (cons 'calcFunc-fvl (calc-top-list-n 3)))
- (if (calc-is-inverse)
- (calc-enter-result 3 "fvb" (cons 'calcFunc-fvb (calc-top-list-n 3)))
- (calc-enter-result 3 "fv" (cons 'calcFunc-fv (calc-top-list-n 3)))))))
+ (let ((n (if (calc-is-option) 4 3)))
+ (if (calc-is-inverse)
+ (calc-enter-result n "fvb" (cons 'calcFunc-fvb (calc-top-list-n n)))
+ (calc-enter-result n "fv" (cons 'calcFunc-fv (calc-top-list-n n))))))))
(defun calc-fin-pmt ()
(interactive)
(calc-slow-wrapper
(if (calc-is-hyperbolic)
(calc-enter-result 3 "fvl" (cons 'calcFunc-fvl (calc-top-list-n 3)))
- (if (calc-is-inverse)
- (calc-enter-result 3 "pmtb" (cons 'calcFunc-pmtb (calc-top-list-n 3)))
- (calc-enter-result 3 "pmt" (cons 'calcFunc-pmt (calc-top-list-n 3)))))))
+ (let ((n (if (calc-is-option) 4 3)))
+ (if (calc-is-inverse)
+ (calc-enter-result n "pmtb" (cons 'calcFunc-pmtb (calc-top-list-n n)))
+ (calc-enter-result n "pmt" (cons 'calcFunc-pmt (calc-top-list-n n))))))))
(defun calc-fin-nper ()
(interactive)
(calc-slow-wrapper
(if (calc-is-hyperbolic)
(calc-enter-result 3 "nprl" (cons 'calcFunc-nperl (calc-top-list-n 3)))
- (if (calc-is-inverse)
- (calc-enter-result 3 "nprb" (cons 'calcFunc-nperb
- (calc-top-list-n 3)))
- (calc-enter-result 3 "nper" (cons 'calcFunc-nper
- (calc-top-list-n 3)))))))
+ (let ((n (if (calc-is-option) 4 3)))
+ (if (calc-is-inverse)
+ (calc-enter-result n "nprb" (cons 'calcFunc-nperb
+ (calc-top-list-n n)))
+ (calc-enter-result n "nper" (cons 'calcFunc-nper
+ (calc-top-list-n n))))))))
(defun calc-fin-rate ()
(interactive)
(calc-slow-wrapper
- (calc-pop-push-record 3
- (if (calc-is-hyperbolic) "ratl"
- (if (calc-is-inverse) "ratb" "rate"))
- (calc-to-percentage
- (calc-normalize
- (cons (if (calc-is-hyperbolic) 'calcFunc-ratel
- (if (calc-is-hyperbolic) 'calcFunc-rateb
- 'calcFunc-rate))
- (calc-top-list-n 3)))))))
+ (let ((n (if (and (not (calc-is-hyperbolic))
+ (calc-is-option))
+ 4 3)))
+ (calc-pop-push-record n
+ (if (calc-is-hyperbolic) "ratl"
+ (if (calc-is-inverse) "ratb" "rate"))
+ (calc-to-percentage
+ (calc-normalize
+ (cons (if (calc-is-hyperbolic) 'calcFunc-ratel
+ (if (calc-is-hyperbolic) 'calcFunc-rateb
+ 'calcFunc-rate))
+ (calc-top-list-n n))))))))
(defun calc-fin-irr (arg)
(interactive "P")
--
2.7.4
next reply other threads:[~2019-10-07 19:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 19:55 Raimon Grau [this message]
2019-10-19 9:46 ` bug#37649: [PATCH] Fix optional parameter passing in calc-fin-* functions Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wodgqqiy.fsf@konghq.com \
--to=raimon@konghq.com \
--cc=37649@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).