/[pspp]/pspp/src/get.c
ViewVC logotype

Diff of /pspp/src/get.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.26 by jmd, Fri Apr 29 01:02:14 2005 UTC revision 1.27 by blp, Mon May 2 06:21:20 2005 UTC
# Line 212  cmd_save_internal (void) Line 212  cmd_save_internal (void)
212        if (lex_match_id ("VERSION"))        if (lex_match_id ("VERSION"))
213          {          {
214            lex_match ('=');            lex_match ('=');
215            if ( lex_force_num() )            if (lex_force_int ())
216              {              {
217                lex_get();                version = lex_integer ();
218                version = tokval;                lex_get ();
219                                
220                if ( 0 == strncasecmp (tokid,"x", 1) )                if (lex_match_id ("X"))
221                  {                  no_name_table = 1;
                   lex_get();  
                   no_name_table = 1;  
                 }  
   
222              }              }
223          }          }
224        else if (lex_match_id ("OUTFILE"))        else if (lex_match_id ("OUTFILE"))
# Line 450  rename_variables (struct dictionary *dic Line 446  rename_variables (struct dictionary *dic
446        if (!lex_force_match ('=')        if (!lex_force_match ('=')
447            || !lex_force_id ())            || !lex_force_id ())
448          return 0;          return 0;
       if (!strncmp (tokid, v->name, SHORT_NAME_LEN))  
         return 1;  
449        if (dict_lookup_var (dict, tokid) != NULL)        if (dict_lookup_var (dict, tokid) != NULL)
450          {          {
451            msg (SE, _("Cannot rename %s as %s because there already exists "            msg (SE, _("Cannot rename %s as %s because there already exists "
# Line 686  struct mtf_proc Line 680  struct mtf_proc
680      size_t by_cnt;              /* Number of variables on BY subcommand. */      size_t by_cnt;              /* Number of variables on BY subcommand. */
681    
682      /* Names of FIRST, LAST variables. */      /* Names of FIRST, LAST variables. */
683      char first[SHORT_NAME_LEN + 1], last[SHORT_NAME_LEN + 1];      char first[LONG_NAME_LEN + 1], last[LONG_NAME_LEN + 1];
684            
685      struct dictionary *dict;    /* Dictionary of output file. */      struct dictionary *dict;    /* Dictionary of output file. */
686      struct case_sink *sink;     /* Sink to receive output. */      struct case_sink *sink;     /* Sink to receive output. */
# Line 1437  mtf_merge_dictionary (struct dictionary Line 1431  mtf_merge_dictionary (struct dictionary
1431              mv->label = xstrdup (dv->label);              mv->label = xstrdup (dv->label);
1432          }          }
1433        else        else
1434          {          mv = dict_clone_var_assert (m, dv, dv->name);
           mv = dict_clone_var (m, dv, dv->name, dv->longname);  
           assert (mv != NULL);  
         }  
1435      }      }
1436    
1437    return 1;    return 1;

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26