Improve the way we handle the various parsing "states". Until now

[pspp-builds.git] / src / procedure.c

diff --git a/src/procedure.c b/src/procedure.c
index e7f61933ace503e54db5f5fe04b375c7e8a0b585..422e7c05ca167a34552ac52d0f500cbc3c1a8fbd 100644 (file)
--- a/src/procedure.c
+++ b/src/procedure.c
@@ -18,30 +18,28 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include "procedure.h"
-#include "message.h"
+#include <procedure.h>
+#include <libpspp/message.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>    /* Required by SunOS4. */
-#endif
-#include "alloc.h"
-#include "case.h"
-#include "casefile.h"
-#include "command.h"
-#include "dictionary.h"
-#include "control-stack.h"
-#include "message.h"
+#include <unistd.h>
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <data/casefile.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <language/control/control-stack.h>
+#include <libpspp/message.h>
 #include "expressions/public.h"
-#include "file-handle-def.h"
-#include "misc.h"
-#include "settings.h"
-#include "manager.h"
-#include "table.h"
-#include "str.h"
-#include "variable.h"
-#include "value-labels.h"
+#include <data/file-handle-def.h>
+#include <libpspp/misc.h>
+#include <data/settings.h>
+#include <output/manager.h>
+#include <output/table.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <data/value-labels.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -728,14 +726,6 @@ free_case_source (struct case_source *source)
     }
 }
 
-/* Returns nonzero if a case source is "complex". */
-int
-case_source_is_complex (const struct case_source *source) 
-{
-  return source != NULL && (source->class == &input_program_source_class
-                            || source->class == &file_type_source_class);
-}
-
 /* Returns nonzero if CLASS is the class of SOURCE. */
 int
 case_source_is_class (const struct case_source *source,
@@ -883,8 +873,8 @@ dump_splits (struct ccase *c)
 
   t = tab_create (3, split_cnt + 1, 0);
   tab_dim (t, tab_natural_dimensions);
-  tab_vline (t, TAL_1 | TAL_SPACING, 1, 0, split_cnt);
-  tab_vline (t, TAL_1 | TAL_SPACING, 2, 0, split_cnt);
+  tab_vline (t, TAL_GAP, 1, 0, split_cnt);
+  tab_vline (t, TAL_GAP, 2, 0, split_cnt);
   tab_text (t, 0, 0, TAB_NONE, _("Variable"));
   tab_text (t, 1, 0, TAB_LEFT, _("Value"));
   tab_text (t, 2, 0, TAB_LEFT, _("Label"));
@@ -1014,6 +1004,4 @@ discard_variables (void)
   process_if_expr = NULL;
 
   cancel_temporary ();
-
-  pgm_state = STATE_INIT;
 }