Rewrite portable file reader code and incidentally clean up code for

[pspp-builds.git] / src / correlations.q

diff --git a/src/correlations.q b/src/correlations.q
index 5b4fc2b38b7ea45199dcee5c7d37c571b0f2e36e..4bde9a06311954a2848125b54d015d4ae08216d4 100644 (file)
--- a/src/correlations.q
+++ b/src/correlations.q
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include "alloc.h"
+#include "dictionary.h"
 #include "file-handle.h"
 #include "command.h"
 #include "lexer.h"
@@ -72,9 +73,6 @@ internal_cmd_correlations (void)
   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);
@@ -136,12 +134,13 @@ cor_custom_matrix (struct cmd_correlations *cmd UNUSED)
     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;