/* PSPPIRE - a graphical interface for PSPP.
- Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009, 2010 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
static int
location (const struct getl_interface *i UNUSED)
{
- return -1;
+ return 0;
}
if ( sss->posn == -1)
return false;
- next = ss_find_char (ds_substr (&sss->buffer,
+ next = ss_find_byte (ds_substr (&sss->buffer,
sss->posn, -1), '\n');
ds_assign_substring (line,
return true;
}
-struct getl_interface *
-create_syntax_string_source (const char *format, ...)
+static struct syntax_string_source *
+create_syntax_string_source__ (void)
{
- va_list args;
-
struct syntax_string_source *sss = xzalloc (sizeof *sss);
sss->posn = 0;
- ds_init_empty (&sss->buffer);
-
- va_start (args, format);
- ds_put_vformat (&sss->buffer, format, args);
- va_end (args);
-
sss->parent.interactive = always_false;
sss->parent.close = do_close;
sss->parent.read = read_single_line;
sss->parent.name = name;
sss->parent.location = location;
+ return sss;
+}
+
+struct getl_interface *
+create_syntax_string_source (const char *s)
+{
+ struct syntax_string_source *sss = create_syntax_string_source__ ();
+ ds_init_cstr (&sss->buffer, s);
+ return &sss->parent;
+}
+
+struct getl_interface *
+create_syntax_format_source (const char *format, ...)
+{
+ struct syntax_string_source *sss;
+ va_list args;
+
+ sss = create_syntax_string_source__ ();
+
+ ds_init_empty (&sss->buffer);
+
+ va_start (args, format);
+ ds_put_vformat (&sss->buffer, format, args);
+ va_end (args);
return &sss->parent;
}