Moving liberty parser to crlcore

crlcore/meson.build

@@ -2,6 +2,7 @@ subdir('src/ccore')
 subdir('src/LibraryManager')
 subdir('src/cyclop')
 subdir('src/pyCRL')
+subdir('src/liberty')
 subdir('python')
 subdir('doc/crlcore')
 

crlcore/src/liberty/AnonymousGroup.cpp

@@ -13,8 +13,8 @@
 // |  C++ Module  :  "./AnonymousGroup.cpp"                          |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/AnonymousGroup.h"
-#include "hurricane/liberty/Group.h"
+#include "crlcore/liberty/AnonymousGroup.h"
+#include "crlcore/liberty/Group.h"
 
 namespace Liberty {
 

crlcore/src/liberty/Attribute.cpp

@@ -13,9 +13,9 @@
 // |  C++ Module  :  "./Attribute.cpp"                               |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/Attribute.h"
-#include "hurricane/liberty/Statement.h"
-#include "hurricane/liberty/Value.h"
+#include "crlcore/liberty/Attribute.h"
+#include "crlcore/liberty/Statement.h"
+#include "crlcore/liberty/Value.h"
 
 namespace Liberty {
 

crlcore/src/liberty/ComplexGroup.cpp

@@ -13,8 +13,8 @@
 // |  C++ Module  :  "./ComplexGroup.cpp"                            |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/ComplexGroup.h"
-#include "hurricane/liberty/Group.h"
+#include "crlcore/liberty/ComplexGroup.h"
+#include "crlcore/liberty/Group.h"
 
 namespace Liberty {
 

crlcore/src/liberty/ComplexValue.cpp

@@ -13,9 +13,9 @@
 // |  C++ Module  :  "./ComplexValue.cpp"                            |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/ComplexValue.h"
-#include "hurricane/liberty/Value.h"
-#include "hurricane/liberty/ValueString.h"
+#include "crlcore/liberty/ComplexValue.h"
+#include "crlcore/liberty/Value.h"
+#include "crlcore/liberty/ValueString.h"
 #include <string>
 #include <string_view>
 

crlcore/src/liberty/Define.cpp

@@ -13,9 +13,9 @@
 // |  C++ Module  :  "./Define.cpp"                                  |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/Define.h"
-#include "hurricane/liberty/Group.h"
-#include "hurricane/liberty/Statement.h"
+#include "crlcore/liberty/Define.h"
+#include "crlcore/liberty/Group.h"
+#include "crlcore/liberty/Statement.h"
 
 namespace Liberty {
 

crlcore/src/liberty/Group.cpp

@@ -13,10 +13,10 @@
 // |  C++ Module  :  "./Group.cpp"                                   |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/Attribute.h"
-#include "hurricane/liberty/Group.h"
-#include "hurricane/liberty/Library.h"
-#include "hurricane/liberty/Statement.h"
+#include "crlcore/liberty/Attribute.h"
+#include "crlcore/liberty/Group.h"
+#include "crlcore/liberty/Library.h"
+#include "crlcore/liberty/Statement.h"
 #include <algorithm>
 #include <string>
 #include <string_view>

crlcore/src/liberty/Library.cpp

@@ -14,10 +14,10 @@
 // +-----------------------------------------------------------------+
 
 
-#include "hurricane/liberty/Library.h"
-#include "hurricane/liberty/Parser.h"
-#include "hurricane/liberty/SimpleGroup.h"
-#include "hurricane/liberty/Statement.h"
+#include "crlcore/liberty/Library.h"
+#include "crlcore/liberty/Parser.h"
+#include "crlcore/liberty/SimpleGroup.h"
+#include "crlcore/liberty/Statement.h"
 #include <filesystem>
 #include <iostream>
 #include <string>

crlcore/src/liberty/Parser.cpp

@@ -13,16 +13,16 @@
 // |  C++ Module  :  "./Parser.cpp"                                  |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/AnonymousGroup.h"
-#include "hurricane/liberty/Attribute.h"
-#include "hurricane/liberty/ComplexGroup.h"
-#include "hurricane/liberty/ComplexValue.h"
-#include "hurricane/liberty/Define.h"
-#include "hurricane/liberty/Parser.h"
-#include "hurricane/liberty/SimpleGroup.h"
-#include "hurricane/liberty/Statement.h"
-#include "hurricane/liberty/Tokenizer.h"
-#include "hurricane/liberty/ValueString.h"
+#include "crlcore/liberty/AnonymousGroup.h"
+#include "crlcore/liberty/Attribute.h"
+#include "crlcore/liberty/ComplexGroup.h"
+#include "crlcore/liberty/ComplexValue.h"
+#include "crlcore/liberty/Define.h"
+#include "crlcore/liberty/Parser.h"
+#include "crlcore/liberty/SimpleGroup.h"
+#include "crlcore/liberty/Statement.h"
+#include "crlcore/liberty/Tokenizer.h"
+#include "crlcore/liberty/ValueString.h"
 #include <iostream>
 #include <queue>
 #include <string>

crlcore/src/liberty/Reader.cpp

@@ -13,7 +13,7 @@
 // |  C++ Module  :  "./Reader.cpp"                                  |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/Reader.h"
+#include "crlcore/liberty/Reader.h"
 #include <cstddef>
 #include <fcntl.h>
 #include <iostream>

crlcore/src/liberty/SimpleGroup.cpp

@@ -13,9 +13,9 @@
 // |  C++ Module  :  "./SimpleGroup.cpp"                             |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/Group.h"
-#include "hurricane/liberty/Library.h"
-#include "hurricane/liberty/SimpleGroup.h"
+#include "crlcore/liberty/Group.h"
+#include "crlcore/liberty/Library.h"
+#include "crlcore/liberty/SimpleGroup.h"
 #include <string>
 #include <string_view>
 

crlcore/src/liberty/Statement.cpp

@@ -14,11 +14,11 @@
 // +-----------------------------------------------------------------+
 
 #include <iostream>
-#include "hurricane/liberty/Attribute.h"
-#include "hurricane/liberty/Define.h"
-#include "hurricane/liberty/Group.h"
-#include "hurricane/liberty/Statement.h"
-#include "hurricane/liberty/Library.h"
+#include "crlcore/liberty/Attribute.h"
+#include "crlcore/liberty/Define.h"
+#include "crlcore/liberty/Group.h"
+#include "crlcore/liberty/Statement.h"
+#include "crlcore/liberty/Library.h"
 
 namespace Liberty {
 

crlcore/src/liberty/Tokenizer.cpp

@@ -13,7 +13,7 @@
 // |  C++ Module  :  "./Tokenizer.cpp"                               |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/Tokenizer.h"
+#include "crlcore/liberty/Tokenizer.h"
 #include <cstddef>
 #include <iostream>
 #include <string>

crlcore/src/liberty/Value.cpp

@@ -13,7 +13,7 @@
 // |  C++ Module  :  "./Library.cpp"                                 |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/Value.h"
+#include "crlcore/liberty/Value.h"
 
 namespace Liberty {
 

crlcore/src/liberty/ValueString.cpp

@@ -13,8 +13,8 @@
 // |  C++ Module  :  "./ValueString.cpp"                             |
 // +-----------------------------------------------------------------+
 
-#include "hurricane/liberty/ValueString.h"
-#include "hurricane/liberty/Value.h"
+#include "crlcore/liberty/ValueString.h"
+#include "crlcore/liberty/Value.h"
 
 namespace Liberty {
 

hurricane/src/meson.build

@@ -4,8 +4,7 @@ hurricane_includes = include_directories(
   'isobar',
   'configuration',
   'analog',
-  'viewer',
-  'liberty'
+  'viewer'
 )
 
 hurricane_deps = [qt_deps, py_deps, rapidjson, boost]
@@ -16,7 +15,6 @@ subdir('isobar')
 subdir('configuration')
 subdir('analog')
 subdir('viewer')
-subdir('liberty')
 
 py.extension_module(
   'Hurricane',
@@ -29,7 +27,7 @@ py.extension_module(
 )
 
 Hurricane = declare_dependency(
-  link_with: [viewer,analog,configuration,isobar,utilities,hurricane,liberty],
+  link_with: [viewer,analog,configuration,isobar,utilities,hurricane],
   include_directories: hurricane_includes,
   dependencies: [qt_deps, py_deps, boost, rapidjson]
 )