1 |
;;; calc-forms.el --- data format conversion functions for Calc |
;;; calc-forms.el --- data format conversion functions for Calc |
2 |
|
|
3 |
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004 Free Software Foundation, Inc. |
;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2004, 2005 |
4 |
|
;; Free Software Foundation, Inc. |
5 |
|
|
6 |
;; Author: David Gillespie <daveg@synaptics.com> |
;; Author: David Gillespie <daveg@synaptics.com> |
7 |
;; Maintainer: Jay Belanger <belanger@truman.edu> |
;; Maintainer: Jay Belanger <belanger@truman.edu> |
1435 |
(defun calcFunc-badd (a b) |
(defun calcFunc-badd (a b) |
1436 |
(if (eq (car-safe b) 'date) |
(if (eq (car-safe b) 'date) |
1437 |
(if (eq (car-safe a) 'date) |
(if (eq (car-safe a) 'date) |
1438 |
(math-reject-arg nil "*Illegal combination in date arithmetic") |
(math-reject-arg nil "*Invalid combination in date arithmetic") |
1439 |
(calcFunc-badd b a)) |
(calcFunc-badd b a)) |
1440 |
(if (eq (car-safe a) 'date) |
(if (eq (car-safe a) 'date) |
1441 |
(if (Math-realp b) |
(if (Math-realp b) |
1453 |
(if hours |
(if hours |
1454 |
(setq b (math-div b (cdr hours)))) |
(setq b (math-div b (cdr hours)))) |
1455 |
(calcFunc-badd a b)) |
(calcFunc-badd a b)) |
1456 |
(math-reject-arg nil "*Illegal combination in date arithmetic"))) |
(math-reject-arg nil "*Invalid combination in date arithmetic"))) |
1457 |
(math-reject-arg a 'datep)))) |
(math-reject-arg a 'datep)))) |
1458 |
|
|
1459 |
(defun calcFunc-holiday (a) |
(defun calcFunc-holiday (a) |