X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Finclude.c;h=ecb33b27670826fd8fa7ae25f1bf435b09ed0f13;hb=047d4a8e14cdbb50258bf8c5634db24a88767f24;hp=2f1fdeb2c1781c2c66fbc6254f5b8faf4471668a;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index 2f1fdeb2c1..ecb33b2767 100644
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -1,69 +1,193 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2007, 2010, 2011 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
+
#include
+#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
+#include
+
+#include "data/dataset.h"
+#include "data/session.h"
+#include "language/command.h"
+#include "language/lexer/include-path.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "gl/dirname.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-int
-cmd_include (struct lexer *lexer, struct dataset *ds UNUSED)
+enum variant
+ {
+ INSERT,
+ INCLUDE
+ };
+
+static int
+do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant)
{
- struct source_stream *ss;
- char *found_fn;
- char *target_fn;
+ enum lex_syntax_mode syntax_mode;
+ enum lex_error_mode error_mode;
+ char *relative_name;
+ char *filename;
+ char *encoding;
+ int status;
+ bool cd;
/* Skip optional FILE=. */
if (lex_match_id (lexer, "FILE"))
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
+
+ if (!lex_force_string_or_id (lexer))
+ return CMD_FAILURE;
+
+ relative_name = utf8_to_filename (lex_tokcstr (lexer));
+ if (NULL == relative_name)
+ return CMD_FAILURE;
- /* File name can be identifier or string. */
- if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING)
+ filename = include_path_search (relative_name);
+ free (relative_name);
+
+ if ( ! filename)
{
- lex_error (lexer, _("expecting file name"));
- return CMD_CASCADING_FAILURE;
+ msg (SE, _("Can't find `%s' in include file search path."),
+ lex_tokcstr (lexer));
+ return CMD_FAILURE;
}
+ lex_get (lexer);
+
+ syntax_mode = LEX_SYNTAX_INTERACTIVE;
+ error_mode = LEX_ERROR_CONTINUE;
+ cd = false;
+ status = CMD_FAILURE;
+ encoding = xstrdup (session_get_default_syntax_encoding (
+ dataset_session (ds)));
+ while ( T_ENDCMD != lex_token (lexer))
+ {
+ if (lex_match_id (lexer, "ENCODING"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (!lex_force_string (lexer))
+ goto exit;
- target_fn = ds_cstr (lex_tokstr (lexer));
+ free (encoding);
+ encoding = xstrdup (lex_tokcstr (lexer));
+ lex_get (lexer);
+ }
+ else if (variant == INSERT && lex_match_id (lexer, "SYNTAX"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if ( lex_match_id (lexer, "INTERACTIVE") )
+ syntax_mode = LEX_SYNTAX_INTERACTIVE;
+ else if ( lex_match_id (lexer, "BATCH"))
+ syntax_mode = LEX_SYNTAX_BATCH;
+ else if ( lex_match_id (lexer, "AUTO"))
+ syntax_mode = LEX_SYNTAX_AUTO;
+ else
+ {
+ lex_error_expecting (lexer, "BATCH", "INTERACTIVE", "AUTO",
+ NULL_SENTINEL);
+ goto exit;
+ }
+ }
+ else if (variant == INSERT && lex_match_id (lexer, "CD"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if ( lex_match_id (lexer, "YES") )
+ {
+ cd = true;
+ }
+ else if ( lex_match_id (lexer, "NO"))
+ {
+ cd = false;
+ }
+ else
+ {
+ lex_error_expecting (lexer, "YES", "NO", NULL_SENTINEL);
+ goto exit;
+ }
+ }
+ else if (variant == INSERT && lex_match_id (lexer, "ERROR"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if ( lex_match_id (lexer, "CONTINUE") )
+ {
+ error_mode = LEX_ERROR_CONTINUE;
+ }
+ else if ( lex_match_id (lexer, "STOP"))
+ {
+ error_mode = LEX_ERROR_STOP;
+ }
+ else
+ {
+ lex_error_expecting (lexer, "CONTINUE", "STOP", NULL_SENTINEL);
+ goto exit;
+ }
+ }
- ss = lex_get_source_stream (lexer);
- found_fn = fn_search_path (target_fn, getl_include_path ( ss ));
+ else
+ {
+ lex_error (lexer, NULL);
+ goto exit;
+ }
+ }
+ status = lex_end_of_command (lexer);
- if (found_fn != NULL)
+ if ( status == CMD_SUCCESS)
{
- getl_include_source (ss, create_syntax_file_source (found_fn));
- free (found_fn);
+ struct lex_reader *reader;
+
+ reader = lex_reader_for_file (filename, encoding,
+ syntax_mode, error_mode);
+ if (reader != NULL)
+ {
+ lex_discard_rest_of_command (lexer);
+ lex_include (lexer, reader);
+
+ if ( cd )
+ {
+ char *directory = dir_name (filename);
+ chdir (directory);
+ free (directory);
+ }
+ }
}
- else
- msg (SE, _("Can't find `%s' in include file search path."),
- target_fn);
- lex_get (lexer);
- return lex_end_of_command (lexer);
+exit:
+ free (encoding);
+ free (filename);
+ return status;
+}
+
+int
+cmd_include (struct lexer *lexer, struct dataset *ds)
+{
+ return do_insert (lexer, ds, INCLUDE);
}
+
+int
+cmd_insert (struct lexer *lexer, struct dataset *ds)
+{
+ return do_insert (lexer, ds, INSERT);
+}
+