X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Finclude.c;h=52d0e09c91dec5b559e8c86104917f08cad2b5dd;hb=774441e68b4d2e3a4b5c6975e9614dcd4369955e;hp=9f666747db6b99fe129ac24e7680beab3693eab1;hpb=65e61cc92b48297625bc71cf31b8a19e301eb6c1;p=pspp diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c index 9f666747db..52d0e09c91 100644 --- a/src/language/utilities/include.c +++ b/src/language/utilities/include.c @@ -1,70 +1,210 @@ -/* 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 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 +#include #include -#include +#include "dirname.h" +#include "xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) +static int parse_insert (struct lexer *lexer, char **filename); + + int cmd_include (struct lexer *lexer, struct dataset *ds UNUSED) { - struct source_stream *ss; - char *found_fn; + char *filename = NULL; + int status = parse_insert (lexer, &filename); + + if ( CMD_SUCCESS != status) + return status; + + lex_get (lexer); + + status = lex_end_of_command (lexer); + + if ( status == CMD_SUCCESS) + { + struct source_stream *ss = lex_get_source_stream (lexer); + + assert (filename); + getl_include_source (ss, create_syntax_file_source (filename), + GETL_BATCH, ERRMODE_STOP); + free (filename); + } + + return status; +} + + +int +cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED) +{ + enum syntax_mode syntax_mode = GETL_INTERACTIVE; + enum error_mode error_mode = ERRMODE_CONTINUE; + char *filename = NULL; + int status = parse_insert (lexer, &filename); + bool cd = false; + + if ( CMD_SUCCESS != status) + return status; + + lex_get (lexer); + + while ( '.' != lex_token (lexer)) + { + if (lex_match_id (lexer, "SYNTAX")) + { + lex_match (lexer, '='); + if ( lex_match_id (lexer, "INTERACTIVE") ) + syntax_mode = GETL_INTERACTIVE; + else if ( lex_match_id (lexer, "BATCH")) + syntax_mode = GETL_BATCH; + else + { + lex_error (lexer, _("expecting %s or %s after %s"), + "BATCH", "INTERACTIVE", "SYNTAX"); + return CMD_FAILURE; + } + } + else if (lex_match_id (lexer, "CD")) + { + lex_match (lexer, '='); + 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"); + return CMD_FAILURE; + } + } + else if (lex_match_id (lexer, "ERROR")) + { + lex_match (lexer, '='); + if ( lex_match_id (lexer, "CONTINUE") ) + { + error_mode = ERRMODE_CONTINUE; + } + else if ( lex_match_id (lexer, "STOP")) + { + error_mode = ERRMODE_STOP; + } + else + { + lex_error (lexer, _("expecting %s or %s after %s"), + "CONTINUE", "STOP", "ERROR"); + return CMD_FAILURE; + } + } + + else + { + lex_error (lexer, _("Unexpected token: `%s'."), + lex_token_representation (lexer)); + + return CMD_FAILURE; + } + } + + status = lex_end_of_command (lexer); + + if ( status == CMD_SUCCESS) + { + struct source_stream *ss = lex_get_source_stream (lexer); + + assert (filename); + getl_include_source (ss, create_syntax_file_source (filename), + syntax_mode, + error_mode); + + if ( cd ) + { + char *directory = dir_name (filename); + chdir (directory); + free (directory); + } + + free (filename); + } + + return status; +} + + +static int +parse_insert (struct lexer *lexer, char **filename) +{ char *target_fn; + char *relative_filename; /* Skip optional FILE=. */ if (lex_match_id (lexer, "FILE")) lex_match (lexer, '='); /* File name can be identifier or string. */ - if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING) + if (lex_token (lexer) != T_ID && !lex_is_string (lexer)) { - lex_error (lexer, _("expecting file name")); - return CMD_CASCADING_FAILURE; + lex_error (lexer, _("expecting file name")); + return CMD_FAILURE; } target_fn = ds_cstr (lex_tokstr (lexer)); - ss = lex_get_source_stream (lexer); - found_fn = fn_search_path (target_fn, getl_include_path ( ss ), NULL); + relative_filename = + fn_search_path (target_fn, + getl_include_path (lex_get_source_stream (lexer))); - if (found_fn != NULL) + if ( ! relative_filename) { - getl_include_source (ss, create_syntax_file_source (found_fn)); - free (found_fn); - } - else - msg (SE, _("Can't find `%s' in include file search path."), + msg (SE, _("Can't find `%s' in include file search path."), target_fn); + return CMD_FAILURE; + } - lex_get (lexer); - return lex_end_of_command (lexer); + *filename = relative_filename; + if (*filename == NULL) + { + msg (SE, _("Unable to open `%s': %s."), + relative_filename, strerror (errno)); + free (relative_filename); + return CMD_FAILURE; + } + + return CMD_SUCCESS; }