-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
- 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 <language/data-io/file-handle.h>
#include <data/file-name.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <language/line-buffer.h>
+#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/magic.h>
#include <libpspp/str.h>
/* (functions) */
int
-cmd_file_handle (void)
+cmd_file_handle (struct lexer *lexer, struct dataset *ds)
{
char handle_name[LONG_NAME_LEN + 1];
struct fh_properties properties = *fh_default_properties ();
struct cmd_file_handle cmd;
struct file_handle *handle;
- if (!lex_force_id ())
+ if (!lex_force_id (lexer))
return CMD_CASCADING_FAILURE;
- str_copy_trunc (handle_name, sizeof handle_name, tokid);
+ str_copy_trunc (handle_name, sizeof handle_name, lex_tokid (lexer));
- handle = fh_from_name (handle_name);
+ handle = fh_from_id (handle_name);
if (handle != NULL)
{
msg (SE, _("File handle %s is already defined. "
return CMD_CASCADING_FAILURE;
}
- lex_get ();
- if (!lex_force_match ('/'))
+ lex_get (lexer);
+ if (!lex_force_match (lexer, '/'))
return CMD_CASCADING_FAILURE;
- if (!parse_file_handle (&cmd))
+ if (!parse_file_handle (lexer, ds, &cmd, NULL))
return CMD_CASCADING_FAILURE;
- if (lex_end_of_command () != CMD_SUCCESS)
+ if (lex_end_of_command (lexer) != CMD_SUCCESS)
goto lossage;
if (cmd.s_name == NULL && cmd.mode != FH_SCRATCH)
{
- lex_sbc_missing ("NAME");
+ lex_sbc_missing (lexer, "NAME");
goto lossage;
}
if (cmd.n_lrecl[0] == NOT_LONG)
msg (SE, _("Fixed-length records were specified on /RECFORM, but "
"record length was not specified on /LRECL. "
- "Assuming %d-character records."),
- properties.record_width);
+ "Assuming %u-character records."),
+ (unsigned int) properties.record_width);
else if (cmd.n_lrecl[0] < 1)
msg (SE, _("Record length (%ld) must be at least one byte. "
- "Assuming %d-character records."),
- cmd.n_lrecl[0], properties.record_width);
+ "Assuming %u-character records."),
+ cmd.n_lrecl[0], (unsigned int) properties.record_width);
else
properties.record_width = cmd.n_lrecl[0];
break;
default:
- assert (0);
+ NOT_REACHED ();
}
if (cmd.mode != FH_SCRATCH)
}
int
-cmd_close_file_handle (void)
+cmd_close_file_handle (struct lexer *lexer, struct dataset *ds UNUSED)
{
struct file_handle *handle;
- if (!lex_force_id ())
+ if (!lex_force_id (lexer))
return CMD_CASCADING_FAILURE;
- handle = fh_from_name (tokid);
+ handle = fh_from_id (lex_tokid (lexer));
if (handle == NULL)
return CMD_CASCADING_FAILURE;
/* Returns the name for REFERENT. */
static const char *
-referent_name (enum fh_referent referent)
+referent_name (enum fh_referent referent)
{
- switch (referent)
+ switch (referent)
{
case FH_REF_FILE:
return _("file");
case FH_REF_SCRATCH:
return _("scratch file");
default:
- abort ();
+ NOT_REACHED ();
}
}
-/* Parses a file handle name, which may be a filename as a string
+/* Parses a file handle name, which may be a file name as a string
or a file handle name as an identifier. The allowed types of
file handle are restricted to those in REFERENT_MASK. Returns
the file handle when successful, a null pointer on failure. */
struct file_handle *
-fh_parse (enum fh_referent referent_mask)
+fh_parse (struct lexer *lexer, enum fh_referent referent_mask)
{
struct file_handle *handle;
- if (lex_match_id ("INLINE"))
+ if (lex_match_id (lexer, "INLINE"))
handle = fh_inline_file ();
- else
+ else
{
- if (token != T_ID && token != T_STRING)
+ if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING)
{
- lex_error (_("expecting a file name or handle name"));
+ lex_error (lexer, _("expecting a file name or handle name"));
return NULL;
}
handle = NULL;
- if (token == T_ID)
- handle = fh_from_name (tokid);
- if (handle == NULL)
- handle = fh_from_filename (ds_c_str (&tokstr));
+ if (lex_token (lexer) == T_ID)
+ handle = fh_from_id (lex_tokid (lexer));
+ if (handle == NULL)
+ handle = fh_from_file_name (ds_cstr (lex_tokstr (lexer)));
if (handle == NULL)
{
- if (token != T_ID || tokid[0] != '#' || get_syntax () != ENHANCED)
- {
- char *filename = ds_c_str (&tokstr);
- char *handle_name = xasprintf ("\"%s\"", filename);
- handle = fh_create_file (handle_name, filename,
- fh_default_properties ());
- free (handle_name);
- }
+ if (lex_token (lexer) != T_ID || lex_tokid (lexer)[0] != '#' || get_syntax () != ENHANCED)
+ handle = fh_create_file (NULL, ds_cstr (lex_tokstr (lexer)),
+ fh_default_properties ());
else
- handle = fh_create_scratch (tokid);
+ handle = fh_create_scratch (lex_tokid (lexer));
}
- lex_get ();
+ lex_get (lexer);
}
- if (!(fh_get_referent (handle) & referent_mask))
+ if (!(fh_get_referent (handle) & referent_mask))
{
msg (SE, _("Handle for %s not allowed here."),
referent_name (fh_get_referent (handle)));
projects / pspp-builds.git / blobdiff