Rewrite and improve formatted output routines.

[pspp-builds.git] / src / language / expressions / operations.def

diff --git a/src/language/expressions/operations.def b/src/language/expressions/operations.def
index 95ac1e0b53ab2c14fdf86c8d4412e840f7335283..6b4d5221eaec08b12873162c60be57bf79ed44be 100644 (file)
--- a/src/language/expressions/operations.def
+++ b/src/language/expressions/operations.def
@@ -1,4 +1,23 @@
 // -*- c -*-
+//
+// PSPP - computes sample statistics.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Written by Ben Pfaff <blp@gnu.org>.
+// 
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+// 02110-1301, USA. */
 
 operator NEG (x) = -x;
 
@@ -133,7 +152,7 @@ function MAX.1 (a[n])
 
 string function MAX (string a[n])
 {
-  struct fixed_string *max;
+  struct substring *max;
   size_t i;
 
   max = &a[0];
@@ -164,7 +183,7 @@ function MIN.1 (a[n])
 
 string function MIN (string a[n])
 {
-  struct fixed_string *min;
+  struct substring *min;
   size_t i;
 
   min = &a[0];
@@ -220,8 +239,8 @@ boolean function RANGE (string x, string a[n*2])
 
   for (i = 0; i < n; i++)
     {
-      struct fixed_string *w = &a[2 * i];
-      struct fixed_string *y = &a[2 * i + 1];
+      struct substring *w = &a[2 * i];
+      struct substring *y = &a[2 * i + 1];
       if (compare_string (w, &x) <= 0 && compare_string (&x, y) <= 0)
         return 1.;
     }
@@ -303,19 +322,19 @@ function XDATE.YEAR (date >= DAY_S) = calendar_offset_to_year (date / DAY_S);
 string function CONCAT (string a[n])
      expression e;
 {
-  struct fixed_string dst;
+  struct substring dst;
   size_t i;
 
-  dst = alloc_string (e, 255);
+  dst = alloc_string (e, MAX_STRING);
   dst.length = 0;
   for (i = 0; i < n; i++)
     {
-      struct fixed_string *src = &a[i];
+      struct substring *src = &a[i];
       size_t copy_len;
 
       copy_len = src->length;
-      if (dst.length + copy_len > 255)
-        copy_len = 255 - dst.length;
+      if (dst.length + copy_len > MAX_STRING)
+        copy_len = MAX_STRING - dst.length;
       memcpy (&dst.string[dst.length], src->string, copy_len);
       dst.length += copy_len;
     }
@@ -440,13 +459,13 @@ string function UPCASE (string s)
 absorb_miss string function LPAD (string s, n)
      expression e;
 {
-  if (n < 0 || n > 255 || (int) n != n)
+  if (n < 0 || n > MAX_STRING || (int) n != n)
     return empty_string;
   else if (s.length >= n)
     return s;
   else
     {
-      struct fixed_string t = alloc_string (e, n);
+      struct substring t = alloc_string (e, n);
       memset (t.string, ' ', n - s.length);
       memcpy (&t.string[(int) n - s.length], s.string, s.length);
       return t;
@@ -456,13 +475,13 @@ absorb_miss string function LPAD (string s, n)
 absorb_miss string function LPAD (string s, n, string c)
      expression e;
 {
-  if (n < 0 || n > 255 || (int) n != n || c.length != 1)
+  if (n < 0 || n > MAX_STRING || (int) n != n || c.length != 1)
     return empty_string;
   else if (s.length >= n)
     return s;
   else
     {
-      struct fixed_string t = alloc_string (e, n);
+      struct substring t = alloc_string (e, n);
       memset (t.string, c.string[0], n - s.length);
       memcpy (&t.string[(int) n - s.length], s.string, s.length);
       return t;
@@ -472,13 +491,13 @@ absorb_miss string function LPAD (string s, n, string c)
 absorb_miss string function RPAD (string s, n)
      expression e;
 {
-  if (n < 0 || n > 255 || (int) n != n)
+  if (n < 0 || n > MAX_STRING || (int) n != n)
     return empty_string;
   else if (s.length >= n)
     return s;
   else
     {
-      struct fixed_string t = alloc_string (e, n);
+      struct substring t = alloc_string (e, n);
       memcpy (t.string, s.string, s.length);
       memset (&t.string[s.length], ' ', n - s.length);
       return t;
@@ -488,13 +507,13 @@ absorb_miss string function RPAD (string s, n)
 absorb_miss string function RPAD (string s, n, string c)
      expression e;
 {
-  if (n < 0 || n > 255 || (int) n != n || c.length != 1)
+  if (n < 0 || n > MAX_STRING || (int) n != n || c.length != 1)
     return empty_string;
   else if (s.length >= n)
     return s;
   else
     {
-      struct fixed_string t = alloc_string (e, n);
+      struct substring t = alloc_string (e, n);
       memcpy (t.string, s.string, s.length);
       memset (&t.string[s.length], c.string[0], n - s.length);
       return t;
@@ -563,12 +582,12 @@ absorb_miss string function STRING (x, no_format f)
      expression e;
 {
   union value v;
-  struct fixed_string dst;
+  struct substring dst;
 
   v.f = x;
   dst = alloc_string (e, f->w);
-  assert ((formats[f->type].cat & FCAT_STRING) == 0);
-  data_out (dst.string, f, &v);
+  assert (!fmt_is_string (f->type));
+  data_out (&v, f, dst.string);
   return dst;
 }
 
@@ -951,14 +970,15 @@ no_opt string operator STR_VAR ()
      expression e;
      str_var v;
 {
-  struct fixed_string s = alloc_string (e, v->width);
+  struct substring s = alloc_string (e, v->width);
   memcpy (s.string, case_str (c, v->fv), v->width);
   return s;
 }
 
 no_opt perm_only function LAG (num_var v, pos_int n_before)
+    dataset ds;
 {
-  struct ccase *c = lagged_case (n_before);
+  struct ccase *c = lagged_case (ds, n_before);
   if (c != NULL)
     {
       double x = case_num (c, v->fv);
@@ -969,8 +989,9 @@ no_opt perm_only function LAG (num_var v, pos_int n_before)
 }
 
 no_opt perm_only function LAG (num_var v)
+    dataset ds;
 {
-  struct ccase *c = lagged_case (1);
+  struct ccase *c = lagged_case (ds, 1);
   if (c != NULL)
     {
       double x = case_num (c, v->fv);
@@ -982,8 +1003,9 @@ no_opt perm_only function LAG (num_var v)
 
 no_opt perm_only string function LAG (str_var v, pos_int n_before)
      expression e;
+     dataset ds;
 {
-  struct ccase *c = lagged_case (n_before);
+  struct ccase *c = lagged_case (ds, n_before);
   if (c != NULL)
     return copy_string (e, case_str (c, v->fv), v->width);
   else
@@ -992,8 +1014,9 @@ no_opt perm_only string function LAG (str_var v, pos_int n_before)
 
 no_opt perm_only string function LAG (str_var v)
      expression e;
+     dataset ds;
 {
-  struct ccase *c = lagged_case (1);
+  struct ccase *c = lagged_case (ds, 1);
   if (c != NULL)
     return copy_string (e, case_str (c, v->fv), v->width);
   else