Implemented long variable names a la spss V12.

[pspp-builds.git] / src / recode.c

diff --git a/src/recode.c b/src/recode.c
index 34342a1e185895df394e55f17ab48e127fc491b1..36bb590e51634a5c84b6b6db7e636453f8494253 100644 (file)
--- a/src/recode.c
+++ b/src/recode.c
@@ -18,12 +18,14 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
 #include "alloc.h"
+#include "case.h"
 #include "command.h"
+#include "dictionary.h"
 #include "error.h"
 #include "lexer.h"
 #include "magic.h"
@@ -64,7 +66,7 @@ struct rcd_var
 
     struct variable *src;      /* Source variable. */
     struct variable *dest;     /* Destination variable. */
-    char dest_name[9];         /* Name of dest variable if we're creating it. */
+    char dest_name[SHORT_NAME_LEN + 1];                /* Name of dest variable if we're creating it. */
 
     int has_sysmis;            /* Do we recode for SYSMIS? */
     union value sysmis;                /* Coding for SYSMIS (if src is numeric). */
@@ -105,7 +107,7 @@ static int parse_dest_spec (struct rcd_var * rcd, union value *v,
 static int parse_src_spec (struct rcd_var * rcd, int type, size_t max_src_width);
 static trns_proc_func recode_trns_proc;
 static trns_free_func recode_trns_free;
-static double convert_to_double (char *, int);
+static double convert_to_double (const char *, int);
 \f
 /* Parser. */
 
@@ -142,8 +144,6 @@ cmd_recode (void)
   struct variable **v;
   int nv;
 
-  lex_match_id ("RECODE");
-
   /* Parses each specification between slashes. */
   head = rcd = xmalloc (sizeof *rcd);
   v = NULL;
@@ -234,7 +234,7 @@ cmd_recode (void)
              else
                {
                  for (i = mark; i < rcd->nmap; i++)
-                   rcd->map[i].t.c = xstrdup (output.c);
+                   rcd->map[i].t.c = (output.c?xstrdup (output.c):NULL);
                  free (output.c);
                }
            }
@@ -390,14 +390,14 @@ cmd_recode (void)
          
        }
 
+      free (v);
+      v = NULL;
+
       if (!lex_match ('/'))
        break;
       while (rcd->next)
        rcd = rcd->next;
       rcd = rcd->next = xmalloc (sizeof *rcd);
-
-      free (v);
-      v = NULL;
     }
 
   if (token != '.')
@@ -445,7 +445,7 @@ parse_dest_spec (struct rcd_var * rcd, union value * v, size_t *max_dst_width)
 
   v->c = NULL;
 
-  if (token == T_NUM)
+  if (lex_is_number ())
     {
       v->f = tokval;
       lex_get ();
@@ -463,7 +463,7 @@ parse_dest_spec (struct rcd_var * rcd, union value * v, size_t *max_dst_width)
       if (toklen > max)
        max = toklen;
       v->c = xmalloc (max + 1);
-      st_pad_copy (v->c, ds_value (&tokstr), max + 1);
+      st_pad_copy (v->c, ds_c_str (&tokstr), max + 1);
       flags = RCD_DEST_STRING;
       *max_dst_width = max;
       lex_get ();
@@ -540,7 +540,7 @@ parse_src_spec (struct rcd_var * rcd, int type, size_t max_src_width)
                    return 0;
                  if (lex_match_id ("HI") || lex_match_id ("HIGHEST"))
                    c->type = RCD_ELSE;
-                 else if (token == T_NUM)
+                 else if (lex_is_number ())
                    {
                      c->type = RCD_LOW;
                      c->f1.f = tokval;
@@ -568,7 +568,7 @@ parse_src_spec (struct rcd_var * rcd, int type, size_t max_src_width)
                  return 0;
                }
            }
