mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Code Issues Projects Releases Wiki Activity

(math-format-date-part,math-parse-standard-date,calcFunc-julian):

Browse source 
Replace math-read-number-simple by math-read-number.
This commit is contained in:
Jay Belanger 2007-06-22 05:52:29 +00:00
parent 4903b28a12
commit e5f1224e18
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lisp/calc/calc-forms.el
View file

@ -560,11 +560,13 @@
((eq x 'J)
(math-format-number
(math-add math-fd-date
(math-read-number-simple "1.7214235"))))
(eval-when-compile
(math-read-number "1.7214235")))))
((eq x 'j)
(math-format-number (math-add
(math-floor math-fd-date)
(math-read-number-simple "1721424"))))
(eval-when-compile
(math-read-number "1721424")))))
((eq x 'U)
(math-format-number (nth 1 (math-date-parts math-fd-date 719164))))
((progn
@ -939,8 +941,10 @@
0
(if (or (eq this 'j)
(math-integerp num))
(math-read-number-simple "1721424")
(math-read-number-simple "1.7214235"))))
(eval-when-compile
(math-read-number "1721424"))
(eval-when-compile
(math-read-number "1.7214235")))))
hour (or (nth 3 num) hour)
minute (or (nth 4 num) minute)
second (or (nth 5 num) second)
@ -1149,15 +1153,20 @@
(defun calcFunc-julian (date &optional zone)
(if (math-realp date)
(list 'date (if (math-integerp date)
(math-sub date (math-read-number-simple "1721424"))
(math-sub date (eval-when-compile
(math-read-number "1721424")))
(setq date (math-sub date
(math-read-number-simple "1.7214235")))
(eval-when-compile
(math-read-number "1.7214235"))))
(math-sub date (math-div (calcFunc-tzone zone date)
'(float 864 2)))))
(if (eq (car date) 'date)
(math-add (nth 1 date) (if (math-integerp (nth 1 date))
(math-read-number-simple "1721424")
(math-add (math-read-number-simple "1.7214235")
(eval-when-compile
(math-read-number "1721424"))
(math-add
(eval-when-compile
(math-read-number "1.7214235"))
(math-div (calcFunc-tzone zone date)
'(float 864 2)))))
(math-reject-arg date 'datep))))