X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fhelper.c;h=c322321db60cb84621d3b44c6150a354c2b29e93;hb=c806348911641248369536c11e48ed59757865da;hp=09711f1bd1a39f4d51aa3f764fbba901ec862a58;hpb=f514231dd2fc0c2adc1ebab5c46a4b55d2bd9c2b;p=pspp

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 09711f1bd1..c322321db6 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -28,19 +28,25 @@
 #include <data/data-in.h>
 #include <data/data-out.h>
 #include <data/dictionary.h>
+#include <data/casereader-provider.h>
 #include <libpspp/message.h>
 
 #include <libpspp/i18n.h>
 
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
 #include <data/settings.h>
 
 #include <language/command.h>
+#include <data/lazy-casereader.h>
 #include <data/procedure.h>
 #include <language/lexer/lexer.h>
 #include "psppire-data-store.h"
+#include <output/manager.h>
+#include "output-viewer.h"
 
+#include "xalloc.h"
 
 #include <gettext.h>
 
@@ -103,7 +109,7 @@ get_widget_assert (GladeXML *xml, const gchar *name)
   w = glade_xml_get_widget (xml, name);
 
   if ( !w )
-    g_warning ("Widget \"%s\" could not be found\n", name);
+    g_critical ("Widget \"%s\" could not be found\n", name);
 
   return w;
 }
@@ -164,27 +170,64 @@ extern struct dataset *the_dataset;
 extern struct source_stream *the_source_stream;
 extern PsppireDataStore *the_data_store;
 
+/* Lazy casereader callback function used by execute_syntax. */
+static struct casereader *
+create_casereader_from_data_store (void *data_store_)
+{
+  PsppireDataStore *data_store = data_store_;
+  return psppire_data_store_get_reader (data_store);
+}
+
 gboolean
 execute_syntax (struct getl_interface *sss)
 {
-  gboolean status;
   struct lexer *lexer;
-
-  struct casereader *reader = psppire_data_store_get_reader (the_data_store);
-
+  gboolean retval = TRUE;
+
+  struct casereader *reader;
+  size_t value_cnt;
+  casenumber case_cnt;
+  unsigned long int lazy_serial;
+
+  /* When the user executes a number of snippets of syntax in a
+     row, none of which read from the active file, the GUI becomes
+     progressively less responsive.  The reason is that each syntax
+     execution encapsulates the active file data in another
+     datasheet layer.  The cumulative effect of having a number of
+     layers of datasheets wastes time and space.
+
+     To solve the problem, we use a "lazy casereader", a wrapper
+     around the casereader obtained from the data store, that
+     only actually instantiates that casereader when it is
+     needed.  If the data store casereader is never needed, then
+     it is reused the next time syntax is run, without wrapping
+     it in another layer. */
+  value_cnt = psppire_data_store_get_value_count (the_data_store);
+  case_cnt = psppire_data_store_get_case_count (the_data_store);
+  reader = lazy_casereader_create (value_cnt, case_cnt,
+                                   create_casereader_from_data_store,
+                                   the_data_store, &lazy_serial);
   proc_set_active_file_data (the_dataset, reader);
 
   g_return_val_if_fail (proc_has_active_file (the_dataset), FALSE);
 
   lexer = lex_create (the_source_stream);
 
-  getl_append_source (the_source_stream, sss);
+  getl_append_source (the_source_stream, sss, GETL_BATCH, ERRMODE_CONTINUE);
 
   for (;;)
     {
-      int result = cmd_parse (lexer, the_dataset);
+      enum cmd_result result = cmd_parse (lexer, the_dataset);
+
+      if ( cmd_result_is_failure (result))
+	{
+	  retval = FALSE;
+	  if ( source_stream_current_error_mode (the_source_stream)
+	       == ERRMODE_STOP )
+	    break;
+	}
 
-      if (result == CMD_EOF || result == CMD_FINISH)
+      if ( result == CMD_EOF || result == CMD_FINISH)
 	break;
     }
 
@@ -192,21 +235,19 @@ execute_syntax (struct getl_interface *sss)
 
   lex_destroy (lexer);
 
-  /* GUI syntax needs this implicit EXECUTE command at the end of
-     every script.  Otherwise commands like GET could leave the GUI
-     without a datasheet. */
-  status = proc_execute (the_dataset);
-
   psppire_dict_replace_dictionary (the_data_store->dict,
 				   dataset_dict (the_dataset));
 
-  {
-    PsppireCaseFile *pcf = psppire_case_file_new (dataset_source (the_dataset));
+  reader = proc_extract_active_file_data (the_dataset);
+  if (!lazy_casereader_destroy (reader, lazy_serial))
+    psppire_data_store_set_case_file (the_data_store,
+                                      psppire_case_file_new (reader));
+
+  som_flush ();
 
-    psppire_data_store_set_case_file (the_data_store, pcf);
-  }
+  reload_the_viewer ();
 
-  return status;
+  return retval;
 }