projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added new files resulting from directory restructuring.
[pspp]
/
src
/
correlations.q
diff --git
a/src/correlations.q
b/src/correlations.q
index 5b4fc2b38b7ea45199dcee5c7d37c571b0f2e36e..f5348748d50c95365e83c69fe2bb2ef00dd44c46 100644
(file)
--- a/
src/correlations.q
+++ b/
src/correlations.q
@@
-14,12
+14,13
@@
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 <stdlib.h>
#include "alloc.h"
#include <config.h>
#include <stdlib.h>
#include "alloc.h"
+#include "dictionary.h"
#include "file-handle.h"
#include "command.h"
#include "lexer.h"
#include "file-handle.h"
#include "command.h"
#include "lexer.h"
@@
-32,7
+33,7
@@
struct cor_set
{
struct cor_set *next;
struct variable **v1, **v2;
{
struct cor_set *next;
struct variable **v1, **v2;
-
in
t nv1, nv2;
+
size_
t nv1, nv2;
};
struct cor_set *cor_list, *cor_last;
};
struct cor_set *cor_list, *cor_last;
@@
-72,9
+73,6
@@
internal_cmd_correlations (void)
cor_list = cor_last = NULL;
matrix_file = NULL;
cor_list = cor_last = NULL;
matrix_file = NULL;
- lex_match_id ("PEARSON");
- lex_match_id ("CORRELATIONS");
-
if (!parse_correlations (&cmd))
return CMD_FAILURE;
free_correlations (&cmd);
if (!parse_correlations (&cmd))
return CMD_FAILURE;
free_correlations (&cmd);
@@
-86,7
+84,7
@@
static int
cor_custom_variables (struct cmd_correlations *cmd UNUSED)
{
struct variable **v1, **v2;
cor_custom_variables (struct cmd_correlations *cmd UNUSED)
{
struct variable **v1, **v2;
-
in
t nv1, nv2;
+
size_
t nv1, nv2;
struct cor_set *cor;
/* Ensure that this is a VARIABLES subcommand. */
struct cor_set *cor;
/* Ensure that this is a VARIABLES subcommand. */
@@
-136,12
+134,13
@@
cor_custom_matrix (struct cmd_correlations *cmd UNUSED)
return 0;
if (lex_match ('*'))
return 0;
if (lex_match ('*'))
- matrix_file = inline_file;
- else
- matrix_file = fh_parse_file_handle ();
-
- if (!matrix_file)
- return 0;
+ matrix_file = NULL;
+ else
+ {
+ matrix_file = fh_parse (FH_REF_FILE);
+ if (matrix_file == NULL)
+ return 0;
+ }
if (!lex_force_match (')'))
return 0;
if (!lex_force_match (')'))
return 0;