projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Encapsulated lexer and updated calling functions accordingly.
[pspp-builds.git]
/
src
/
ui
/
terminal
/
main.c
diff --git
a/src/ui/terminal/main.c
b/src/ui/terminal/main.c
index b52fd941098ad899717dab11b09b69a60ff0d5bf..0613476b549f88027e431170b18b1c640a2bedac 100644
(file)
--- a/
src/ui/terminal/main.c
+++ b/
src/ui/terminal/main.c
@@
-72,7
+72,7
@@
void bug_handler(int sig);
void interrupt_handler(int sig);
static struct dataset * the_dataset = NULL;
void interrupt_handler(int sig);
static struct dataset * the_dataset = NULL;
-
+static struct lexer *the_lexer;
/* Program entry point. */
int
/* Program entry point. */
int
@@
-102,11
+102,11
@@
main (int argc, char **argv)
{
msg_ui_init ();
outp_read_devices ();
{
msg_ui_init ();
outp_read_devices ();
-
lex_init
(do_read_line);
+
the_lexer = lex_create
(do_read_line);
for (;;)
{
for (;;)
{
- int result = cmd_parse (the_dataset,
+ int result = cmd_parse (the_
lexer, the_
dataset,
proc_has_source (the_dataset)
? CMD_STATE_DATA : CMD_STATE_INITIAL);
if (result == CMD_EOF || result == CMD_FINISH)
proc_has_source (the_dataset)
? CMD_STATE_DATA : CMD_STATE_INITIAL);
if (result == CMD_EOF || result == CMD_FINISH)
@@
-188,7
+188,7
@@
terminate (bool success)
random_done ();
settings_done ();
fh_done ();
random_done ();
settings_done ();
fh_done ();
- lex_d
one (
);
+ lex_d
estroy (the_lexer
);
getl_uninitialize ();
readln_uninitialize ();
getl_uninitialize ();
readln_uninitialize ();