Tweaked DefinitionEx include paths; also Parser_ss.h name is finally fixed

9 files changed, 18 insertions, 9 deletions

diff --git a/DefinitionEx/CMakeLists.txt b/DefinitionEx/CMakeLists.txt
index f098670..469f72a 100644
--- a/DefinitionEx/CMakeLists.txt
+++ b/DefinitionEx/CMakeLists.txt
@@ -2,7 +2,7 @@ project(DefinitionEx)
 
 add_library(
 	${PROJECT_NAME} STATIC
-	src/Parser_ss.cpp
+	src/Parser.cpp
 	src/Term.cpp
 	src/Token.cpp
 	)
diff --git a/DefinitionEx/include/starshatter/definition.h b/DefinitionEx/include/starshatter/definition.h
new file mode 100644
index 0000000..785261c
--- /dev/null
+++ b/DefinitionEx/include/starshatter/definition.h
@@ -0,0 +1,11 @@
+/*  Starshatter: The Open Source Project
+    Copyright (c) 2021-2024, Starshatter: The Open Source Project Contributors
+    Copyright (c) 2011-2012, Starshatter OpenSource Distribution Contributors
+    Copyright (c) 1997-2006, Destroyer Studios LLC.
+*/
+
+#pragma once
+
+#include "definition/Parser.h"
+#include "definition/Term.h"
+#include "definition/Token.h"
diff --git a/DefinitionEx/include/Parser_ss.h b/DefinitionEx/include/starshatter/definition/Parser.h
index 50659b9..50659b9 100644
--- a/DefinitionEx/include/Parser_ss.h
+++ b/DefinitionEx/include/starshatter/definition/Parser.h
diff --git a/DefinitionEx/include/Term.h b/DefinitionEx/include/starshatter/definition/Term.h
index 1bc30b6..1bc30b6 100644
--- a/DefinitionEx/include/Term.h
+++ b/DefinitionEx/include/starshatter/definition/Term.h
diff --git a/DefinitionEx/include/Token.h b/DefinitionEx/include/starshatter/definition/Token.h
index 3dd8eb9..3dd8eb9 100644
--- a/DefinitionEx/include/Token.h
+++ b/DefinitionEx/include/starshatter/definition/Token.h
diff --git a/DefinitionEx/src/Parser_ss.cpp b/DefinitionEx/src/Parser.cpp
index 1b80d48..2453819 100644
--- a/DefinitionEx/src/Parser_ss.cpp
+++ b/DefinitionEx/src/Parser.cpp
@@ -11,7 +11,7 @@
     Implementation of the generic Parser class
 */
 
-#include <Parser_ss.h>
+#include <starshatter/definition/Parser.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,8 +21,8 @@
 #include <starshatter/foundation/reader.h>
 #include <Utils.h>
 
-#include <Term.h>
-#include <Token.h>
+#include <starshatter/definition/Term.h>
+#include <starshatter/definition/Token.h>
 
 enum KEYS { KEY_TRUE, KEY_FALSE, KEY_DEF, KEY_MINUS };
 
diff --git a/DefinitionEx/src/Term.cpp b/DefinitionEx/src/Term.cpp
index acfdcb8..789066d 100644
--- a/DefinitionEx/src/Term.cpp
+++ b/DefinitionEx/src/Term.cpp
@@ -11,7 +11,7 @@
     Implementation of the Term class
 */
 
-#include <Term.h>
+#include <starshatter/definition/Term.h>
 
 #include <Utils.h>
 
diff --git a/DefinitionEx/src/Token.cpp b/DefinitionEx/src/Token.cpp
index 3f516de..04f5708 100644
--- a/DefinitionEx/src/Token.cpp
+++ b/DefinitionEx/src/Token.cpp
@@ -11,7 +11,7 @@
     Scanner class implementation
 */
 
-#include <Token.h>
+#include <starshatter/definition/Token.h>
 
 #include <ctype.h>
 
diff --git a/DefinitionEx/test/parse_utils_like.cpp b/DefinitionEx/test/parse_utils_like.cpp
index fc943f7..eb87a07 100644
--- a/DefinitionEx/test/parse_utils_like.cpp
+++ b/DefinitionEx/test/parse_utils_like.cpp
@@ -1,8 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <Parser_ss.h>
-#include <Term.h>
-#include <Token.h>
+#include <starshatter/definition.h>
 
 
 TEST(DefinitionEx, ParseUtilsLike)