/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 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
#include <libpspp/alloc.h>
#include <language/command.h>
#include <libpspp/message.h>
-#include <language/line-buffer.h>
+#include <libpspp/getl.h>
+#include <language/syntax-file.h>
#include <language/lexer/lexer.h>
#include <libpspp/str.h>
+#include <data/file-name.h>
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
int
-cmd_include (void)
+cmd_include (struct lexer *lexer, struct dataset *ds UNUSED)
{
+ struct source_stream *ss;
+ char *found_fn;
+ char *target_fn;
+
/* Skip optional FILE=. */
- if (lex_match_id ("FILE"))
- lex_match ('=');
+ if (lex_match_id (lexer, "FILE"))
+ lex_match (lexer, '=');
- /* Filename can be identifier or string. */
- if (token != T_ID && token != T_STRING)
+ /* File name can be identifier or string. */
+ if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING)
{
- lex_error (_("expecting filename"));
+ lex_error (lexer, _("expecting file name"));
return CMD_CASCADING_FAILURE;
}
- getl_include_syntax_file (ds_c_str (&tokstr));
- lex_get ();
- return lex_end_of_command ();
+ target_fn = ds_cstr (lex_tokstr (lexer));
+
+ ss = lex_get_source_stream (lexer);
+ found_fn = fn_search_path (target_fn, getl_include_path ( ss ));
+
+ if (found_fn != NULL)
+ {
+ 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."),
+ target_fn);
+
+ lex_get (lexer);
+ return lex_end_of_command (lexer);
}