Why does git only commit some of the changes if you don't pass the -a flag?

[pspp-builds.git] / src / language / expressions / helpers.h

diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h
index 0f44b35ff80b367fff44c3732930dd4cc5e786cb..447a6b8229aad02cff925ebebc8568892ea707f5 100644 (file)
--- a/src/language/expressions/helpers.h
+++ b/src/language/expressions/helpers.h
@@ -1,9 +1,10 @@
-#ifndef EXPRESSIONS_HELPERS_H 
+#ifndef EXPRESSIONS_HELPERS_H
 #define EXPRESSIONS_HELPERS_H
 
 #include <ctype.h>
 #include <float.h>
 #include <gsl/gsl_cdf.h>
+#include <gsl/gsl_math.h>
 #include <gsl/gsl_randist.h>
 #include <gsl/gsl_sf.h>
 #include <limits.h>
@@ -13,12 +14,13 @@
 #include <data/calendar.h>
 #include <data/case.h>
 #include <data/data-in.h>
+#include <data/data-out.h>
 #include <data/dictionary.h>
 #include <data/procedure.h>
 #include <data/settings.h>
 #include <data/value.h>
 #include <data/variable.h>
-#include <gsl-extras/gsl-extras.h>
+#include <data/vector.h>
 #include <language/expressions/public.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
@@ -30,7 +32,7 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-static inline double check_errno (double x) 
+static inline double check_errno (double x)
 {
   return errno == 0 ? x : SYSMIS;
 }
@@ -43,6 +45,7 @@ static inline double check_errno (double x)
 #define H_MIN 60.                       /* Minutes per hour. */
 #define MIN_S 60.                       /* Seconds per minute. */
 #define WEEK_DAY 7.                     /* Days per week. */
+#define WEEK_S (WEEK_DAY * DAY_S)       /* Seconds per week. */
 
 extern const struct substring empty_string;
 
@@ -53,15 +56,19 @@ 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_date_difference (double date1, double date2,
+                             struct substring unit);
+double expr_date_sum (double date, double quantity, struct substring unit_name,
+                      struct substring method_name);
 
 struct substring alloc_string (struct expression *, size_t length);
 struct substring copy_string (struct expression *,
                               const char *, size_t length);
 
 static inline bool
-is_valid (double d) 
+is_valid (double d)
 {
-  return finite (d) && d != SYSMIS;
+  return gsl_finite (d) && d != SYSMIS;
 }
 
 size_t count_valid (double *, size_t);