From cfe28ef151771c04be56d459c58d818f6c43f5e1 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 3 Aug 2013 16:51:31 -0700
Subject: [PATCH] control-stack: Move from language to data directory.

---
 src/data/automake.mk                           | 2 ++
 src/{language/control => data}/control-stack.c | 2 +-
 src/{language/control => data}/control-stack.h | 0
 src/data/transformations.c                     | 2 +-
 src/language/control/automake.mk               | 2 --
 src/language/control/do-if.c                   | 2 +-
 src/language/control/loop.c                    | 3 +--
 src/language/control/temporary.c               | 4 ++--
 8 files changed, 8 insertions(+), 9 deletions(-)
 rename src/{language/control => data}/control-stack.c (97%)
 rename src/{language/control => data}/control-stack.h (100%)

diff --git a/src/data/automake.mk b/src/data/automake.mk
index 17d5ce1d6f..43e3d4e172 100644
--- a/src/data/automake.mk
+++ b/src/data/automake.mk
@@ -43,6 +43,8 @@ src_data_libdata_la_SOURCES = \
 	src/data/case-tmpfile.c \
 	src/data/case-tmpfile.h \
 	src/data/column.h \
+	src/data/control-stack.c \
+	src/data/control-stack.h \
 	src/data/csv-file-writer.c \
 	src/data/csv-file-writer.h \
 	src/data/data-in.c \
diff --git a/src/language/control/control-stack.c b/src/data/control-stack.c
similarity index 97%
rename from src/language/control/control-stack.c
rename to src/data/control-stack.c
index f806c7803a..d8228f896c 100644
--- a/src/language/control/control-stack.c
+++ b/src/data/control-stack.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include "language/control/control-stack.h"
+#include "data/control-stack.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/language/control/control-stack.h b/src/data/control-stack.h
similarity index 100%
rename from src/language/control/control-stack.h
rename to src/data/control-stack.h
diff --git a/src/data/transformations.c b/src/data/transformations.c
index 884def6753..700ed85e40 100644
--- a/src/data/transformations.c
+++ b/src/data/transformations.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 
 #include "libpspp/str.h"
-#include "language/control/control-stack.h" /* XXX layering violation */
+#include "data/control-stack.h" /* XXX layering violation */
 
 #include "gl/xalloc.h"
 
diff --git a/src/language/control/automake.mk b/src/language/control/automake.mk
index 11c5fdc3d0..ca665309ee 100644
--- a/src/language/control/automake.mk
+++ b/src/language/control/automake.mk
@@ -2,8 +2,6 @@
 
 
 language_control_sources = \
-	src/language/control/control-stack.c \
-	src/language/control/control-stack.h \
 	src/language/control/do-if.c \
 	src/language/control/loop.c \
 	src/language/control/repeat.c \
diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c
index bbb8fa92c5..ea70567091 100644
--- a/src/language/control/do-if.c
+++ b/src/language/control/do-if.c
@@ -19,11 +19,11 @@
 #include <stdlib.h>
 
 #include "data/case.h"
+#include "data/control-stack.h"
 #include "data/dataset.h"
 #include "data/transformations.h"
 #include "data/value.h"
 #include "language/command.h"
-#include "language/control/control-stack.h"
 #include "language/expressions/public.h"
 #include "language/lexer/lexer.h"
 #include "libpspp/compiler.h"
diff --git a/src/language/control/loop.c b/src/language/control/loop.c
index 4d2aaa33a4..34c6a1d363 100644
--- a/src/language/control/loop.c
+++ b/src/language/control/loop.c
@@ -16,9 +16,8 @@
 
 #include <config.h>
 
-#include "language/control/control-stack.h"
-
 #include "data/case.h"
+#include "data/control-stack.h"
 #include "data/dataset.h"
 #include "data/dictionary.h"
 #include "data/settings.h"
diff --git a/src/language/control/temporary.c b/src/language/control/temporary.c
index 7ebcc5ad9c..75e5e7b28a 100644
--- a/src/language/control/temporary.c
+++ b/src/language/control/temporary.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011, 2013 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
@@ -19,13 +19,13 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+#include "data/control-stack.h"
 #include "data/dataset.h"
 #include "data/dictionary.h"
 #include "data/transformations.h"
 #include "data/value-labels.h"
 #include "data/variable.h"
 #include "language/command.h"
-#include "language/control/control-stack.h"
 #include "language/lexer/lexer.h"
 #include "libpspp/message.h"
 #include "libpspp/str.h"
-- 
2.30.2