Applying patch #5562

[pspp-builds.git] / src / ui / terminal / main.c

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 6998f773d9fb12ddbf7f7250e581a515746a46bf..5b4ad2d3ac54d6002dbb81c51678375298406d36 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -22,13 +22,16 @@
 #include <signal.h>
 #include <stdio.h>
 
+#include <ui/debugger.h>
 #include "command-line.h"
 #include "msg-ui.h"
 #include "progname.h"
 #include "read-line.h"
 
+
 #include <data/dictionary.h>
 #include <data/file-handle-def.h>
+#include <libpspp/getl.h>
 #include <data/file-name.h>
 #include <data/format.h>
 #include <data/procedure.h>
@@ -37,7 +40,7 @@
 #include <gsl/gsl_errno.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <language/line-buffer.h>
+#include <language/prompt.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
 #include <libpspp/version.h>
@@ -72,7 +75,7 @@ void bug_handler(int sig);
 void interrupt_handler(int sig);
 static struct dataset * the_dataset = NULL;
 
-
+static struct lexer *the_lexer;
 
 /* Program entry point. */
 int
@@ -90,10 +93,10 @@ main (int argc, char **argv)
 
   fmt_init ();
   outp_init ();
-  msg_ui_init ();
   fn_init ();
   fh_init ();
   getl_initialize ();
+  prompt_init ();
   readln_initialize ();
   settings_init ();
   random_init ();
@@ -101,14 +104,15 @@ main (int argc, char **argv)
 
   if (parse_command_line (argc, argv)) 
     {
+      msg_ui_init ();
       outp_read_devices ();
-      lex_init (do_read_line);
+      the_lexer = lex_create (do_read_line);
 
       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);
+                                 ? CMD_STATE_DATA : CMD_STATE_INITIAL);
           if (result == CMD_EOF || result == CMD_FINISH)
             break;
           if (result == CMD_CASCADING_FAILURE && !getl_is_interactive ())
@@ -153,6 +157,9 @@ fpu_init (void)
 void 
 bug_handler(int sig)
 {
+#if DEBUGGING
+  connect_debugger ();
+#endif
   switch (sig) 
     {
     case SIGABRT:
@@ -188,12 +195,14 @@ terminate (bool success)
       random_done ();
       settings_done ();
       fh_done ();
-      lex_done ();
+      lex_destroy (the_lexer);
       getl_uninitialize ();
+      prompt_done ();
       readln_uninitialize ();
 
       outp_done ();
       msg_ui_done ();
+      fmt_done ();
     }
   exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
 }