#include <libpspp/alloc.h>
#include <language/command.h>
#include <libpspp/message.h>
-#include <data/filename.h>
+#include <data/file-name.h>
#include <language/lexer/lexer.h>
#include <data/settings.h>
#include <libpspp/str.h>
struct getl_source *next; /* Next file in list. */
/* Current location. */
- char *fn; /* Filename. */
+ char *fn; /* File name. */
int ln; /* Line number. */
enum getl_source_type
getl_add_include_dir (const char *path)
{
if (ds_length (&getl_include_path))
- ds_putc (&getl_include_path, PATH_DELIMITER);
+ ds_putc (&getl_include_path, ':');
ds_puts (&getl_include_path, path);
}
append_source (create_syntax_file_source (fn));
}
-/* Inserts the given file with filename FN into the current file after
- the current line. */
+/* Inserts the given file with name FN into the current file
+ after the current line. */
void
getl_include_syntax_file (const char *fn)
{
if (nfile_loc)
*f = *file_loc[nfile_loc - 1];
else
- getl_location (&f->filename, &f->line_number);
+ getl_location (&f->file_name, &f->line_number);
}
/* Reads a line from syntax file source S into LINE.