projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New implementation of long variable names. Each variable has a
[pspp]
/
src
/
matrix-data.c
diff --git
a/src/matrix-data.c
b/src/matrix-data.c
index 4dc3fb18ca10331b1222a4370d38f4b11be0083f..73d473d177c2f90f8597f2fa73896a5cdf2695f3 100644
(file)
--- a/
src/matrix-data.c
+++ b/
src/matrix-data.c
@@
-218,7
+218,7
@@
cmd_matrix_data (void)
int i;
for (i = 0; i < nv; i++)
int i;
for (i = 0; i < nv; i++)
- if (!strcmp (v[i], "VARNAME_"))
+ if (!strc
asec
mp (v[i], "VARNAME_"))
{
msg (SE, _("VARNAME_ cannot be explicitly specified on "
"VARIABLES."));
{
msg (SE, _("VARNAME_ cannot be explicitly specified on "
"VARIABLES."));
@@
-236,7
+236,7
@@
cmd_matrix_data (void)
{
struct variable *new_var;
{
struct variable *new_var;
- if (strcmp (v[i], "ROWTYPE_"))
+ if (strc
asec
mp (v[i], "ROWTYPE_"))
{
new_var = dict_create_var_assert (default_dict, v[i], 0);
attach_mxd_aux (new_var, MXD_CONTINUOUS, i);
{
new_var = dict_create_var_assert (default_dict, v[i], 0);
attach_mxd_aux (new_var, MXD_CONTINUOUS, i);
@@
-306,7
+306,8
@@
cmd_matrix_data (void)
if (dict_lookup_var (default_dict, tokid) == NULL
&& (lex_look_ahead () == '.' || lex_look_ahead () == '/'))
{
if (dict_lookup_var (default_dict, tokid) == NULL
&& (lex_look_ahead () == '.' || lex_look_ahead () == '/'))
{
- if (!strcmp (tokid, "ROWTYPE_") || !strcmp (tokid, "VARNAME_"))
+ if (!strcasecmp (tokid, "ROWTYPE_")
+ || !strcasecmp (tokid, "VARNAME_"))
{
msg (SE, _("Split variable may not be named ROWTYPE_ "
"or VARNAME_."));
{
msg (SE, _("Split variable may not be named ROWTYPE_ "
"or VARNAME_."));
@@
-668,7
+669,7
@@
string_to_content_type (char *s, int *collide)
};
for (tp = tab; tp->value != -1; tp++)
};
for (tp = tab; tp->value != -1; tp++)
- if (!strcmp (s, tp->string))
+ if (!strc
asec
mp (s, tp->string))
{
if (collide)
*collide = tp->collide;
{
if (collide)
*collide = tp->collide;