X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fhelper.c;h=bd6e2198f4efc7ca276dc2b04cc79645e4338534;hb=efad80c9e538d0be3cfd766fd2db20e958b684da;hp=7deb4cbb0cf0736aa3082f48fd0c609469d965b2;hpb=b4dd1916b76c26b631330a6da615af4433360da4;p=pspp-builds.git

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 7deb4cbb..bd6e2198 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,3 +1,6 @@
+/* This file is a rubbish bin where stuff gets put when it doesn't seem to
+   belong anywhere else.
+*/
 #include <config.h>
 
 #include <glib.h>
@@ -5,6 +8,8 @@
 #include "message-dialog.h"
 #include <data/data-in.h>
 #include <data/data-out.h>
+#include <data/dictionary.h>
+#include <data/storage-stream.h>
 #include <libpspp/message.h>
 
 #include <libpspp/i18n.h>
@@ -13,6 +18,11 @@
 #include <string.h>
 #include <data/settings.h>
 
+#include <language/command.h>
+#include <data/procedure.h>
+#include <language/lexer/lexer.h>
+#include "psppire-data-store.h"
+
 
 #include <gettext.h>
 
@@ -80,8 +90,9 @@ get_widget_assert (GladeXML *xml, const gchar *name)
   return w;
 }
 
-/* Converts a string in the pspp locale to utf-8 */
-char *
+/* Converts a string in the pspp locale to utf-8.
+   The return value must be freed when no longer required*/
+gchar *
 pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err)
 {
   return recode_string (CONV_PSPP_TO_UTF8, text, len);
@@ -129,3 +140,47 @@ reference_manual (GtkMenuItem *menu, gpointer data)
     }
   g_clear_error (&err);
 }
+
+
+extern struct dataset *the_dataset;
+extern struct source_stream *the_source_stream;
+extern PsppireDataStore *the_data_store;
+
+gboolean
+execute_syntax (struct getl_interface *sss)
+{
+  struct lexer *lexer;
+
+  g_return_val_if_fail (proc_has_source (the_dataset), FALSE);
+
+  lexer = lex_create (the_source_stream);
+
+  getl_append_source (the_source_stream, sss);
+
+  for (;;)
+    {
+      int result = cmd_parse (lexer, the_dataset);
+
+      if (result == CMD_EOF || result == CMD_FINISH)
+	break;
+    }
+
+  getl_abort_noninteractive (the_source_stream);
+
+  lex_destroy (lexer);
+
+  /* The GUI must *always* have a data source, even if it's an empty one.
+     Therefore, we find that there is none, (for example NEW FILE was the last
+     item in the syntax) then we create a new one. */
+  if ( ! proc_has_source (the_dataset))
+    proc_set_source (the_dataset,
+		     storage_source_create (the_data_store->case_file->flexifile)
+		     );
+
+  /* GUI syntax needs this implicit EXECUTE command at the end of
+     every script.  Otherwise commands like GET could leave the GUI without
+     a casefile. */
+  return procedure (the_dataset, NULL, NULL);
+}
+
+