Move base nodes into base directory.

8 files changed, 19 insertions, 17 deletions

diff --git a/src/nodes/declnode.h b/src/nodes/base/declnode.h
index 840caef..f7c7f8c 100644
--- a/src/nodes/declnode.h
+++ b/src/nodes/base/declnode.h
@@ -17,10 +17,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NODES_DECLNODE_H
-#define NODES_DECLNODE_H
+#ifndef NODES_BASE_DECLNODE_H
+#define NODES_BASE_DECLNODE_H
 
-#include "nodes/node.h"
+#include "nodes/base/node.h"
 
 #include <string>
 
@@ -37,4 +37,4 @@ struct DeclNode : public Node
     bool isAutoGenerated;
 };
 
-#endif // NODES_DECLNODE_H
+#endif // NODES_BASE_DECLNODE_H
diff --git a/src/nodes/node.h b/src/nodes/base/node.h
index e405a4d..51aa4ed 100644
--- a/src/nodes/node.h
+++ b/src/nodes/base/node.h
@@ -17,8 +17,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NODES_NODE_H
-#define NODES_NODE_H
+#ifndef NODES_BASE_NODE_H
+#define NODES_BASE_NODE_H
 
 #include "includes.h"
 
@@ -60,4 +60,4 @@ struct Node
     int indent;
 };
 
-#endif // NODES_NODE_H
+#endif // NODES_BASE_NODE_H
diff --git a/src/nodes/typenode.h b/src/nodes/base/typenode.h
index 174fe06..265407b 100644
--- a/src/nodes/typenode.h
+++ b/src/nodes/base/typenode.h
@@ -17,11 +17,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NODES_TYPENODE_H
-#define NODES_TYPENODE_H
+#ifndef NODES_BASE_TYPENODE_H
+#define NODES_BASE_TYPENODE_H
 
-#include "nodes/declnode.h"
-#include "nodes/node.h"
+#include "nodes/base/declnode.h"
+#include "nodes/base/node.h"
 
 #include <string>
 
@@ -38,4 +38,4 @@ struct TypeNode : public Node
     DeclNode *typeName;
 };
 
-#endif // NODES_TYPENODE_H
+#endif // NODES_BASE_TYPENODE_H
diff --git a/src/nodes/functiondeclnode.h b/src/nodes/functiondeclnode.h
index 2154218..0800e1f 100644
--- a/src/nodes/functiondeclnode.h
+++ b/src/nodes/functiondeclnode.h
@@ -20,11 +20,12 @@
 #ifndef NODES_FUNCTIONDECLNODE_H
 #define NODES_FUNCTIONDECLNODE_H
 
-#include "nodes/declnode.h"
 #include "nodes/functiontypenode.h"
 #include "nodes/parmdeclnode.h"
 #include "nodes/resultdeclnode.h"
 
+#include "nodes/base/declnode.h"
+
 #include <string>
 #include <vector>
 
diff --git a/src/nodes/functiontypenode.h b/src/nodes/functiontypenode.h
index d33eb48..48886bb 100644
--- a/src/nodes/functiontypenode.h
+++ b/src/nodes/functiontypenode.h
@@ -21,7 +21,8 @@
 #define NODES_FUNCTIONTYPENODE_H
 
 #include "nodes/treelistnode.h"
-#include "nodes/typenode.h"
+
+#include "nodes/base/typenode.h"
 
 #include <string>
 
diff --git a/src/nodes/parmdeclnode.h b/src/nodes/parmdeclnode.h
index e61b057..c7188c5 100644
--- a/src/nodes/parmdeclnode.h
+++ b/src/nodes/parmdeclnode.h
@@ -20,7 +20,7 @@
 #ifndef NODES_PARMDECLNODE_H
 #define NODES_PARMDECLNODE_H
 
-#include "nodes/node.h"
+#include "nodes/base/node.h"
 
 #include <string>
 
diff --git a/src/nodes/resultdeclnode.h b/src/nodes/resultdeclnode.h
index 7605208..b30de96 100644
--- a/src/nodes/resultdeclnode.h
+++ b/src/nodes/resultdeclnode.h
@@ -20,7 +20,7 @@
 #ifndef NODES_RESULTDECLNODE_H
 #define NODES_RESULTDECLNODE_H
 
-#include "nodes/declnode.h"
+#include "nodes/base/declnode.h"
 
 #include <string>
 
diff --git a/src/nodes/treelistnode.h b/src/nodes/treelistnode.h
index c24479d..3d6bfd0 100644
--- a/src/nodes/treelistnode.h
+++ b/src/nodes/treelistnode.h
@@ -20,7 +20,7 @@
 #ifndef NODES_TREELISTNODE_H
 #define NODES_TREELISTNODE_H
 
-#include "nodes/node.h"
+#include "nodes/base/node.h"
 
 #include <string>