-         else if (token == T_NUM)
+         else if (lex_is_number ())
            {
              c->f1.f = tokval;
              lex_get ();
@@ -576,7 +576,7 @@ parse_src_spec (struct rcd_var * rcd, int type, size_t max_src_width)
                {
                  if (lex_match_id ("HI") || lex_match_id ("HIGHEST"))
                    c->type = RCD_HIGH;
-                 else if (token == T_NUM)
+                 else if (lex_is_number ())
                    {
                      c->type = RCD_RANGE;
                      c->f2.f = tokval;
@@ -626,7 +626,7 @@ parse_src_spec (struct rcd_var * rcd, int type, size_t max_src_width)
              if (!lex_force_string ())
                return 0;
              c->f1.c = xmalloc (max_src_width + 1);
-             st_pad_copy (c->f1.c, ds_value (&tokstr), max_src_width + 1);
+             st_pad_copy (c->f1.c, ds_c_str (&tokstr), max_src_width + 1);
              lex_get ();
            }
        }
@@ -689,7 +689,7 @@ recode_trns_free (struct trns_header * t)
 static inline struct coding *
 find_src_numeric (struct rcd_var * v, struct ccase * c)
 {
-  double cmp = c->data[v->src->fv].f;
+  double cmp = case_num (c, v->src->fv);
   struct coding *cp;
 
   if (cmp == SYSMIS)
@@ -697,9 +697,9 @@ find_src_numeric (struct rcd_var * v, struct ccase * c)
       if (v->sysmis.f != -SYSMIS)
        {
          if ((v->flags & RCD_DEST_MASK) == RCD_DEST_NUMERIC)
-           c->data[v->dest->fv].f = v->sysmis.f;
+            case_data_rw (c, v->dest->fv)->f = v->sysmis.f;
          else
-           memcpy (c->data[v->dest->fv].s, v->sysmis.c,
+           memcpy (case_data_rw (c, v->dest->fv)->s, v->sysmis.s,
                    v->dest->width);
        }
       return NULL;
@@ -740,7 +740,7 @@ find_src_numeric (struct rcd_var * v, struct ccase * c)
 static inline struct coding *
 find_src_string (struct rcd_var * v, struct ccase * c)
 {
-  char *cmp = c->data[v->src->fv].s;
+  const char *cmp = case_str (c, v->src->fv);
   int w = v->src->width;
   struct coding *cp;
 
@@ -760,7 +760,7 @@ find_src_string (struct rcd_var * v, struct ccase * c)
          double f = convert_to_double (cmp, w);
          if (f != -SYSMIS)
            {
-             c->data[v->dest->fv].f = f;
+              case_data_rw (c, v->dest->fv)->f = f;
              return NULL;
            }
          break;
@@ -772,7 +772,7 @@ find_src_string (struct rcd_var * v, struct ccase * c)
 
 static int
 recode_trns_proc (struct trns_header * t, struct ccase * c,
-                  int case_num UNUSED)
+                  int case_idx UNUSED)
 {
   struct rcd_var *v;
 
@@ -790,6 +790,7 @@ recode_trns_proc (struct trns_header * t, struct ccase * c,
          break;
         default:
           assert (0);
+          abort ();
        }
       if (!cp)
        continue;
@@ -798,20 +799,24 @@ recode_trns_proc (struct trns_header * t, struct ccase * c,
       if ((v->flags & RCD_DEST_MASK) == RCD_DEST_NUMERIC)
        {
          double val = cp->t.f;
+          double *out = &case_data_rw (c, v->dest->fv)->f;
          if (val == -SYSMIS)
-           c->data[v->dest->fv].f = c->data[v->src->fv].f;
+           *out = case_num (c, v->src->fv);
          else
-           c->data[v->dest->fv].f = val;
+           *out = val;
        }
       else
        {
          char *val = cp->t.c;
-         if (val == NULL)
-           st_bare_pad_len_copy (c->data[v->dest->fv].s,
-                                 c->data[v->src->fv].c,
-                                 v->dest->width, v->src->width);
+         if (val == NULL) 
+            {
+              if (v->dest->fv != v->src->fv)
+                st_bare_pad_len_copy (case_data_rw (c, v->dest->fv)->s,
+                                      case_str (c, v->src->fv),
+                                      v->dest->width, v->src->width); 
+            }
          else
-           memcpy (c->data[v->dest->fv].s, cp->t.c, v->dest->width);
+           memcpy (case_data_rw (c, v->dest->fv)->s, cp->t.c, v->dest->width);
        }
     }
 
@@ -823,13 +828,13 @@ recode_trns_proc (struct trns_header * t, struct ccase * c,
    first character after the number into *ENDPTR.  From the GNU C
    library. */
 static long int
-string_to_long (char *nptr, int width, char **endptr)
+string_to_long (const char *nptr, int width, const char **endptr)
 {
   int negative;
   register unsigned long int cutoff;
   register unsigned int cutlim;
   register unsigned long int i;
-  register char *s;
+  register const char *s;
   register unsigned char c;
   const char *save;
 
@@ -899,7 +904,7 @@ string_to_long (char *nptr, int width, char **endptr)
    found, or -SYSMIS if there was no valid number in s.  WIDTH is the
    length of string S.  From the GNU C library. */
 static double
-convert_to_double (char *s, int width)
+convert_to_double (const char *s, int width)
 {
   register const char *end = &s[width];