Rewrite and improve formatted output routines.

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

diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h
index 54e56bbdb1873e1e0d305cc85fca9fb32092e5a5..124868cc6b50d70a65a493331da029692542f554 100644 (file)
--- a/src/language/expressions/helpers.h
+++ b/src/language/expressions/helpers.h
@@ -9,21 +9,24 @@
 #include <limits.h>
 #include <math.h>
 #include <stdbool.h>
-#include "case.h"
-#include "compiler.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 <gsl-extras/gsl-extras.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)
@@ -42,9 +45,9 @@ static inline double check_errno (double x)
 #define MIN_S 60.                       /* Seconds per minute. */
 #define WEEK_DAY 7.                     /* Days 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 (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);
@@ -52,9 +55,9 @@ 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);
 
-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)