/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-2000, 2006-2007, 2009-2013 Free Software Foundation, Inc.
+ Copyright (C) 1997-2000, 2006-2007, 2009-2014 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/file-handle-def.h"
-#include "data/file-name.h"
#include "data/session.h"
#include "data/settings.h"
#include "data/variable.h"
#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);
fpu_init ();
gsl_set_error_handler_off ();
+ 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_engine_pop ();
session_destroy (the_session);
random_done ();
settings_done ();
fh_done ();
lex_destroy (lexer);
- output_close ();
i18n_done ();
return msg_ui_any_errors ();
m.last_line = lex_get_last_line_number (lexer, 0);
}
- message_item_submit (message_item_create (&m));
+ m.command_name = output_get_uppercase_command_name ();
+
+ output_item_submit (message_item_create (&m));
+
+ free (m.command_name);
}
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;