rename directory xfor -> xpr

src/include/base/types.h

@@ -81,42 +81,42 @@ namespace CNORXZ
     template <typename T>
     class Allocator;
 
-    // definition: ranges/xfor/pos_type.h
+    // definition: ranges/xpr/pos_type.h
     template <class PosT>
     class CPosInterface;
 
-    // definition: ranges/xfor/vpos_type.h
+    // definition: ranges/xpr/vpos_type.h
     class VPosBase;
 
-    // definition: ranges/xfor/vpos_type.h
+    // definition: ranges/xpr/vpos_type.h
     template <class PosT>
     class VPos;
 
-    // definition: ranges/xfor/vpos_type.h
+    // definition: ranges/xpr/vpos_type.h
     template <class PosT>
     class VPosRef;
 
-    // definition: ranges/xfor/pos_type.h
+    // definition: ranges/xpr/pos_type.h
     class UPos;
 
-    // definition: ranges/xfor/pos_type.h
+    // definition: ranges/xpr/pos_type.h
     template <SizeT N>
     class SPos;
 
-    // definition: ranges/xfor/pos_type.h
+    // definition: ranges/xpr/pos_type.h
     class FPos;
 
-    // definition: ranges/xfor/pos_type.h
+    // definition: ranges/xpr/pos_type.h
     template <SizeT N, SizeT... Ms>
     class SFPos;
 
-    // definition: ranges/xfor/pos_type.h
+    // definition: ranges/xpr/pos_type.h
     class DPos;
 
-    // definition: ranges/xfor/pos_type.h
+    // definition: ranges/xpr/pos_type.h
     class DPosRef;
 
-    // definition: ranges/xfor/pos_type.h
+    // definition: ranges/xpr/pos_type.h
     template <class PosT1, class PosT2>
     class MPos;
 

src/include/operation/cxz_operation.cc.h

@@ -1,6 +1,6 @@
 
 #include "cxz_operation.h"
-#include "xfor/exttype.h"
+#include "xpr/pos_type.h"
 #include "ranges/range_helper.h"
 
 

src/include/ranges/crange.h

@@ -5,7 +5,6 @@
 #include "base/base.h"
 #include "ranges/index_base.h"
 #include "ranges/range_base.h"
-//#include "xfor/for_type.h"
 
 namespace CNORXZ
 {

src/include/ranges/prange.h

@@ -13,7 +13,7 @@
 #include "ranges/x_to_string.h"
 #include "ranges/type_map.h"
 
-#include "xfor/for_type.h"
+#include "xpr/for_type.h"
 
 namespace CNORXZ
 {

src/include/ranges/urange.h

@@ -6,7 +6,7 @@
 #include "base/base.h"
 #include "ranges/index_base.h"
 #include "ranges/range_base.h"
-#include "xfor/for_type.h"
+#include "xpr/for_type.h"
 
 namespace CNORXZ
 {

src/include/ranges/xpr/xpr.h

@@ -2,4 +2,4 @@
 #include "vpos_type.h"
 #include "pos_type.h"
 
-#include "xfor.cc.h"
+#include "xpr.cc.h"

src/include/utils/helper_tools.h

@@ -7,7 +7,7 @@
 #include <ostream>
 #include "map_range.h"
 #include <functional>
-#include "xfor/iloop.h"
+#include "xpr/iloop.h"
 
 namespace CNORXZ
 {

src/tests/CMakeLists.txt

@@ -12,10 +12,10 @@ add_library(test_lib STATIC ${test_SOURCES})
 #target_link_libraries(iutest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz)
 #add_test(NAME iutest COMMAND iutest)
 
-add_executable(xfutest xfor_unit_test.cc)
+add_executable(xprutest xpr_unit_test.cc)
-add_dependencies(xfutest cnorxz)
+add_dependencies(xprutest cnorxz)
-target_link_libraries(xfutest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz test_lib)
+target_link_libraries(xprutest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz test_lib)
-add_test(NAME xfutest COMMAND xfutest)
+add_test(NAME xprutest COMMAND xprutest)
 
 add_executable(rutest range_unit_test.cc)
 add_dependencies(rutest cnorxz)

src/tests/xpr_unit_test.cc

@@ -1,7 +1,7 @@
 
 #include "gtest/gtest.h"
 
-#include "ranges/xfor/xfor.h"
+#include "ranges/xpr/xpr.h"
 
 namespace
 {