start updating expression tests

[pspp] / src / language / expressions / helpers.h

diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h
index 1bd0ac8cb87dae0ab7c39bf357dc741e8ce10418..69c5ad348ddac45ca01b4e38053653bdd7afce69 100644 (file)
--- a/src/language/expressions/helpers.h
+++ b/src/language/expressions/helpers.h
@@ -51,6 +51,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
+struct expr_node;
+
 static inline double check_errno (double x)
 {
   return errno == 0 ? x : SYSMIS;
@@ -70,15 +72,22 @@ extern const struct substring empty_string;
 
 int compare_string_3way (const struct substring *, const struct substring *);
 
-double expr_ymd_to_date (double year, double month, double day);
-double expr_ymd_to_ofs (double year, double month, double day);
-double expr_wkyr_to_date (double wk, double yr);
-double expr_yrday_to_date (double yr, double day);
-double expr_yrmoda (double year, double month, double day);
+double expr_ymd_to_date (int year, int month, int day,
+                         const struct expression *, const struct expr_node *,
+                         int ya, int ma, int da);
+double expr_ymd_to_ofs (int y, int m, int d,
+                        const struct expression *, const struct expr_node *,
+                        int ya, int ma, int da);
 double expr_date_difference (double date1, double date2,
-                             struct substring unit);
+                             struct substring unit, const struct expression *,
+                             const struct expr_node *);
 double expr_date_sum (double date, double quantity, struct substring unit_name,
-                      struct substring method_name);
+                      struct substring method_name,
+                      const struct expression *, const struct expr_node *);
+double expr_date_sum_closest (double date, double quantity,
+                              struct substring unit_name,
+                              const struct expression *,
+                              const struct expr_node *);
 
 struct substring alloc_string (struct expression *, size_t length);
 struct substring copy_string (struct expression *,