X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=60f9313840c625daca70cea1ed66d603c1bbe57b;hb=37c21ba9301956091823dea7d84ff0400330bd4b;hp=be1d035f21d8097570e5589e777555749d651ff9;hpb=29917c4f5908454803e663d2ad78bca4bc35e805;p=pspp

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index be1d035f21..60f9313840 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -62,10 +62,10 @@
 static struct session *the_session;
 
 static void add_syntax_reader (struct lexer *, const char *file_name,
-                               const char *encoding, enum lex_syntax_mode);
+                               const char *encoding, enum segmenter_mode);
 static void bug_handler(int sig);
 static void fpu_init (void);
-static void output_msg (const struct msg *, void *);
+static void output_msg (const struct msg *, struct lexer *);
 
 /* Program entry point. */
 int
@@ -73,7 +73,7 @@ main (int argc, char **argv)
 {
   struct terminal_opts *terminal_opts;
   struct argv_parser *parser;
-  enum lex_syntax_mode syntax_mode;
+  enum segmenter_mode syntax_mode;
   char *syntax_encoding;
   bool process_statrc;
   struct lexer *lexer;
@@ -109,7 +109,7 @@ main (int argc, char **argv)
   terminal_opts_done (terminal_opts, argc, argv);
   argv_parser_destroy (parser);
 
-  msg_set_handler (output_msg, lexer);
+  lex_set_message_handler (lexer, output_msg);
   session_set_default_syntax_encoding (the_session, syntax_encoding);
 
   /* Add syntax files to source stream. */
@@ -118,7 +118,7 @@ main (int argc, char **argv)
       char *rc = include_path_search ("rc");
       if (rc != NULL)
         {
-          add_syntax_reader (lexer, rc, "Auto", LEX_SYNTAX_AUTO);
+          add_syntax_reader (lexer, rc, "Auto", SEG_MODE_AUTO);
           free (rc);
         }
     }
@@ -142,17 +142,25 @@ main (int argc, char **argv)
 	break;
       else if (cmd_result_is_failure (result) && lex_token (lexer) != T_STOP)
         {
-          if (lex_get_error_mode (lexer) == LEX_ERROR_STOP)
+          switch (lex_get_error_mode (lexer))
             {
+            case LEX_ERROR_STOP:
               msg (MW, _("Error encountered while ERROR=STOP is effective."));
               lex_discard_noninteractive (lexer);
-            }
-          else if (result == CMD_CASCADING_FAILURE
-                   && lex_get_error_mode (lexer) != LEX_ERROR_TERMINAL)
-            {
-              msg (SE, _("Stopping syntax file processing here to avoid "
-                         "a cascade of dependent command failures."));
-              lex_discard_noninteractive (lexer);
+              break;
+
+            case LEX_ERROR_CONTINUE:
+              if (result == CMD_CASCADING_FAILURE)
+                {
+                  msg (SE, _("Stopping syntax file processing here to avoid "
+                             "a cascade of dependent command failures."));
+                  lex_discard_noninteractive (lexer);
+                }
+              break;
+
+            case LEX_ERROR_TERMINAL:
+            case LEX_ERROR_IGNORE:
+              break;
             }
         }
 
@@ -215,28 +223,35 @@ bug_handler(int sig)
 }
 
 static void
-output_msg (const struct msg *m_, void *lexer_)
+output_msg (const struct msg *m_, struct lexer *lexer)
 {
-  struct lexer *lexer = lexer_;
-  struct msg m = *m_;
-
-  if (m.file_name == NULL)
+  struct msg_location *location = m_->location;
+  if (!location && lexer)
     {
-      m.file_name = CONST_CAST (char *, lex_get_file_name (lexer));
-      m.first_line = lex_get_first_line_number (lexer, 0);
-      m.last_line = lex_get_last_line_number (lexer, 0);
+      location = lex_get_location (lexer, 0, 0);
+      msg_location_remove_columns (location);
     }
 
-  m.command_name = output_get_uppercase_command_name ();
+  struct msg m = {
+    .category = m_->category,
+    .severity = m_->severity,
+    .stack = m_->stack,
+    .n_stack = m_->n_stack,
+    .location = location,
+    .command_name = output_get_uppercase_command_name (),
+    .text = m_->text,
+  };
 
   output_item_submit (message_item_create (&m));
 
   free (m.command_name);
+  if (m.location != m_->location)
+    msg_location_destroy (m.location);
 }
 
 static void
 add_syntax_reader (struct lexer *lexer, const char *file_name,
-                   const char *encoding, enum lex_syntax_mode syntax_mode)
+                   const char *encoding, enum segmenter_mode syntax_mode)
 {
   struct lex_reader *reader;