projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed memory leak.
[pspp-builds.git]
/
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 51c369810f9d2872810a00341a0623321f4f04c8..24a2e22968f1eccc0a3a23f9f0275f898470c228 100644
(file)
--- a/
src/language/data-io/inpt-pgm.c
+++ b/
src/language/data-io/inpt-pgm.c
@@
-37,6
+37,7
@@
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
#include <libpspp/alloc.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
#include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
@@
-96,21
+97,21
@@
in_input_program (void)
/* Emits an END CASE transformation for INP. */
static void
/* Emits an END CASE transformation for INP. */
static void
-emit_END_CASE (struct input_program_pgm *inp)
+emit_END_CASE (struct
dataset *ds, struct
input_program_pgm *inp)
{
{
- add_transformation (end_case_trns_proc, NULL, inp);
+ add_transformation (
ds,
end_case_trns_proc, NULL, inp);
}
int
}
int
-cmd_input_program (
void
)
+cmd_input_program (
struct lexer *lexer, struct dataset *ds
)
{
struct input_program_pgm *inp;
size_t i;
bool saw_END_CASE = false;
{
struct input_program_pgm *inp;
size_t i;
bool saw_END_CASE = false;
- discard_variables ();
- if (
token
!= '.')
- return lex_end_of_command ();
+ discard_variables (
ds
);
+ if (
lex_token (lexer)
!= '.')
+ return lex_end_of_command (
lexer
);
inp = xmalloc (sizeof *inp);
inp->trns_chain = NULL;
inp = xmalloc (sizeof *inp);
inp->trns_chain = NULL;
@@
-119,14
+120,12
@@
cmd_input_program (void)
inside_input_program = true;
for (;;)
{
inside_input_program = true;
for (;;)
{
- enum cmd_result result;
- lex_get ();
- result = cmd_parse (CMD_STATE_INPUT_PROGRAM);
+ enum cmd_result result = cmd_parse (lexer, ds, CMD_STATE_INPUT_PROGRAM);
if (result == CMD_END_INPUT_PROGRAM)
break;
else if (result == CMD_END_CASE)
{
if (result == CMD_END_INPUT_PROGRAM)
break;
else if (result == CMD_END_CASE)
{
- emit_END_CASE (inp);
+ emit_END_CASE (
ds,
inp);
saw_END_CASE = true;
}
else if (cmd_result_is_failure (result) && result != CMD_FAILURE)
saw_END_CASE = true;
}
else if (cmd_result_is_failure (result) && result != CMD_FAILURE)
@@
-134,54
+133,56
@@
cmd_input_program (void)
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;
- discard_variables ();
+ discard_variables (
ds
);
destroy_input_program (inp);
return result;
}
}
if (!saw_END_CASE)
destroy_input_program (inp);
return result;
}
}
if (!saw_END_CASE)
- emit_END_CASE (inp);
+ emit_END_CASE (
ds,
inp);
inside_input_program = false;
inside_input_program = false;
- if (dict_get_next_value_idx (d
efault_dict
) == 0)
+ if (dict_get_next_value_idx (d
ataset_dict (ds)
) == 0)
{
msg (SE, _("Input program did not create any variables."));
{
msg (SE, _("Input program did not create any variables."));
- discard_variables ();
+ discard_variables (
ds
);
destroy_input_program (inp);
return CMD_FAILURE;
}
destroy_input_program (inp);
return CMD_FAILURE;
}
- inp->trns_chain = proc_capture_transformations ();
+ inp->trns_chain = proc_capture_transformations (
ds
);
trns_chain_finalize (inp->trns_chain);
/* Figure out how to initialize each input case. */
trns_chain_finalize (inp->trns_chain);
/* Figure out how to initialize each input case. */
- inp->init_cnt = dict_get_next_value_idx (d
efault_dict
);
+ inp->init_cnt = dict_get_next_value_idx (d
ataset_dict (ds)
);
inp->init = xnmalloc (inp->init_cnt, sizeof *inp->init);
for (i = 0; i < inp->init_cnt; i++)
inp->init[i] = -1;
inp->init = xnmalloc (inp->init_cnt, sizeof *inp->init);
for (i = 0; i < inp->init_cnt; i++)
inp->init[i] = -1;
- for (i = 0; i < dict_get_var_cnt (d
efault_dict
); i++)
+ for (i = 0; i < dict_get_var_cnt (d
ataset_dict (ds)
); i++)
{
{
- struct variable *var = dict_get_var (default_dict, i);
+ struct variable *var = dict_get_var (dataset_dict (ds), i);
+ size_t value_cnt = var_get_value_cnt (var);
enum value_init_type value_init;
size_t j;
enum value_init_type value_init;
size_t j;
- value_init = var
->type == NUMERIC
? INP_NUMERIC : INP_STRING;
- value_init |= var
->leave
? INP_INIT_ONCE : INP_REINIT;
+ value_init = var
_is_numeric (var)
? INP_NUMERIC : INP_STRING;
+ value_init |= var
_get_leave (var)
? INP_INIT_ONCE : INP_REINIT;
- for (j = 0; j < va
r->nv
; j++)
+ for (j = 0; j < va
lue_cnt
; j++)
inp->init[j + var->fv] = value_init;
}
for (i = 0; i < inp->init_cnt; i++)
assert (inp->init[i] != -1);
inp->init[j + var->fv] = value_init;
}
for (i = 0; i < inp->init_cnt; i++)
assert (inp->init[i] != -1);
- inp->case_size = dict_get_case_size (d
efault_dict
);
+ inp->case_size = dict_get_case_size (d
ataset_dict (ds)
);
- proc_set_source (create_case_source (&input_program_source_class, inp));
+ proc_set_source (ds,
+ create_case_source (&input_program_source_class, inp));
return CMD_SUCCESS;
}
int
return CMD_SUCCESS;
}
int
-cmd_end_input_program (
void
)
+cmd_end_input_program (
struct lexer *lexer UNUSED, struct dataset *ds UNUSED
)
{
assert (in_input_program ());
return CMD_END_INPUT_PROGRAM;
{
assert (in_input_program ());
return CMD_END_INPUT_PROGRAM;
@@
-207,7
+208,7
@@
init_case (const struct input_program_pgm *inp, struct ccase *c)
memset (case_data_rw (c, i)->s, ' ', sizeof case_data_rw (c, i)->s);
break;
default:
memset (case_data_rw (c, i)->s, ' ', sizeof case_data_rw (c, i)->s);
break;
default:
-
assert (0
);
+
NOT_REACHED (
);
}
}
}
}
@@
-231,7
+232,7
@@
clear_case (const struct input_program_pgm *inp, struct ccase *c)
memset (case_data_rw (c, i)->s, ' ', sizeof case_data_rw (c, i)->s);
break;
default:
memset (case_data_rw (c, i)->s, ' ', sizeof case_data_rw (c, i)->s);
break;
default:
-
assert (0
);
+
NOT_REACHED (
);
}
}
}
}
@@
-288,17
+289,17
@@
static const struct case_source_class input_program_source_class =
};
\f
int
};
\f
int
-cmd_end_case (
void
)
+cmd_end_case (
struct lexer *lexer, struct dataset *ds UNUSED
)
{
assert (in_input_program ());
{
assert (in_input_program ());
- if (
token
== '.')
+ if (
lex_token (lexer)
== '.')
return CMD_END_CASE;
return CMD_END_CASE;
- return lex_end_of_command ();
+ return lex_end_of_command (
lexer
);
}
/* Sends the current case as the source's output. */
int
}
/* Sends the current case as the source's output. */
int
-end_case_trns_proc (void *inp_, struct ccase *c,
int
case_nr UNUSED)
+end_case_trns_proc (void *inp_, struct ccase *c,
casenumber
case_nr UNUSED)
{
struct input_program_pgm *inp = inp_;
{
struct input_program_pgm *inp = inp_;
@@
-319,7
+320,7
@@
struct reread_trns
/* Parses REREAD command. */
int
/* Parses REREAD command. */
int
-cmd_reread (
void
)
+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 file_handle *fh; /* File to be re-read. */
struct expression *e; /* Expression for column to set. */
@@
-327,11
+328,11
@@
cmd_reread (void)
fh = fh_get_default_handle ();
e = NULL;
fh = fh_get_default_handle ();
e = NULL;
- while (
token
!= '.')
+ while (
lex_token (lexer)
!= '.')
{
{
- if (lex_match_id ("COLUMN"))
+ if (lex_match_id (
lexer,
"COLUMN"))
{
{
- lex_match ('=');
+ lex_match (
lexer,
'=');
if (e)
{
if (e)
{
@@
-340,39
+341,39
@@
cmd_reread (void)
return CMD_CASCADING_FAILURE;
}
return CMD_CASCADING_FAILURE;
}
- e = expr_parse (
default_dict
, EXPR_NUMBER);
+ e = expr_parse (
lexer, ds
, EXPR_NUMBER);
if (!e)
return CMD_CASCADING_FAILURE;
}
if (!e)
return CMD_CASCADING_FAILURE;
}
- else if (lex_match_id ("FILE"))
+ else if (lex_match_id (
lexer,
"FILE"))
{
{
- lex_match ('=');
- fh = fh_parse (FH_REF_FILE | FH_REF_INLINE);
+ lex_match (
lexer,
'=');
+ fh = fh_parse (
lexer,
FH_REF_FILE | FH_REF_INLINE);
if (fh == NULL)
{
expr_free (e);
return CMD_CASCADING_FAILURE;
}
if (fh == NULL)
{
expr_free (e);
return CMD_CASCADING_FAILURE;
}
- lex_get ();
}
else
{
}
else
{
- lex_error (NULL);
+ lex_error (
lexer,
NULL);
expr_free (e);
expr_free (e);
+ return CMD_CASCADING_FAILURE;
}
}
t = xmalloc (sizeof *t);
}
}
t = xmalloc (sizeof *t);
- t->reader = dfm_open_reader (fh);
+ t->reader = dfm_open_reader (fh
, lexer
);
t->column = e;
t->column = e;
- add_transformation (reread_trns_proc, reread_trns_free, t);
+ add_transformation (
ds,
reread_trns_proc, reread_trns_free, t);
return CMD_SUCCESS;
}
/* Executes a REREAD transformation. */
static int
return CMD_SUCCESS;
}
/* Executes a REREAD transformation. */
static int
-reread_trns_proc (void *t_, struct ccase *c,
int
case_num)
+reread_trns_proc (void *t_, struct ccase *c,
casenumber
case_num)
{
struct reread_trns *t = t_;
{
struct reread_trns *t = t_;
@@
-406,19
+407,19
@@
reread_trns_free (void *t_)
/* Parses END FILE command. */
int
/* Parses END FILE command. */
int
-cmd_end_file (
void
)
+cmd_end_file (
struct lexer *lexer, struct dataset *ds
)
{
assert (in_input_program ());
{
assert (in_input_program ());
- add_transformation (end_file_trns_proc, NULL, NULL);
+ add_transformation (
ds,
end_file_trns_proc, NULL, NULL);
- return lex_end_of_command ();
+ return lex_end_of_command (
lexer
);
}
/* Executes an END FILE transformation. */
static int
end_file_trns_proc (void *trns_ UNUSED, struct ccase *c UNUSED,
}
/* Executes an END FILE transformation. */
static int
end_file_trns_proc (void *trns_ UNUSED, struct ccase *c UNUSED,
-
int
case_num UNUSED)
+
casenumber
case_num UNUSED)
{
return TRNS_END_FILE;
}
{
return TRNS_END_FILE;
}