Update all #include directives to the currently preferred style.

[pspp-builds.git] / src / language / syntax-string-source.c

diff --git a/src/language/syntax-string-source.c b/src/language/syntax-string-source.c
index 94a56f97aacb55ae642b3eac0290cd8531f2b2c3..1d3d4d6b738c30b5c6df5c481dd0b8a912287304 100644 (file)
--- a/src/language/syntax-string-source.c
+++ b/src/language/syntax-string-source.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical interface for PSPP.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 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
@@ -17,15 +17,16 @@
 
 #include <config.h>
 
-#include <libpspp/getl.h>
-#include <libpspp/compiler.h>
-#include <libpspp/str.h>
+#include "language/syntax-string-source.h"
 
 #include <stdlib.h>
 
-#include "syntax-string-source.h"
+#include "libpspp/cast.h"
+#include "libpspp/getl.h"
+#include "libpspp/compiler.h"
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 struct syntax_string_source
   {
@@ -53,14 +54,15 @@ name (const struct getl_interface *i UNUSED)
 static int
 location (const struct getl_interface *i UNUSED)
 {
-  return -1;
+  return 0;
 }
 
 
 static void
 do_close (struct getl_interface *i )
 {
-  struct syntax_string_source *sss = (struct syntax_string_source *) i;
+  struct syntax_string_source *sss = UP_CAST (i, struct syntax_string_source,
+                                              parent);
 
   ds_destroy (&sss->buffer);
 
@@ -73,14 +75,15 @@ static bool
 read_single_line (struct getl_interface *i,
                  struct string *line)
 {
-  struct syntax_string_source *sss = (struct syntax_string_source *) i;
+  struct syntax_string_source *sss = UP_CAST (i, struct syntax_string_source,
+                                              parent);
 
   size_t next;
 
   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,
@@ -97,21 +100,13 @@ read_single_line (struct getl_interface *i,
   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;
@@ -119,8 +114,32 @@ create_syntax_string_source (const char *format, ...)
   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 (struct getl_interface *) sss;
+  return &sss->parent;
 }
 
 /* Return the syntax currently contained in S.