/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2010 Free Software Foundation
+ Copyright (C) 2008, 2010, 2014 Free Software Foundation
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 <stdlib.h>
#include <string.h>
-#include "data/file-name.h"
-#include "data/por-file-reader.h"
#include "data/settings.h"
-#include "data/sys-file-reader.h"
-#include "language/syntax-file.h"
-#include "language/syntax-string-source.h"
+#include "language/lexer/include-path.h"
+#include "language/lexer/lexer.h"
#include "libpspp/assertion.h"
#include "libpspp/argv-parser.h"
-#include "libpspp/getl.h"
#include "libpspp/llx.h"
#include "libpspp/message.h"
#include "ui/syntax-gen.h"
};
static void
-source_init_option_callback (int id, void *ss_)
+source_init_option_callback (int id, void *aux UNUSED)
{
- struct source_stream *ss = ss_;
-
switch (id)
{
case OPT_ALGORITHM:
settings_set_algorithm (ENHANCED);
else
error (1, 0,
- _("Algorithm must be either \"compatible\" or \"enhanced\"."));
+ _("Algorithm must be either `%s' or `%s'."), "compatible", "enhanced");
break;
case OPT_INCLUDE:
if (!strcmp (optarg, "-"))
- getl_clear_include_path (ss);
+ include_path_clear ();
else
- getl_add_include_dir (ss, optarg);
+ include_path_add (optarg);
break;
case OPT_NO_INCLUDE:
- getl_clear_include_path (ss);
+ include_path_clear ();
break;
case OPT_SAFER:
break;
case OPT_SYNTAX:
- if (!strcmp (optarg, "compatible") )
+ if (!strcmp (optarg, "compatible"))
settings_set_syntax (COMPATIBLE);
else if (!strcmp (optarg, "enhanced"))
settings_set_syntax (ENHANCED);
else
error (1, 0,
- _("Syntax must be either \"compatible\" or \"enhanced\"."));
+ _("Syntax must be either `%s' or `%s'."), "compatible", "enhanced");
break;
default:
}
void
-source_init_register_argv_parser (struct argv_parser *ap,
- struct source_stream *ss)
+source_init_register_argv_parser (struct argv_parser *ap)
{
argv_parser_add_options (ap, source_init_options, N_SOURCE_INIT_OPTIONS,
- source_init_option_callback, ss);
+ source_init_option_callback, NULL);
}