projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First attempt at a LOGISTIC REGRESSION command
[pspp]
/
src
/
language
/
data-io
/
inpt-pgm.c
diff --git
a/src/language/data-io/inpt-pgm.c
b/src/language/data-io/inpt-pgm.c
index 415c48c7be46ad2e0918f69bbee781d55fc80d57..ccd53be04e4199913635d1568aa4af774459e36f 100644
(file)
--- a/
src/language/data-io/inpt-pgm.c
+++ b/
src/language/data-io/inpt-pgm.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011
, 2012
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-16,15
+16,14
@@
#include <config.h>
#include <config.h>
-
#include <float.h>
#include <stdlib.h>
#include "data/case.h"
#include "data/caseinit.h"
#include "data/casereader-provider.h"
#include <float.h>
#include <stdlib.h>
#include "data/case.h"
#include "data/caseinit.h"
#include "data/casereader-provider.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/dictionary.h"
-#include "data/procedure.h"
#include "data/transformations.h"
#include "data/variable.h"
#include "language/command.h"
#include "data/transformations.h"
#include "data/variable.h"
#include "language/command.h"
@@
-47,8
+46,7
@@
/* Private result codes for use within INPUT PROGRAM. */
enum cmd_result_extensions
{
/* Private result codes for use within INPUT PROGRAM. */
enum cmd_result_extensions
{
- CMD_END_INPUT_PROGRAM = CMD_PRIVATE_FIRST,
- CMD_END_CASE
+ CMD_END_CASE = CMD_PRIVATE_FIRST
};
/* Indicates how a `union value' should be initialized. */
};
/* Indicates how a `union value' should be initialized. */
@@
-94,8
+92,8
@@
cmd_input_program (struct lexer *lexer, struct dataset *ds)
struct input_program_pgm *inp;
bool saw_END_CASE = false;
struct input_program_pgm *inp;
bool saw_END_CASE = false;
-
proc_discard_active_file
(ds);
- if (
lex_token (lexer) != T_ENDCMD
)
+
dataset_clear
(ds);
+ if (
!lex_match (lexer, T_ENDCMD)
)
return lex_end_of_command (lexer);
inp = xmalloc (sizeof *inp);
return lex_end_of_command (lexer);
inp = xmalloc (sizeof *inp);
@@
-104,12
+102,12
@@
cmd_input_program (struct lexer *lexer, struct dataset *ds)
inp->proto = NULL;
inside_input_program = true;
inp->proto = NULL;
inside_input_program = true;
-
for (;;
)
+
while (!lex_match_phrase (lexer, "END INPUT PROGRAM")
)
{
{
- enum cmd_result result
= cmd_parse_in_state (lexer, ds, CMD_STATE_INPUT_PROGRAM)
;
- if (result == CMD_END_INPUT_PROGRAM)
-
break
;
-
else if (result ==
CMD_END_CASE)
+ enum cmd_result result;
+
+
result = cmd_parse_in_state (lexer, ds, CMD_STATE_INPUT_PROGRAM)
;
+
if (result == (enum cmd_result)
CMD_END_CASE)
{
emit_END_CASE (ds, inp);
saw_END_CASE = true;
{
emit_END_CASE (ds, inp);
saw_END_CASE = true;
@@
-119,7
+117,7
@@
cmd_input_program (struct lexer *lexer, struct dataset *ds)
if (result == CMD_EOF)
msg (SE, _("Unexpected end-of-file within INPUT PROGRAM."));
inside_input_program = false;
if (result == CMD_EOF)
msg (SE, _("Unexpected end-of-file within INPUT PROGRAM."));
inside_input_program = false;
-
proc_discard_active_file
(ds);
+
dataset_clear
(ds);
destroy_input_program (inp);
return result;
}
destroy_input_program (inp);
return result;
}
@@
-131,7
+129,7
@@
cmd_input_program (struct lexer *lexer, struct dataset *ds)
if (dict_get_next_value_idx (dataset_dict (ds)) == 0)
{
msg (SE, _("Input program did not create any variables."));
if (dict_get_next_value_idx (dataset_dict (ds)) == 0)
{
msg (SE, _("Input program did not create any variables."));
-
proc_discard_active_file
(ds);
+
dataset_clear
(ds);
destroy_input_program (inp);
return CMD_FAILURE;
}
destroy_input_program (inp);
return CMD_FAILURE;
}
@@
-146,7
+144,7
@@
cmd_input_program (struct lexer *lexer, struct dataset *ds)
caseinit_mark_for_init (inp->init, dataset_dict (ds));
inp->proto = caseproto_ref (dict_get_proto (dataset_dict (ds)));
caseinit_mark_for_init (inp->init, dataset_dict (ds));
inp->proto = caseproto_ref (dict_get_proto (dataset_dict (ds)));
-
proc_set_active_file_data
(
+
dataset_set_source
(
ds, casereader_create_sequential (NULL, inp->proto, CASENUMBER_MAX,
&input_program_casereader_class, inp));
ds, casereader_create_sequential (NULL, inp->proto, CASENUMBER_MAX,
&input_program_casereader_class, inp));
@@
-156,8
+154,12
@@
cmd_input_program (struct lexer *lexer, struct dataset *ds)
int
cmd_end_input_program (struct lexer *lexer UNUSED, struct dataset *ds UNUSED)
{
int
cmd_end_input_program (struct lexer *lexer UNUSED, struct dataset *ds UNUSED)
{
- assert (in_input_program ());
- return CMD_END_INPUT_PROGRAM;
+ /* Inside INPUT PROGRAM, this should get caught at the top of the loop in
+ cmd_input_program().
+
+ Outside of INPUT PROGRAM, the command parser should reject this
+ command. */
+ NOT_REACHED ();
}
/* Returns true if STATE is valid given the transformations that
}
/* Returns true if STATE is valid given the transformations that
@@
-237,7
+239,7
@@
cmd_end_case (struct lexer *lexer, struct dataset *ds UNUSED)
assert (in_input_program ());
if (lex_token (lexer) == T_ENDCMD)
return CMD_END_CASE;
assert (in_input_program ());
if (lex_token (lexer) == T_ENDCMD)
return CMD_END_CASE;
- return
lex_end_of_command (lexer)
;
+ return
CMD_SUCCESS
;
}
/* Outputs the current case */
}
/* Outputs the current case */
@@
-264,6
+266,7
@@
cmd_reread (struct lexer *lexer, struct dataset *ds)
struct file_handle *fh; /* File to be re-read. */
struct expression *e; /* Expression for column to set. */
struct reread_trns *t; /* Created transformation. */
struct file_handle *fh; /* File to be re-read. */
struct expression *e; /* Expression for column to set. */
struct reread_trns *t; /* Created transformation. */
+ char *encoding = NULL;
fh = fh_get_default_handle ();
e = NULL;
fh = fh_get_default_handle ();
e = NULL;
@@
-275,41
+278,53
@@
cmd_reread (struct lexer *lexer, struct dataset *ds)
if (e)
{
if (e)
{
- msg (SE, _("%s subcommand may be given at most once."), "COLUMN");
- expr_free (e);
- return CMD_CASCADING_FAILURE;
+ lex_sbc_only_once ("COLUMN");
+ goto error;
}
e = expr_parse (lexer, ds, EXPR_NUMBER);
if (!e)
}
e = expr_parse (lexer, ds, EXPR_NUMBER);
if (!e)
-
return CMD_CASCADING_FAILURE
;
+
goto error
;
}
else if (lex_match_id (lexer, "FILE"))
{
lex_match (lexer, T_EQUALS);
fh_unref (fh);
}
else if (lex_match_id (lexer, "FILE"))
{
lex_match (lexer, T_EQUALS);
fh_unref (fh);
- fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE);
+ fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE
, NULL
);
if (fh == NULL)
if (fh == NULL)
- {
- expr_free (e);
- return CMD_CASCADING_FAILURE;
- }
+ goto error;
+ }
+ else if (lex_match_id (lexer, "ENCODING"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (!lex_force_string (lexer))
+ goto error;
+
+ free (encoding);
+ encoding = ss_xstrdup (lex_tokss (lexer));
+
+ lex_get (lexer);
}
else
{
lex_error (lexer, NULL);
}
else
{
lex_error (lexer, NULL);
- expr_free (e);
- return CMD_CASCADING_FAILURE;
+ goto error;
}
}
t = xmalloc (sizeof *t);
}
}
t = xmalloc (sizeof *t);
- t->reader = dfm_open_reader (fh, lexer);
+ t->reader = dfm_open_reader (fh, lexer
, encoding
);
t->column = e;
add_transformation (ds, reread_trns_proc, reread_trns_free, t);
fh_unref (fh);
t->column = e;
add_transformation (ds, reread_trns_proc, reread_trns_free, t);
fh_unref (fh);
+ free (encoding);
return CMD_SUCCESS;
return CMD_SUCCESS;
+
+error:
+ expr_free (e);
+ free (encoding);
+ return CMD_CASCADING_FAILURE;
}
/* Executes a REREAD transformation. */
}
/* Executes a REREAD transformation. */
@@
-348,13
+363,13
@@
reread_trns_free (void *t_)
/* Parses END FILE command. */
int
/* Parses END FILE command. */
int
-cmd_end_file (struct lexer *lexer, struct dataset *ds)
+cmd_end_file (struct lexer *lexer
UNUSED
, struct dataset *ds)
{
assert (in_input_program ());
add_transformation (ds, end_file_trns_proc, NULL, NULL);
{
assert (in_input_program ());
add_transformation (ds, end_file_trns_proc, NULL, NULL);
- return
lex_end_of_command (lexer)
;
+ return
CMD_SUCCESS
;
}
/* Executes an END FILE transformation. */
}
/* Executes an END FILE transformation. */