#include "libpspp/version.h"
#include "math/random.h"
#include "output/driver.h"
-#include "output/message-item.h"
+#include "output/output-item.h"
#include "ui/source-init-opts.h"
#include "ui/terminal/terminal-opts.h"
#include "ui/terminal/terminal-reader.h"
-#include "ui/terminal/terminal.h"
#include "gl/fatal-signal.h"
#include "gl/progname.h"
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 *);
{
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;
set_program_name (argv[0]);
+ prepare_fatal_error_message ();
+ prepare_diagnostic_information ();
+
signal (SIGABRT, bug_handler);
signal (SIGSEGV, bug_handler);
signal (SIGFPE, bug_handler);
output_engine_push ();
fh_init ();
settings_init ();
- terminal_check_size ();
random_init ();
lexer = lex_create ();
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);
}
}
output_msg (const struct msg *m_, void *lexer_)
{
struct lexer *lexer = lexer_;
- struct msg m = *m_;
-
- if (m.file_name == NULL)
- {
- 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);
- }
-
- m.command_name = CONST_CAST (char *, output_get_command_name ());
-
- message_item_submit (message_item_create (&m));
+ struct msg m = {
+ .category = m_->category,
+ .severity = m_->severity,
+ .stack = m_->stack,
+ .n_stack = m_->n_stack,
+ .location = (m_->location ? m_->location
+ : lexer ? lex_get_lines (lexer, 0, 0)
+ : NULL),
+ .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;