-/* 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 <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <ctype.h>
#include <stdlib.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
-#include <libpspp/message.h>
-#include <libpspp/start-date.h>
-#include <libpspp/version.h>
-#include <output/output.h>
+#include "data/dataset.h"
+#include "data/dictionary.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 (struct lexer *, 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 (struct lexer *lexer, struct dataset *ds UNUSED)
{
- return get_title (lexer, "TITLE", &outp_title);
+ return parse_title (lexer, TEXT_ITEM_TITLE);
}
int
cmd_subtitle (struct lexer *lexer, struct dataset *ds UNUSED)
{
- return get_title (lexer, "SUBTITLE", &outp_subtitle);
+ return parse_title (lexer, TEXT_ITEM_SUBTITLE);
}
static int
-get_title (struct lexer *lexer, const char *cmd, char **title)
+parse_title (struct lexer *lexer, enum text_item_type type)
{
- int c;
-
- c = lex_look_ahead (lexer);
- if (c == '"' || c == '\'')
- {
- lex_get (lexer);
- if (!lex_force_string (lexer))
- return CMD_FAILURE;
- if (*title)
- free (*title);
- *title = ds_xstrdup (lex_tokstr (lexer));
- lex_get (lexer);
- if (lex_token (lexer) != '.')
- {
- msg (SE, _("%s: `.' expected after string."), cmd);
- return CMD_FAILURE;
- }
- }
- else
- {
- char *cp;
-
- if (*title)
- free (*title);
- *title = xstrdup (lex_rest_of_line (lexer, NULL));
- lex_discard_line (lexer);
- for (cp = *title; *cp; cp++)
- *cp = toupper ((unsigned char) (*cp));
- }
+ if (!lex_force_string (lexer))
+ return CMD_FAILURE;
+ set_title (lex_tokcstr (lexer), type);
+ lex_get (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 (struct lexer *lexer, struct dataset *ds)
{
- const char *label;
+ if (!lex_force_string (lexer))
+ return CMD_FAILURE;
- label = lex_rest_of_line (lexer, NULL);
- lex_discard_line (lexer);
- while (isspace ((unsigned char) *label))
- label++;
-
- dict_set_label (dataset_dict (ds), label);
+ dict_set_label (dataset_dict (ds), lex_tokcstr (lexer));
+ lex_get (lexer);
return CMD_SUCCESS;
}
-/* Add LINE as a line of document information to dictionary
- indented by INDENT spaces. */
-static void
-add_document_line (struct dictionary *dict, const char *line, int indent)
-{
- const char *old_documents;
- size_t old_len;
- char *new_documents;
-
- old_documents = dict_get_documents (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';
-
- dict_set_documents (dict, new_documents);
-
- free (new_documents);
-}
-
/* Performs the DOCUMENT command. */
int
cmd_document (struct lexer *lexer, struct dataset *ds)
{
struct dictionary *dict = dataset_dict (ds);
- /* Add a few header lines for reference. */
- {
- char buf[256];
+ char *trailer;
- if (dict && dict_get_documents (dict))
- add_document_line (dict, "", 0);
+ if (!lex_force_string (lexer))
+ return CMD_FAILURE;
- sprintf (buf, _("Document entered %s by %s:"), get_start_date (), version);
- add_document_line (dict, buf, 1);
- }
-
- for (;;)
+ while (lex_is_string (lexer))
{
- int had_dot;
- const char *orig_line;
- char *copy_line;
-
- orig_line = lex_rest_of_line (lexer, &had_dot);
- lex_discard_line (lexer);
- 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 (dict, copy_line, 3);
- free (copy_line);
-
- lex_get_line (lexer);
- if (had_dot)
- break;
+ dict_add_document_line (dict, lex_tokcstr (lexer), true);
+ lex_get (lexer);
}
+ trailer = xasprintf (_(" (Entered %s)"), get_start_date ());
+ dict_add_document_line (dict, trailer, true);
+ free (trailer);
+
return CMD_SUCCESS;
}
-/* Performs the DROP DOCUMENTS command. */
+/* Performs the ADD DOCUMENTS command. */
int
-cmd_drop_documents (struct lexer *lexer, struct dataset *ds)
+cmd_add_documents (struct lexer *lexer, struct dataset *ds)
{
- dict_set_documents (dataset_dict (ds), NULL);
+ return cmd_document (lexer, ds);
+}
- return lex_end_of_command (lexer);
+/* Performs the DROP DOCUMENTS command. */
+int
+cmd_drop_documents (struct lexer *lexer UNUSED, struct dataset *ds)
+{
+ dict_clear_documents (dataset_dict (ds));
+ return CMD_SUCCESS;
}
projects / pspp-builds.git / blobdiff