projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DEBUG EVALUATE: Eliminate VAR_NAME_LEN limit.
[pspp-builds.git]
/
src
/
language
/
expressions
/
evaluate.c
diff --git
a/src/language/expressions/evaluate.c
b/src/language/expressions/evaluate.c
index 65404b43e4d4d6a725a57794811291881890d4c7..6ac0572185619dc83977cb81655957cf437f6581 100644
(file)
--- a/
src/language/expressions/evaluate.c
+++ b/
src/language/expressions/evaluate.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-116,6
+116,8
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
struct dataset *ds = NULL;
struct dataset *ds = NULL;
+ char *name = NULL;
+
struct expression *expr;
for (;;)
struct expression *expr;
for (;;)
@@
-125,25
+127,24
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
optimize = 0;
else if (lex_match_id (lexer, "POSTFIX"))
dump_postfix = 1;
optimize = 0;
else if (lex_match_id (lexer, "POSTFIX"))
dump_postfix = 1;
- else if (lex_match (lexer,
'('
))
+ 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;
struct variable *v;
size_t old_value_cnt;
int width;
if (!lex_force_id (lexer))
goto done;
-
strcpy (name, lex_tokid
(lexer));
+
name = xstrdup (lex_tokcstr
(lexer));
lex_get (lexer);
lex_get (lexer);
- if (!lex_force_match (lexer,
'='
))
+ if (!lex_force_match (lexer,
T_EQUALS
))
goto done;
if (lex_is_number (lexer))
width = 0;
else if (lex_is_string (lexer))
goto done;
if (lex_is_number (lexer))
width = 0;
else if (lex_is_string (lexer))
- width =
ds_length (lex_tokstr
(lexer));
+ width =
ss_length (lex_tokss
(lexer));
else
{
lex_error (lexer, _("expecting number or string"));
else
{
lex_error (lexer, _("expecting number or string"));
@@
-163,6
+164,8
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
msg (SE, _("Duplicate variable name %s."), name);
goto done;
}
msg (SE, _("Duplicate variable name %s."), name);
goto done;
}
+ free (name);
+ name = NULL;
if (c == NULL)
c = case_create (dict_get_proto (d));
if (c == NULL)
c = case_create (dict_get_proto (d));
@@
-172,15
+175,15
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
if (!parse_value (lexer, case_data_rw (c, v), var_get_width (v)))
NOT_REACHED ();
if (!parse_value (lexer, case_data_rw (c, v), var_get_width (v)))
NOT_REACHED ();
- if (!lex_force_match (lexer,
')'
))
+ if (!lex_force_match (lexer,
T_RPAREN
))
goto done;
}
else
break;
}
goto done;
}
else
break;
}
- if (lex_token (lexer) !=
'/'
)
+ if (lex_token (lexer) !=
T_SLASH
)
{
{
- lex_force_match (lexer,
'/'
);
+ lex_force_match (lexer,
T_SLASH
);
goto done;
}
goto done;
}
@@
-242,6
+245,8
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
case_unref (c);
case_unref (c);
+ free (name);
+
return retval;
}
return retval;
}