-#ifndef EXPRESSIONS_HELPERS_H
+#ifndef EXPRESSIONS_HELPERS_H
#define EXPRESSIONS_HELPERS_H
#include <ctype.h>
#include <limits.h>
#include <math.h>
#include <stdbool.h>
-#include "case.h"
-#include "data-in.h"
-#include "dictionary.h"
-#include "message.h"
-#include "calendar.h"
-#include "gsl-extras/gsl-extras.h"
-#include "misc.h"
-#include "moments.h"
-#include "random.h"
-#include "settings.h"
-#include "str.h"
-#include "value.h"
-#include "variable.h"
-#include "procedure.h"
+
+#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 <data/vector.h>
+#include <language/expressions/public.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <math/moments.h>
+#include <math/random.h>
#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;
}
#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 fixed_string empty_string;
+extern const struct substring empty_string;
-int compare_string (const struct fixed_string *, const struct fixed_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_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 fixed_string alloc_string (struct expression *, size_t length);
-struct fixed_string copy_string (struct expression *,
- const char *, size_t length);
+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 isfinite (d) && d != SYSMIS;
}
size_t count_valid (double *, size_t);