X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fhelper.c;h=5668496833cdd975d1874be4c345de0db54e67d0;hb=4ea6e37d180c9412cbcd39afa48a516522e6dd71;hp=69b5d4376cb6198248c42b34c82d9496a19230c9;hpb=146997e1690f055481e2003529eaa4f8848ca4a8;p=pspp-builds.git

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 69b5d437..56684968 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,21 +1,18 @@
-/*
-    PSPPIRE --- A Graphical User Interface for PSPP
-    Copyright (C) 2007  Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2007  Free Software Foundation
 
-    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 <http://www.gnu.org/licenses/>. */
 
 
 /* This file is a rubbish bin where stuff gets put when it doesn't seem to
@@ -23,13 +20,14 @@
 */
 #include <config.h>
 
+#include	<glib-object.h>
+
 #include <glib.h>
 #include "helper.h"
 #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>
@@ -166,12 +164,16 @@ extern struct dataset *the_dataset;
 extern struct source_stream *the_source_stream;
 extern PsppireDataStore *the_data_store;
 
-gboolean
+void
 execute_syntax (struct getl_interface *sss)
 {
   struct lexer *lexer;
 
-  g_return_val_if_fail (proc_has_source (the_dataset), FALSE);
+  struct casereader *reader = psppire_data_store_get_reader (the_data_store);
+
+  proc_set_active_file_data (the_dataset, reader);
+
+  g_return_if_fail (proc_has_active_file (the_dataset));
 
   lexer = lex_create (the_source_stream);
 
@@ -189,18 +191,60 @@ execute_syntax (struct getl_interface *sss)
 
   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);
+  psppire_dict_replace_dictionary (the_data_store->dict,
+				   dataset_dict (the_dataset));
+
+  {
+    PsppireCaseFile *pcf = psppire_case_file_new (dataset_source (the_dataset));
+
+    psppire_data_store_set_case_file (the_data_store, pcf);
+  }
 }
 
 
+
+#ifdef G_ENABLE_DEBUG
+# define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#else
+# define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#endif
+
+
+/* VOID:INT,INT,INT */
+void
+marshaller_VOID__INT_INT_INT (GClosure     *closure,
+                        GValue       *return_value,
+                        guint         n_param_values,
+                        const GValue *param_values,
+                        gpointer      invocation_hint,
+                        gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_INT_INT) (gpointer     data1,
+						  gint         arg_1,
+						  gint         arg_2,
+						  gint         arg_3,
+						  gpointer     data2);
+  register GMarshalFunc_VOID__INT_INT_INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_INT_INT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_int (param_values + 2),
+            g_marshal_value_peek_int (param_values + 3),
+            data2);
+}