X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fsyntax-string-source.c;h=4f3c1c143a76f577e522568b78d869dde9574dd2;hb=37c5ded73d52bfa1962d0ec352402b4e894c6c9a;hp=4fe70ff2ad171f083f3fc5f6d5d4c4f8643c0dec;hpb=d8749acaf878dccf9e4527c27d06d06eb5e03091;p=pspp-builds.git
diff --git a/src/language/syntax-string-source.c b/src/language/syntax-string-source.c
index 4fe70ff2..4f3c1c14 100644
--- a/src/language/syntax-string-source.c
+++ b/src/language/syntax-string-source.c
@@ -1,27 +1,24 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2007 Free Software Foundation
+/* PSPPIRE - a graphical interface for PSPP.
+ 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
#include
+#include
#include
-#include
#include
#include
@@ -29,6 +26,8 @@
#include "syntax-string-source.h"
+#include "xalloc.h"
+
struct syntax_string_source
{
struct getl_interface parent;
@@ -55,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
-close (struct getl_interface *i )
+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,10 +73,10 @@ close (struct getl_interface *i )
static bool
read_single_line (struct getl_interface *i,
- struct string *line,
- enum getl_syntax *syntax_rules UNUSED)
+ 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;
@@ -100,30 +100,46 @@ 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 = close;
+ 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 (struct getl_interface *) sss;
+ return &sss->parent;
}
/* Return the syntax currently contained in S.