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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include <config.h>
#include <stdlib.h>
#include "alloc.h"
+#include "dictionary.h"
#include "file-handle.h"
#include "command.h"
#include "lexer.h"
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);
}
static int
-cor_custom_variables (struct cmd_correlations *cmd unused)
+cor_custom_variables (struct cmd_correlations *cmd UNUSED)
{
struct variable **v1, **v2;
int nv1, nv2;
}
static int
-cor_custom_matrix (struct cmd_correlations *cmd unused)
+cor_custom_matrix (struct cmd_correlations *cmd UNUSED)
{
if (!lex_force_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 ();
+ if (matrix_file == NULL)
+ return 0;
+ }
if (!lex_force_match (')'))
return 0;