projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add assertions.
[pspp]
/
src
/
matrix-data.c
diff --git
a/src/matrix-data.c
b/src/matrix-data.c
index e7747a89324fc8f8ab7f9f2bd854ac025471281d..73d473d177c2f90f8597f2fa73896a5cdf2695f3 100644
(file)
--- a/
src/matrix-data.c
+++ b/
src/matrix-data.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include "error.h"
#include <config.h>
#include "error.h"
@@
-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;
@@
-963,8
+964,7
@@
read_matrices_without_rowtype (struct matrix_data_pgm *mx)
nr.split_values = xmalloc (sizeof *nr.split_values
* dict_get_split_cnt (default_dict));
nr.split_values = xmalloc (sizeof *nr.split_values
* dict_get_split_cnt (default_dict));
- vfm_source = create_case_source (&matrix_data_without_rowtype_source_class,
- default_dict, &nr);
+ vfm_source = create_case_source (&matrix_data_without_rowtype_source_class, &nr);
procedure (NULL, NULL);
procedure (NULL, NULL);
@@
-1495,7
+1495,7
@@
read_matrices_with_rowtype (struct matrix_data_pgm *mx)
mx->cells = 0;
vfm_source = create_case_source (&matrix_data_with_rowtype_source_class,
mx->cells = 0;
vfm_source = create_case_source (&matrix_data_with_rowtype_source_class,
-
default_dict,
&wr);
+ &wr);
procedure (NULL, NULL);
free (wr.split_values);
procedure (NULL, NULL);
free (wr.split_values);
@@
-1667,11
+1667,8
@@
wr_output_data (struct wr_aux_data *wr,
int factor;
for (factor = 0; factor < mx->n_factors; factor++)
int factor;
for (factor = 0; factor < mx->n_factors; factor++)
- {
- case_data_rw (c, mx->factors[factor]->fv)->f
- = iter->factors[factor];
- debug_printf (("f:%s ", factors[factor]->name));
- }
+ case_data_rw (c, mx->factors[factor]->fv)->f
+ = iter->factors[factor];
}
{
}
{