Reworked very long string support for better encapsulation.

[pspp] / src / language / expressions / evaluate.c

diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index e5f605b797966f7009ca5c48ef0d09694f530e2e..39b1ac4d2a554a3efe4e99277d037b865d382e77 100644 (file)
--- a/src/language/expressions/evaluate.c
+++ b/src/language/expressions/evaluate.c
@@ -21,11 +21,11 @@
 #include "private.h"
 
 #include <ctype.h>
-#include "alloc.h"
-#include "message.h"
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
 #include "helpers.h"
 #include "evaluate.h"
-#include "pool.h"
+#include <libpspp/pool.h>
 
 static void
 expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
@@ -82,6 +82,8 @@ expr_evaluate_num (struct expression *e, const struct ccase *c, int case_idx)
   return d;
 }
 
+
+
 void
 expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
                    char *dst, size_t dst_size) 
@@ -91,11 +93,12 @@ expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
   assert (e->type == OP_string);
   assert ((dst == NULL) == (dst_size == 0));
   expr_evaluate (e, c, case_idx, &s);
+  
   buf_copy_rpad (dst, dst_size, s.string, s.length);
 }
 \f
-#include "lexer.h"
-#include "command.h"
+#include <language/lexer/lexer.h>
+#include <language/command.h>
 
 int
 cmd_debug_evaluate (void)