X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Ftitle.c;h=9d5b8261619c0a39c3d318bf8134933c4008422c;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=d494e35e8e2cad2aa96cc1ebb736929c4ca421cf;hpb=77e551d23575da6b89f866612ab39c2b0497c9be;p=pspp-builds.git diff --git a/src/language/utilities/title.c b/src/language/utilities/title.c index d494e35e..9d5b8261 100644 --- a/src/language/utilities/title.c +++ b/src/language/utilities/title.c @@ -1,177 +1,159 @@ -/* 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 -#include -#include -#include -#include -#include -#include -#include -#include + +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "libpspp/start-date.h" +#include "libpspp/version.h" +#include "output/text-item.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) -static int get_title (const char *cmd, char **title); +static int parse_title (struct lexer *, enum text_item_type); +static void set_title (const char *title, enum text_item_type); int -cmd_title (void) +cmd_title (struct lexer *lexer, struct dataset *ds UNUSED) { - return get_title ("TITLE", &outp_title); + return parse_title (lexer, TEXT_ITEM_TITLE); } int -cmd_subtitle (void) +cmd_subtitle (struct lexer *lexer, struct dataset *ds UNUSED) { - return get_title ("SUBTITLE", &outp_subtitle); + return parse_title (lexer, TEXT_ITEM_SUBTITLE); } static int -get_title (const char *cmd, char **title) +parse_title (struct lexer *lexer, enum text_item_type type) { - int c; - - c = lex_look_ahead (); - if (c == '"' || c == '\'') + if (lex_look_ahead (lexer) == T_STRING) { - lex_get (); - if (!lex_force_string ()) + lex_get (lexer); + if (!lex_force_string (lexer)) return CMD_FAILURE; - if (*title) - free (*title); - *title = xstrdup (ds_c_str (&tokstr)); - lex_get (); - if (token != '.') - { - msg (SE, _("%s: `.' expected after string."), cmd); - return CMD_FAILURE; - } + set_title (lex_tokcstr (lexer), type); + lex_get (lexer); + return lex_end_of_command (lexer); } else { - char *cp; - - if (*title) - free (*title); - *title = xstrdup (lex_rest_of_line (NULL)); - lex_discard_line (); - for (cp = *title; *cp; cp++) - *cp = toupper ((unsigned char) (*cp)); - token = '.'; + set_title (lex_rest_of_line (lexer), type); + lex_discard_line (lexer); } return CMD_SUCCESS; } +static void +set_title (const char *title, enum text_item_type type) +{ + text_item_submit (text_item_create (type, title)); +} + /* Performs the FILE LABEL command. */ int -cmd_file_label (void) +cmd_file_label (struct lexer *lexer, struct dataset *ds) { const char *label; - label = lex_rest_of_line (NULL); - lex_discard_line (); + label = lex_rest_of_line (lexer); + lex_discard_line (lexer); while (isspace ((unsigned char) *label)) label++; - dict_set_label (default_dict, label); - token = '.'; + dict_set_label (dataset_dict (ds), label); return CMD_SUCCESS; } -/* Add LINE as a line of document information to default_dict, - indented by INDENT spaces. */ +/* Add entry date line to DICT's documents. */ static void -add_document_line (const char *line, int indent) +add_document_trailer (struct dictionary *dict) { - const char *old_documents; - size_t old_len; - char *new_documents; - - old_documents = dict_get_documents (default_dict); - old_len = old_documents != NULL ? strlen (old_documents) : 0; - new_documents = xmalloc (old_len + 81); - - memcpy (new_documents, old_documents, old_len); - memset (new_documents + old_len, ' ', indent); - buf_copy_str_rpad (new_documents + old_len + indent, 80 - indent, line); - new_documents[old_len + 80] = '\0'; + char buf[64]; - dict_set_documents (default_dict, new_documents); - - free (new_documents); + sprintf (buf, _(" (Entered %s)"), get_start_date ()); + dict_add_document_line (dict, buf); } /* Performs the DOCUMENT command. */ int -cmd_document (void) +cmd_document (struct lexer *lexer, struct dataset *ds) { - /* Add a few header lines for reference. */ - { - char buf[256]; - - if (dict_get_documents (default_dict) != NULL) - add_document_line ("", 0); - - sprintf (buf, _("Document entered %s by %s:"), get_start_date (), version); - add_document_line (buf, 1); - } + struct dictionary *dict = dataset_dict (ds); + struct string line = DS_EMPTY_INITIALIZER; + bool end_dot; - for (;;) + do { - int had_dot; - const char *orig_line; - char *copy_line; - - orig_line = lex_rest_of_line (&had_dot); - lex_discard_line (); - while (isspace ((unsigned char) *orig_line)) - orig_line++; - - copy_line = xmalloc (strlen (orig_line) + 2); - strcpy (copy_line, orig_line); - if (had_dot) - strcat (copy_line, "."); - - add_document_line (copy_line, 3); - free (copy_line); - - lex_get_line (); - if (had_dot) - break; + end_dot = lex_end_dot (lexer); + ds_assign_string (&line, lex_entire_line_ds (lexer)); + if (end_dot) + ds_put_byte (&line, '.'); + dict_add_document_line (dict, ds_cstr (&line)); + + lex_discard_line (lexer); + lex_get_line (lexer); } + while (!end_dot); + + add_document_trailer (dict); + ds_destroy (&line); - token = '.'; return CMD_SUCCESS; } /* Performs the DROP DOCUMENTS command. */ int -cmd_drop_documents (void) +cmd_drop_documents (struct lexer *lexer, struct dataset *ds) +{ + dict_clear_documents (dataset_dict (ds)); + + return lex_end_of_command (lexer); +} + + +/* Performs the ADD DOCUMENTS command. */ +int +cmd_add_documents (struct lexer *lexer, struct dataset *ds) { - dict_set_documents (default_dict, NULL); + struct dictionary *dict = dataset_dict (ds); + + if ( ! lex_force_string (lexer) ) + return CMD_FAILURE; + + while ( lex_is_string (lexer)) + { + dict_add_document_line (dict, lex_tokcstr (lexer)); + lex_get (lexer); + } + + add_document_trailer (dict); - return lex_end_of_command (); + return lex_end_of_command (lexer) ; }