projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Read and ignore author field in portable files.
[pspp]
/
src
/
correlations.q
diff --git
a/src/correlations.q
b/src/correlations.q
index 6b708f6497fcb3863ff3d42c6fa5fcee7aa11031..d73c3cfff18b2b30a165179fa268882c32e85539 100644
(file)
--- a/
src/correlations.q
+++ b/
src/correlations.q
@@
-14,20
+14,19
@@
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 "var.h"
/* (headers) */
#include "file-handle.h"
#include "command.h"
#include "lexer.h"
#include "var.h"
/* (headers) */
-#undef DEBUGGING
-#define DEBUGGING 1
#include "debug-print.h"
struct cor_set
#include "debug-print.h"
struct cor_set
@@
-74,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);
@@
-85,25
+81,26
@@
internal_cmd_correlations (void)
}
static int
}
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;
struct cor_set *cor;
/* Ensure that this is a VARIABLES subcommand. */
{
struct variable **v1, **v2;
int nv1, nv2;
struct cor_set *cor;
/* Ensure that this is a VARIABLES subcommand. */
- if (!lex_match_id ("VARIABLES") && (token != T_ID || !is_varname (tokid))
+ if (!lex_match_id ("VARIABLES")
+ && (token != T_ID || dict_lookup_var (default_dict, tokid) != NULL)
&& token != T_ALL)
return 2;
lex_match ('=');
&& token != T_ALL)
return 2;
lex_match ('=');
- if (!parse_variables (
&
default_dict, &v1, &nv1,
+ if (!parse_variables (default_dict, &v1, &nv1,
PV_NO_DUPLICATE | PV_NUMERIC))
return 0;
if (lex_match (T_WITH))
{
PV_NO_DUPLICATE | PV_NUMERIC))
return 0;
if (lex_match (T_WITH))
{
- if (!parse_variables (
&
default_dict, &v2, &nv2,
+ if (!parse_variables (default_dict, &v2, &nv2,
PV_NO_DUPLICATE | PV_NUMERIC))
{
free (v1);
PV_NO_DUPLICATE | PV_NUMERIC))
{
free (v1);
@@
-131,18
+128,19
@@
cor_custom_variables (struct cmd_correlations *cmd unused)
}
static int
}
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 ('*'))
{
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;
if (!lex_force_match (')'))
return 0;
@@
-164,3
+162,9
@@
free_correlations_state (void)
free (cor);
}
}
free (cor);
}
}
+
+/*
+ Local Variables:
+ mode: c
+ End:
+*/