projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed typo
[pspp-builds.git]
/
src
/
language
/
expressions
/
helpers.h
diff --git
a/src/language/expressions/helpers.h
b/src/language/expressions/helpers.h
index 124868cc6b50d70a65a493331da029692542f554..f856da3a99d23c7952549c365ceb249dd08307b7 100644
(file)
--- a/
src/language/expressions/helpers.h
+++ b/
src/language/expressions/helpers.h
@@
-1,4
+1,4
@@
-#ifndef EXPRESSIONS_HELPERS_H
+#ifndef EXPRESSIONS_HELPERS_H
#define EXPRESSIONS_HELPERS_H
#include <ctype.h>
#define EXPRESSIONS_HELPERS_H
#include <ctype.h>
@@
-19,6
+19,7
@@
#include <data/settings.h>
#include <data/value.h>
#include <data/variable.h>
#include <data/settings.h>
#include <data/value.h>
#include <data/variable.h>
+#include <data/vector.h>
#include <gsl-extras/gsl-extras.h>
#include <language/expressions/public.h>
#include <libpspp/compiler.h>
#include <gsl-extras/gsl-extras.h>
#include <language/expressions/public.h>
#include <libpspp/compiler.h>
@@
-31,7
+32,7
@@
#include "gettext.h"
#define _(msgid) gettext (msgid)
#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;
}
{
return errno == 0 ? x : SYSMIS;
}
@@
-44,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 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;
extern const struct substring empty_string;
@@
-54,13
+56,17
@@
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_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
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 finite (d) && d != SYSMIS;
}