X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcorrelations.q;h=d73c3cfff18b2b30a165179fa268882c32e85539;hb=4fdeb2145d081ff1b84e3f6c99f9d1c048c0d64a;hp=5b4fc2b38b7ea45199dcee5c7d37c571b0f2e36e;hpb=7b98b3a4f58f6dc5a8e9cbc188b627966d5e652d;p=pspp diff --git a/src/correlations.q b/src/correlations.q index 5b4fc2b38b..d73c3cfff1 100644 --- 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 - 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 #include #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;