#include <unistd.h>
#include "data/dataset.h"
-#include "data/file-name.h"
#include "data/session.h"
#include "language/command.h"
#include "language/lexer/include-path.h"
if (lex_match_id (lexer, "FILE"))
lex_match (lexer, T_EQUALS);
- /* File name can be identifier or string. */
- if (lex_token (lexer) != T_ID && !lex_is_string (lexer))
- {
- lex_error (lexer, _("expecting file name"));
- return CMD_FAILURE;
- }
+ if (!lex_force_string_or_id (lexer))
+ return CMD_FAILURE;
+
+ relative_name = utf8_to_filename (lex_tokcstr (lexer));
+ if (NULL == relative_name)
+ return CMD_FAILURE;
- relative_name = utf8_to_filename (lex_tokcstr (lexer));
filename = include_path_search (relative_name);
free (relative_name);
- if ( ! filename)
+ if (! filename)
{
msg (SE, _("Can't find `%s' in include file search path."),
lex_tokcstr (lexer));
status = CMD_FAILURE;
encoding = xstrdup (session_get_default_syntax_encoding (
dataset_session (ds)));
- while ( T_ENDCMD != lex_token (lexer))
+ while (T_ENDCMD != lex_token (lexer))
{
if (lex_match_id (lexer, "ENCODING"))
{
free (encoding);
encoding = xstrdup (lex_tokcstr (lexer));
+ lex_get (lexer);
}
else if (variant == INSERT && lex_match_id (lexer, "SYNTAX"))
{
lex_match (lexer, T_EQUALS);
- if ( lex_match_id (lexer, "INTERACTIVE") )
+ if (lex_match_id (lexer, "INTERACTIVE"))
syntax_mode = LEX_SYNTAX_INTERACTIVE;
- else if ( lex_match_id (lexer, "BATCH"))
+ else if (lex_match_id (lexer, "BATCH"))
syntax_mode = LEX_SYNTAX_BATCH;
- else if ( lex_match_id (lexer, "AUTO"))
+ else if (lex_match_id (lexer, "AUTO"))
syntax_mode = LEX_SYNTAX_AUTO;
else
{
- lex_error_expecting (lexer, "BATCH", "INTERACTIVE", "AUTO",
- NULL_SENTINEL);
+ lex_error_expecting (lexer, "BATCH", "INTERACTIVE", "AUTO");
goto exit;
}
}
else if (variant == INSERT && lex_match_id (lexer, "CD"))
{
lex_match (lexer, T_EQUALS);
- if ( lex_match_id (lexer, "YES") )
+ if (lex_match_id (lexer, "YES"))
{
cd = true;
}
- else if ( lex_match_id (lexer, "NO"))
+ else if (lex_match_id (lexer, "NO"))
{
cd = false;
}
else
{
- lex_error_expecting (lexer, "YES", "NO", NULL_SENTINEL);
+ lex_error_expecting (lexer, "YES", "NO");
goto exit;
}
}
else if (variant == INSERT && lex_match_id (lexer, "ERROR"))
{
lex_match (lexer, T_EQUALS);
- if ( lex_match_id (lexer, "CONTINUE") )
+ if (lex_match_id (lexer, "CONTINUE"))
{
error_mode = LEX_ERROR_CONTINUE;
}
- else if ( lex_match_id (lexer, "STOP"))
+ else if (lex_match_id (lexer, "STOP"))
{
error_mode = LEX_ERROR_STOP;
}
else
{
- lex_error_expecting (lexer, "CONTINUE", "STOP", NULL_SENTINEL);
+ lex_error_expecting (lexer, "CONTINUE", "STOP");
goto exit;
}
}
}
status = lex_end_of_command (lexer);
- if ( status == CMD_SUCCESS)
+ if (status == CMD_SUCCESS)
{
struct lex_reader *reader;
lex_discard_rest_of_command (lexer);
lex_include (lexer, reader);
- if ( cd )
+ if (cd)
{
char *directory = dir_name (filename);
chdir (directory);