X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Finclude.c;h=81a064d19bc087d19214b1a9a7881faa2e324a7a;hb=2be9bee9da6a2ce27715e58128569594319abfa2;hp=aab817cb5b07e5d2cb1cd79da2a069e1b9704331;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c index aab817cb..81a064d1 100644 --- a/src/language/utilities/include.c +++ b/src/language/utilities/include.c @@ -1,50 +1,194 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* 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 "alloc.h" -#include "command.h" -#include "message.h" -#include "line-buffer.h" -#include "lexer.h" -#include "str.h" +#include +#include + +#include "data/dataset.h" +#include "data/file-name.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 (void) +enum variant + { + INSERT, + INCLUDE + }; + +static int +do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant) { + 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 ("FILE")) - lex_match ('='); + if (lex_match_id (lexer, "FILE")) + lex_match (lexer, T_EQUALS); - /* Filename can be identifier or string. */ - if (token != T_ID && token != T_STRING) + /* File name can be identifier or string. */ + if (lex_token (lexer) != T_ID && !lex_is_string (lexer)) { - lex_error (_("expecting filename")); - return CMD_CASCADING_FAILURE; + lex_error (lexer, _("expecting file name")); + return CMD_FAILURE; + } + + relative_name = utf8_to_filename (lex_tokcstr (lexer)); + filename = include_path_search (relative_name); + free (relative_name); + + if ( ! filename) + { + 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 (dataset_get_default_syntax_encoding (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; + + free (encoding); + encoding = xstrdup (lex_tokcstr (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 (lexer, _("expecting %s, %s, or %s after %s"), + "BATCH", "INTERACTIVE", "AUTO", "SYNTAX"); + 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 (lexer, _("expecting %s or %s after %s"), + "YES", "NO", "CD"); + 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 (lexer, _("expecting %s or %s after %s"), + "CONTINUE", "STOP", "ERROR"); + goto exit; + } + } + + else + { + lex_error (lexer, NULL); + goto exit; + } } - getl_include_syntax_file (ds_c_str (&tokstr)); + status = lex_end_of_command (lexer); - lex_get (); - return lex_end_of_command (); + if ( status == CMD_SUCCESS) + { + 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); + } + } + } + +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); +} +