/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
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
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include "evaluate.h"
+
+#include "language/expressions/evaluate.h"
#include <ctype.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <language/expressions/helpers.h>
-#include <language/expressions/private.h>
-#include <language/lexer/value-parser.h>
-#include <libpspp/pool.h>
+
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "language/expressions/helpers.h"
+#include "language/expressions/private.h"
+#include "language/lexer/value-parser.h"
+#include "libpspp/pool.h"
#include "xalloc.h"
buf_copy_rpad (dst, dst_size, s.string, s.length, ' ');
}
\f
-#include <language/lexer/lexer.h>
-#include <language/command.h>
+#include "language/lexer/lexer.h"
+#include "language/command.h"
int
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
struct dataset *ds = NULL;
+ char *name = NULL;
+
struct expression *expr;
for (;;)
dump_postfix = 1;
else if (lex_match (lexer, T_LPAREN))
{
- char name[VAR_NAME_LEN + 1];
struct variable *v;
size_t old_value_cnt;
int width;
if (!lex_force_id (lexer))
goto done;
- strcpy (name, lex_tokcstr (lexer));
+ name = xstrdup (lex_tokcstr (lexer));
lex_get (lexer);
if (!lex_force_match (lexer, T_EQUALS))
if ( ds == NULL )
{
- ds = create_dataset ();
+ ds = dataset_create ();
d = dataset_dict (ds);
}
msg (SE, _("Duplicate variable name %s."), name);
goto done;
}
+ free (name);
+ name = NULL;
if (c == NULL)
c = case_create (dict_get_proto (d));
retval = CMD_SUCCESS;
done:
- if (ds)
- destroy_dataset (ds);
+ dataset_destroy (ds);
case_unref (c);
+ free (name);
+
return retval;
}