diff --git a/acompaction2/makefile b/acompaction2/makefile
index 224fdc163b8db44991559bcbe7a5d71a1e4eef08..54cb12421dcf7dcd48b32d1c4c656d6108a59f51 100644
--- a/acompaction2/makefile
+++ b/acompaction2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/acompare2/makefile b/acompare2/makefile
index eb4bd68c72ce7791d4529c72bea63eac0cefa033..f558b3a5ab239c8f2df07a8ececa9ddf8d6bcd5a 100644
--- a/acompare2/makefile
+++ b/acompare2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/acompare2/src/GrammarCompare.cpp b/acompare2/src/GrammarCompare.cpp
index 1cb58fc7dcf0f641cc610aaec358519f5716a53c..d290b68b072bc535f10e2d9b874b0fffc2e9d231 100644
--- a/acompare2/src/GrammarCompare.cpp
+++ b/acompare2/src/GrammarCompare.cpp
@@ -16,8 +16,6 @@
#include <iostream>
#include <algorithm>
-#include "std/set.hpp"
-
#include "grammar/Regular/LeftLG.h"
#include "grammar/Regular/LeftRG.h"
#include "grammar/Regular/RightLG.h"
diff --git a/aconversions2/makefile b/aconversions2/makefile
index 92946732490fa76fb5496593d8c742855ce6c1b6..eb999bde3e59e43207cdc4c8aace77c8c08032b3 100644
--- a/aconversions2/makefile
+++ b/aconversions2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/aconvert2/makefile b/aconvert2/makefile
index d2b3672e2f24e9e2f4828f240a8ebeebce257e36..796754115f33091a0d97d33ad2855e23fe32dbe6 100644
--- a/aconvert2/makefile
+++ b/aconvert2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/aderivation2/makefile b/aderivation2/makefile
index 9cd8171418d64f40f7260130e0817a5bdea2d07d..e8a7e0f4c8f29efcb72e0195bff27f774ddb23ac 100644
--- a/aderivation2/makefile
+++ b/aderivation2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/adeterminize2/makefile b/adeterminize2/makefile
index 82434fd94a7b9542d69046f15dfb59a38a9a86d7..7662ce0846b6b2eaa463474d9e7e52dd803b7ac6 100644
--- a/adeterminize2/makefile
+++ b/adeterminize2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/aecho2/makefile b/aecho2/makefile
index e0048859608d959c1ecd2d441eaee3b9511a239e..8ea57b8356653ec50b4a4974cc8e3478f07a15ac 100644
--- a/aecho2/makefile
+++ b/aecho2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/aepsilon2/makefile b/aepsilon2/makefile
index f581cd56fe80d55e9f0c4879b2f2a12eaacae064..99581daffa08774c1ece0277da4625199a2014f3 100644
--- a/aepsilon2/makefile
+++ b/aepsilon2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/agenerate2/makefile b/agenerate2/makefile
index e6bb92dec3e0b90b9e79b8b4fe46f04c12bac6a1..564620d742d6bd4d21d237a734787188187bf1f5 100644
--- a/agenerate2/makefile
+++ b/agenerate2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/aintegral2/makefile b/aintegral2/makefile
index 931850aeca5a6274b6dab7bc086de044032e9f19..b308559353acf55cc016fa6a2e7b78e3a3efe102 100644
--- a/aintegral2/makefile
+++ b/aintegral2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/alangop2/makefile b/alangop2/makefile
index 727b693d3b69ae5bc6edf4dad710ba743e544fac..9c3acc107494e9c54cd35f07766b8ce9ea2a0839 100644
--- a/alangop2/makefile
+++ b/alangop2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/alib2algo/makefile b/alib2algo/makefile
index 897b60a322fe2833ea888c0ee081ef45e67193ef..ffd0a575b58cca1d515edc11e486ee70d2686db8 100644
--- a/alib2algo/makefile
+++ b/alib2algo/makefile
@@ -9,11 +9,11 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -rdynamic -shared -lxml2
-TEST_LDFLAGS_DEBUG:= -Llib-debug -L../alib2data/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lcppunit -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -rdynamic -shared -lxml2
+TEST_LDFLAGS_DEBUG:= -Llib-debug -L../alib2std/lib-debug -L../alib2data/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lcppunit -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -rdynamic -shared -lxml2
-TEST_LDFLAGS_RELEASE:= -Llib-release -L../alib2data/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lcppunit -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -rdynamic -shared -lxml2
+TEST_LDFLAGS_RELEASE:= -Llib-release -L../alib2std/lib-release -L../alib2data/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lcppunit -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
@@ -43,7 +43,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src/ -I../../\$$(DEPTH)alib2data/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
@@ -95,7 +95,7 @@ test-obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../\$$(DEPTH)src/ -I../../\$$(DEPTH)alib2data/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../\$$(DEPTH)src/ -I../../\$$(DEPTH)alib2std/src/ -I../../\$$(DEPTH)alib2data/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
@@ -203,10 +203,10 @@ build-tests-release: test-bin-release/$(TESTBIN)
unit-test-debug: build-tests-debug
- LD_LIBRARY_PATH="../alib2data/lib-debug;lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="../alib2std/lib-debug;../alib2data/lib-debug;lib-debug" test-bin-debug/$(TESTBIN)
unit-test-release: build-tests-release
- LD_LIBRARY_PATH="../alib2data/lib-release;lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="../alib2std/lib-release;../alib2data/lib-release;lib-release" test-bin-release/$(TESTBIN)
diff --git a/alib2algo/src/automaton/determinize/DeterminizeRHDPDAPart.cxx b/alib2algo/src/automaton/determinize/DeterminizeRHDPDAPart.cxx
index 54ba103d19b96fac11e6bcffc8895fe656544eb3..ce8be6bf664a658e90665862270544262a661fe2 100644
--- a/alib2algo/src/automaton/determinize/DeterminizeRHDPDAPart.cxx
+++ b/alib2algo/src/automaton/determinize/DeterminizeRHDPDAPart.cxx
@@ -13,8 +13,7 @@
#include "alphabet/LabeledSymbol.h"
#include "label/Label.h"
#include "exception/AlibException.h"
-#include <std/set.hpp>
-#include <iostream>
+#include <set>
namespace automaton {
diff --git a/alib2algo/src/automaton/determinize/DeterminizeVPAPart.cxx b/alib2algo/src/automaton/determinize/DeterminizeVPAPart.cxx
index 0398cc35ffdea9eeeef1ec1fd4b8058c2b7b376e..fb77c6f1441d6e9edc87be9558b22d8170eb9399 100644
--- a/alib2algo/src/automaton/determinize/DeterminizeVPAPart.cxx
+++ b/alib2algo/src/automaton/determinize/DeterminizeVPAPart.cxx
@@ -12,8 +12,7 @@
#include "alphabet/Symbol.h"
#include "alphabet/LabeledSymbol.h"
#include "label/Label.h"
-#include <std/set.hpp>
-#include <iostream>
+#include <set>
namespace automaton {
diff --git a/alib2algo/src/automaton/determinize/common/RHDPDACommon.h b/alib2algo/src/automaton/determinize/common/RHDPDACommon.h
index cf3e66e356fe1f4b86ef8a91566a35175dd7e4c5..cfeb72c6ba8cfba33fee0ae2b7931ec9da1597a9 100644
--- a/alib2algo/src/automaton/determinize/common/RHDPDACommon.h
+++ b/alib2algo/src/automaton/determinize/common/RHDPDACommon.h
@@ -5,7 +5,7 @@
#include "automaton/common/State.h"
#include "alphabet/Symbol.h"
#include "string/Epsilon.h"
-#include "std/variant.hpp"
+#include <variant>
#include <set>
#include <map>
diff --git a/alib2algo/src/automaton/properties/AllEpsilonClosure.cpp b/alib2algo/src/automaton/properties/AllEpsilonClosure.cpp
index 1c0eca206b84eca8e951e7b1bb1f53e7b33bf6bd..1f3af73a94a0d5be9168ba57d29b0490a12cc630 100644
--- a/alib2algo/src/automaton/properties/AllEpsilonClosure.cpp
+++ b/alib2algo/src/automaton/properties/AllEpsilonClosure.cpp
@@ -18,7 +18,6 @@
#include <set>
#include <map>
#include <deque>
-#include <std/map.hpp>
#include <iostream>
#include "../../regexp/properties/RegExpEpsilon.h"
diff --git a/alib2algo/src/automaton/transform/RHPDAToPDA.cpp b/alib2algo/src/automaton/transform/RHPDAToPDA.cpp
index f5f03a34051943b2d8454b18ad747cbf82dc15c7..0e6e03742095131e208067d53c576e0b7b32deba 100644
--- a/alib2algo/src/automaton/transform/RHPDAToPDA.cpp
+++ b/alib2algo/src/automaton/transform/RHPDAToPDA.cpp
@@ -20,8 +20,6 @@
#include <queue>
#include <iostream>
-#include <std/map.hpp>
-
namespace automaton {
automaton::DPDA RHPDAToPDA::convert( const automaton::RealTimeHeightDeterministicDPDA & pda ) {
diff --git a/alib2algo/src/grammar/properties/NonterminalUnitRuleCycle.cpp b/alib2algo/src/grammar/properties/NonterminalUnitRuleCycle.cpp
index e969139dfc647d684391d29fbffd7dd29877c94a..2534518e51fd46854e4d8d8b3e0eb0e078577fab 100644
--- a/alib2algo/src/grammar/properties/NonterminalUnitRuleCycle.cpp
+++ b/alib2algo/src/grammar/properties/NonterminalUnitRuleCycle.cpp
@@ -17,7 +17,7 @@
#include <grammar/Regular/RightLG.h>
#include <grammar/Regular/RightRG.h>
-#include <std/set.hpp>
+#include <set>
#include <deque>
namespace grammar {
diff --git a/alib2algo/src/grammar/simplify/LeftRecursionRemover.cpp b/alib2algo/src/grammar/simplify/LeftRecursionRemover.cpp
index ca28199255ad6e36a527a3a1144c539d2082109b..64cc8d11019e0bb4525b5eaac7e7c0deebc78137 100644
--- a/alib2algo/src/grammar/simplify/LeftRecursionRemover.cpp
+++ b/alib2algo/src/grammar/simplify/LeftRecursionRemover.cpp
@@ -8,7 +8,7 @@
#include "LeftRecursionRemover.h"
#include "../convert/ToGrammarRightRG.h"
-#include "std/vector.hpp"
+#include <vector>
namespace grammar {
diff --git a/alib2algo/src/grammar/simplify/UnproductiveSymbolsRemover.cpp b/alib2algo/src/grammar/simplify/UnproductiveSymbolsRemover.cpp
index 43d2044ab0db60b6d023888d18b7be9bbeb21233..c6dcdefbf3ed3ac16fa837bb03f0223d60bb72f4 100644
--- a/alib2algo/src/grammar/simplify/UnproductiveSymbolsRemover.cpp
+++ b/alib2algo/src/grammar/simplify/UnproductiveSymbolsRemover.cpp
@@ -17,7 +17,7 @@
#include <grammar/Regular/RightLG.h>
#include <grammar/Regular/RightRG.h>
-#include <std/set.hpp>
+#include <set>
#include "../properties/ProductiveNonterminals.h"
diff --git a/alib2algo/src/grammar/simplify/UnreachableSymbolsRemover.cpp b/alib2algo/src/grammar/simplify/UnreachableSymbolsRemover.cpp
index 627d6d469f2d2f2d3173175fcfd041584234929d..0aa86a1a88af808de2b057cb1b17dcb617e554ca 100644
--- a/alib2algo/src/grammar/simplify/UnreachableSymbolsRemover.cpp
+++ b/alib2algo/src/grammar/simplify/UnreachableSymbolsRemover.cpp
@@ -17,7 +17,7 @@
#include <grammar/Regular/RightLG.h>
#include <grammar/Regular/RightRG.h>
-#include <std/set.hpp>
+#include <set>
#include "../properties/UnreachableSymbols.h"
diff --git a/alib2algo/src/regexp/convert/ToAutomatonDerivation.cpp b/alib2algo/src/regexp/convert/ToAutomatonDerivation.cpp
index 54810cbcc9d55c895aa9549da6c26055d579fecb..701a81f9fc60dd0ec5f04e3f777ad1523ff25c05 100644
--- a/alib2algo/src/regexp/convert/ToAutomatonDerivation.cpp
+++ b/alib2algo/src/regexp/convert/ToAutomatonDerivation.cpp
@@ -13,7 +13,7 @@
#include <vector>
#include <string/LinearString.h>
-#include <std/hexavigesimal.h>
+#include <hexavigesimal>
#include "../transform/RegExpDerivation.h"
#include "../simplify/RegExpOptimize.h"
diff --git a/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.cpp b/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.cpp
index 1f9106c2a9624b82db2353ee8398f2c70341ff6f..b11a8941fd5e4f8c4b1487a4d5c6779c53afffbb 100644
--- a/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.cpp
+++ b/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.cpp
@@ -12,7 +12,7 @@
#include <set>
#include <vector>
-#include <std/hexavigesimal.h>
+#include <hexavigesimal>
#include "../simplify/RegExpOptimize.h"
#include "../transform/RegExpDerivation.h"
diff --git a/alib2algo/src/string/simplify/NormalizeAlphabet.cpp b/alib2algo/src/string/simplify/NormalizeAlphabet.cpp
index ef83a38e1d641e71db4696eef1200dfc487be301..34f4709f24863991ccbab0e6cc13d1ece267b78f 100644
--- a/alib2algo/src/string/simplify/NormalizeAlphabet.cpp
+++ b/alib2algo/src/string/simplify/NormalizeAlphabet.cpp
@@ -7,7 +7,7 @@
#include "NormalizeAlphabet.h"
-#include "std/map.hpp"
+#include <map>
#include <deque>
#include <vector>
#include <set>
diff --git a/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp
index 4496970975877dd4212bd74b63fe1e3bc7e9ac10..c93902552f000eb3870d176e456ba44867706920 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp
@@ -5,7 +5,7 @@
#include "grammar/ContextFree/CFG.h"
#include "grammar/ContextFree/EpsilonFreeCFG.h"
-#include "std/pair.hpp"
+#include <pair>
#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
diff --git a/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
index eebc207ec3ce7bfed516cdabd26fc7b627ebe13e..c380d7864aa32f13ea2bba3a3b58fa0780772e19 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
@@ -9,7 +9,7 @@
#include "alphabet/UniqueSymbol.h"
#include "primitive/Integer.h"
-#include "std/pair.hpp"
+#include <pair>
#include <factory/StringDataFactory.hpp>
diff --git a/alib2data/makefile b/alib2data/makefile
index 8113758af5be1e4b89bd8fe7e0e3e5799f9b5418..b7f555aeeda9d86c81720899280f71e7fb1247ca 100644
--- a/alib2data/makefile
+++ b/alib2data/makefile
@@ -9,11 +9,11 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-lbfd -liberty -lz -ldl -rdynamic -shared -lxml2
-TEST_LDFLAGS_DEBUG:= -Llib-debug -rdynamic -lxml2 -lalib2data -lcppunit -Wl,-rpath,.
+LDFLAGS_DEBUG:=-lbfd -liberty -lz -ldl -L../alib2std/lib-debug -rdynamic -shared -lxml2
+TEST_LDFLAGS_DEBUG:= -Llib-debug -L../alib2std/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lcppunit -Wl,-rpath,.
-LDFLAGS_RELEASE:=-rdynamic -shared -lxml2
-TEST_LDFLAGS_RELEASE:= -Llib-release -rdynamic -lxml2 -lalib2data -lcppunit -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -rdynamic -shared -lxml2
+TEST_LDFLAGS_RELEASE:= -Llib-release -L../alib2std/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lcppunit -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
@@ -41,7 +41,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
@@ -93,7 +93,7 @@ test-obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src/ -I../../\$$(DEPTH)alib2data/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
@@ -201,10 +201,10 @@ build-tests-release: test-bin-release/$(TESTBIN)
unit-test-debug: build-tests-debug
- LD_LIBRARY_PATH="lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="../alib2std/lib-debug;lib-debug" test-bin-debug/$(TESTBIN)
unit-test-release: build-tests-release
- LD_LIBRARY_PATH="lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="../alib2std/lib-release;lib-release" test-bin-release/$(TESTBIN)
diff --git a/alib2data/src/alphabet/Symbol.h b/alib2data/src/alphabet/Symbol.h
index 7ed432233d51056790b6d4b34eec2f5ad0bfb9fb..ed9020385eb53f63bc9fc81607050f910b26d802 100644
--- a/alib2data/src/alphabet/Symbol.h
+++ b/alib2data/src/alphabet/Symbol.h
@@ -8,8 +8,6 @@
#ifndef SYMBOL_H_
#define SYMBOL_H_
-#include "../std/visitor.hpp"
-#include "../std/compare.hpp"
#include "SymbolBase.h"
#include "../common/wrapper.hpp"
diff --git a/alib2data/src/alphabet/SymbolBase.h b/alib2data/src/alphabet/SymbolBase.h
index 6bbf45e44b6b420b728c20273449475ab5b1cac5..44781e16d14fdad0428356d2b81fe723ae9ab7c8 100644
--- a/alib2data/src/alphabet/SymbolBase.h
+++ b/alib2data/src/alphabet/SymbolBase.h
@@ -8,7 +8,6 @@
#ifndef SYMBOL_BASE_H_
#define SYMBOL_BASE_H_
-#include "../common/base.hpp"
#include "../object/ObjectBase.h"
namespace alphabet {
diff --git a/alib2data/src/alphabet/SymbolPairSymbol.cpp b/alib2data/src/alphabet/SymbolPairSymbol.cpp
index 247598e259b369ec33a0b541a81a8e7dbee2f0f5..963974706e8d6f29a266c747a506c9e88c27040a 100644
--- a/alib2data/src/alphabet/SymbolPairSymbol.cpp
+++ b/alib2data/src/alphabet/SymbolPairSymbol.cpp
@@ -6,7 +6,6 @@
*/
#include "SymbolPairSymbol.h"
-#include "../std/pair.hpp"
#include <sstream>
namespace alphabet {
diff --git a/alib2data/src/alphabet/SymbolPairSymbol.h b/alib2data/src/alphabet/SymbolPairSymbol.h
index 66d0b15bf1ce8197da6d7db3365664a4bce6f99c..b44583e9a33735698370c4f40fa63f84a30277be 100644
--- a/alib2data/src/alphabet/SymbolPairSymbol.h
+++ b/alib2data/src/alphabet/SymbolPairSymbol.h
@@ -13,7 +13,7 @@
#include "Symbol.h"
#include "SymbolBase.h"
-#include <set>
+#include <pair>
namespace alphabet {
diff --git a/alib2data/src/alphabet/SymbolSetSymbol.cpp b/alib2data/src/alphabet/SymbolSetSymbol.cpp
index ebc35d6eb9e8d0de2085cbbb09fb49b02da50ee4..e3506b8986d5f66fba438b7d8de099cba8c2d9c3 100644
--- a/alib2data/src/alphabet/SymbolSetSymbol.cpp
+++ b/alib2data/src/alphabet/SymbolSetSymbol.cpp
@@ -6,7 +6,6 @@
*/
#include "SymbolSetSymbol.h"
-#include "../std/set.hpp"
#include <sstream>
namespace alphabet {
diff --git a/alib2data/src/alphabet/UniqueSymbol.cpp b/alib2data/src/alphabet/UniqueSymbol.cpp
index c5ef63b65fa04fb696d8a0e8b6a9a5f1b6414091..9508191b2b35dadae9d33a50134efc2a62485bdc 100644
--- a/alib2data/src/alphabet/UniqueSymbol.cpp
+++ b/alib2data/src/alphabet/UniqueSymbol.cpp
@@ -6,7 +6,6 @@
*/
#include "UniqueSymbol.h"
-#include "../std/set.hpp"
#include <sstream>
namespace alphabet {
diff --git a/alib2data/src/automaton/Automaton.h b/alib2data/src/automaton/Automaton.h
index 41a7ec159bb36b9610b011b9835b5bfe618c6edf..c86b6636bc76ee01944f5e7e735111506b80e6a5 100644
--- a/alib2data/src/automaton/Automaton.h
+++ b/alib2data/src/automaton/Automaton.h
@@ -8,8 +8,6 @@
#ifndef AUTOMATON_H_
#define AUTOMATON_H_
-#include "../std/visitor.hpp"
-#include "../std/compare.hpp"
#include "AutomatonBase.h"
#include "../common/wrapper.hpp"
diff --git a/alib2data/src/automaton/AutomatonBase.h b/alib2data/src/automaton/AutomatonBase.h
index 088b3b2d246a658995c03f8276fa531c7d21ca0b..e98ef8e7cad1be867ffac516c970b713ed4d9bdc 100644
--- a/alib2data/src/automaton/AutomatonBase.h
+++ b/alib2data/src/automaton/AutomatonBase.h
@@ -8,7 +8,6 @@
#ifndef AUTOMATON_BASE_H_
#define AUTOMATON_BASE_H_
-#include "../common/base.hpp"
#include "../object/ObjectBase.h"
#include "../exception/AlibException.h"
diff --git a/alib2data/src/automaton/AutomatonFromStringLexer.cpp b/alib2data/src/automaton/AutomatonFromStringLexer.cpp
index d0bae416bcecf0fe92a01752e07fbc1ad86c5f4e..974028c2b0853aec6f3ee5609d95a94977f0b495 100644
--- a/alib2data/src/automaton/AutomatonFromStringLexer.cpp
+++ b/alib2data/src/automaton/AutomatonFromStringLexer.cpp
@@ -6,7 +6,7 @@
*/
#include "AutomatonFromStringLexer.h"
-#include "../std/istream.h"
+#include <istream>
namespace automaton {
diff --git a/alib2data/src/automaton/AutomatonFromStringParser.h b/alib2data/src/automaton/AutomatonFromStringParser.h
index 8f6289449ec60723d9628d38b3a8b306a45055a9..640b1b7dee906130652f0bec9c84fd5603f5f867 100644
--- a/alib2data/src/automaton/AutomatonFromStringParser.h
+++ b/alib2data/src/automaton/AutomatonFromStringParser.h
@@ -15,7 +15,7 @@
#include "common/State.h"
#include <tuple>
-#include "../std/variant.hpp"
+#include <variant>
#include "../string/Epsilon.h"
namespace alib {
diff --git a/alib2data/src/automaton/AutomatonFromXMLParser.cpp b/alib2data/src/automaton/AutomatonFromXMLParser.cpp
index d57e4e0bdc0d68c6afa164ac010eadc45384c5d6..893d816a4f0dbb8abb74f4ebec11cc866169a1ab 100644
--- a/alib2data/src/automaton/AutomatonFromXMLParser.cpp
+++ b/alib2data/src/automaton/AutomatonFromXMLParser.cpp
@@ -463,7 +463,6 @@ OneTapeDTM AutomatonFromXMLParser::parseOneTapeDTM(std::deque<sax::Token>& input
automaton.setStates(std::move(states));
automaton.setTapeAlphabet(std::move(tapeSymbols));
automaton.setInputAlphabet(std::move(inputSymbols));
- automaton.setInitialState(std::move(initialState));
automaton.setFinalStates(std::move(finalStates));
parseTransitions<OneTapeDTM>(input, automaton);
diff --git a/alib2data/src/automaton/AutomatonFromXMLParser.h b/alib2data/src/automaton/AutomatonFromXMLParser.h
index 5dd4f29fde67a2126064750d73559f37b449ab79..9e4a3eb64c2ce10e93b1c3894b6258f7b33dd461 100644
--- a/alib2data/src/automaton/AutomatonFromXMLParser.h
+++ b/alib2data/src/automaton/AutomatonFromXMLParser.h
@@ -31,7 +31,7 @@
#include <list>
#include <set>
-#include "../std/variant.hpp"
+#include <variant>
#include "../sax/Token.h"
namespace alib {
diff --git a/alib2data/src/automaton/AutomatonToStringComposer.h b/alib2data/src/automaton/AutomatonToStringComposer.h
index d520fcfc6ab0e313b8831a719c43039e0dcfdb56..d0b324f8a03246d6b71e5092aaf84ca4ddc2e8ec 100644
--- a/alib2data/src/automaton/AutomatonToStringComposer.h
+++ b/alib2data/src/automaton/AutomatonToStringComposer.h
@@ -8,7 +8,7 @@
#ifndef AUTOMATON_TO_STRING_COMPOSER_H_
#define AUTOMATON_TO_STRING_COMPOSER_H_
-#include <sstream>
+#include <ostream>
#include "Automaton.h"
#include "FSM/DFA.h"
#include "FSM/NFA.h"
diff --git a/alib2data/src/automaton/FSM/CompactNFA.cpp b/alib2data/src/automaton/FSM/CompactNFA.cpp
index 377b2322fa3b0283c2c66e2c54befd9926f079fa..17fcf596191728ba87a47f15898a56cd3bfca0cf 100644
--- a/alib2data/src/automaton/FSM/CompactNFA.cpp
+++ b/alib2data/src/automaton/FSM/CompactNFA.cpp
@@ -11,7 +11,6 @@
#include "NFA.h"
#include "DFA.h"
#include "../Automaton.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include "../../string/StringAlphabetGetter.h"
#include <ostream>
diff --git a/alib2data/src/automaton/FSM/DFA.cpp b/alib2data/src/automaton/FSM/DFA.cpp
index 469d7fbd6e4c8976a642bf2693f42d1b43b3865c..37eeec4bc36b5cbd17e24f9a5908252141699b3e 100644
--- a/alib2data/src/automaton/FSM/DFA.cpp
+++ b/alib2data/src/automaton/FSM/DFA.cpp
@@ -6,8 +6,6 @@
*/
#include "DFA.h"
-#include "../../std/set.hpp"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include <ostream>
#include <sstream>
diff --git a/alib2data/src/automaton/FSM/EpsilonNFA.cpp b/alib2data/src/automaton/FSM/EpsilonNFA.cpp
index 7f8f4c2153f52468314c8c14ed894e01020b5763..7ca5ab09f04f0500389b94a350c008814617ee85 100644
--- a/alib2data/src/automaton/FSM/EpsilonNFA.cpp
+++ b/alib2data/src/automaton/FSM/EpsilonNFA.cpp
@@ -9,7 +9,6 @@
#include "MultiInitialStateNFA.h"
#include "NFA.h"
#include "DFA.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include "../Automaton.h"
#include <ostream>
diff --git a/alib2data/src/automaton/FSM/EpsilonNFA.h b/alib2data/src/automaton/FSM/EpsilonNFA.h
index b81c21ca578551bbb1d9cbc26e5d185ec69d0520..ff1c13f705f8a6b6af6ab1466a994d791e96bf68 100644
--- a/alib2data/src/automaton/FSM/EpsilonNFA.h
+++ b/alib2data/src/automaton/FSM/EpsilonNFA.h
@@ -9,7 +9,7 @@
#define EPSILON_NFA_H_
#include <map>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../AutomatonBase.h"
#include "../common/SingleInitialState.h"
#include "../common/InputAlphabet.h"
diff --git a/alib2data/src/automaton/FSM/ExtendedNFA.cpp b/alib2data/src/automaton/FSM/ExtendedNFA.cpp
index cd47758857d83ff96e7ee2ff8dd5bacaeff89a44..f79bbabbf466291bc48bc5e8ab35baa9026f907e 100644
--- a/alib2data/src/automaton/FSM/ExtendedNFA.cpp
+++ b/alib2data/src/automaton/FSM/ExtendedNFA.cpp
@@ -11,7 +11,6 @@
#include "MultiInitialStateNFA.h"
#include "NFA.h"
#include "DFA.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include "../Automaton.h"
#include "../../regexp/RegExp.h"
diff --git a/alib2data/src/automaton/FSM/MultiInitialStateNFA.h b/alib2data/src/automaton/FSM/MultiInitialStateNFA.h
index 225934266449f7c5e7aac86d72b700b1440023bc..ee1a836d2ae4f69e60000f5c2a4d684fab2fece5 100644
--- a/alib2data/src/automaton/FSM/MultiInitialStateNFA.h
+++ b/alib2data/src/automaton/FSM/MultiInitialStateNFA.h
@@ -9,7 +9,6 @@
#define MULTI_INITIAL_STATE_NFA_H_
#include <map>
-#include "../../std/map.hpp"
#include "../AutomatonBase.h"
#include "../common/MultiInitialStates.h"
#include "../common/InputAlphabet.h"
diff --git a/alib2data/src/automaton/FSM/NFA.h b/alib2data/src/automaton/FSM/NFA.h
index 29f83698ebd43791253a7c584b07f826170a2162..878b3ae0689b9119e77f7c9868bfd1573976d2fb 100644
--- a/alib2data/src/automaton/FSM/NFA.h
+++ b/alib2data/src/automaton/FSM/NFA.h
@@ -9,7 +9,6 @@
#define NFA_H_
#include <map>
-#include "../../std/map.hpp"
#include "../AutomatonBase.h"
#include "../common/SingleInitialState.h"
#include "../common/InputAlphabet.h"
diff --git a/alib2data/src/automaton/PDA/DPDA.cpp b/alib2data/src/automaton/PDA/DPDA.cpp
index c68924fe3fc8d04975d939704b184b5ef0bd2910..cad653a7b73f502a4f25ac7a09de148be84f0252 100644
--- a/alib2data/src/automaton/PDA/DPDA.cpp
+++ b/alib2data/src/automaton/PDA/DPDA.cpp
@@ -6,7 +6,6 @@
*/
#include "DPDA.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/automaton/PDA/DPDA.h b/alib2data/src/automaton/PDA/DPDA.h
index 9c51d6e5dd75bdd27d182d1ec1e408e0c46d5f5f..c160cb48297e7fe27b589af9967f6a525dcc14a2 100644
--- a/alib2data/src/automaton/PDA/DPDA.h
+++ b/alib2data/src/automaton/PDA/DPDA.h
@@ -11,7 +11,7 @@
#include <set>
#include <map>
#include <vector>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../AutomatonBase.h"
#include "../common/SingleInitialState.h"
#include "../common/SingleInitialSymbolPushdownStoreAlphabet.h"
diff --git a/alib2data/src/automaton/PDA/InputDrivenDPDA.h b/alib2data/src/automaton/PDA/InputDrivenDPDA.h
index 97b6d2fceb7d3b4904ae899b2ef0bfc36904dd8e..b256d9312809a7b45716da034ec9c5a4ea3059f0 100644
--- a/alib2data/src/automaton/PDA/InputDrivenDPDA.h
+++ b/alib2data/src/automaton/PDA/InputDrivenDPDA.h
@@ -8,7 +8,8 @@
#ifndef INPUT_DRIVEN_DPDA_H_
#define INPUT_DRIVEN_DPDA_H_
-#include "../../std/map.hpp"
+#include <map>
+#include <vector>
#include "../AutomatonBase.h"
#include "../common/SingleInitialState.h"
#include "../common/InputAlphabet.h"
diff --git a/alib2data/src/automaton/PDA/InputDrivenNPDA.h b/alib2data/src/automaton/PDA/InputDrivenNPDA.h
index 1835d1cb1a1f7f54fcc246bd9e607e187501794a..a7ad529c2b8d36d599c7e7d16b4b40f2640fec65 100644
--- a/alib2data/src/automaton/PDA/InputDrivenNPDA.h
+++ b/alib2data/src/automaton/PDA/InputDrivenNPDA.h
@@ -8,7 +8,8 @@
#ifndef INPUT_DRIVEN_NPDA_H_
#define INPUT_DRIVEN_NPDA_H_
-#include "../../std/map.hpp"
+#include <map>
+#include <vector>
#include "../AutomatonBase.h"
#include "../common/SingleInitialState.h"
#include "../common/InputAlphabet.h"
diff --git a/alib2data/src/automaton/PDA/NPDA.cpp b/alib2data/src/automaton/PDA/NPDA.cpp
index 6c63d114334b22a1d8d3b4226bea365e3eb0e216..120ba5ed18d4f59cb96568d49b65d2ce2f8b3ef2 100644
--- a/alib2data/src/automaton/PDA/NPDA.cpp
+++ b/alib2data/src/automaton/PDA/NPDA.cpp
@@ -6,7 +6,6 @@
*/
#include "NPDA.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/automaton/PDA/NPDA.h b/alib2data/src/automaton/PDA/NPDA.h
index 97108702192b33a8090feb043ef462c0482fbe8b..e5ff3ec5e14a0020cdd4c918f7d85cd501d708dd 100644
--- a/alib2data/src/automaton/PDA/NPDA.h
+++ b/alib2data/src/automaton/PDA/NPDA.h
@@ -11,7 +11,7 @@
#include <set>
#include <map>
#include <vector>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../AutomatonBase.h"
#include "../common/SingleInitialState.h"
#include "../common/SingleInitialSymbolPushdownStoreAlphabet.h"
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
index 62131674432bc5fc2b4e4e1924c1683120b918f0..662109e69bb722d321c6ab5988ba8fd99e47d7e8 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
@@ -6,7 +6,6 @@
*/
#include "RealTimeHeightDeterministicDPDA.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h
index fffde3d5bffafc7e81d6a83d4e0a5e24d790f687..63aa3890733e91ecf5767309f16ef7c7c1bab029 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.h
@@ -10,8 +10,7 @@
#include <map>
#include <vector>
-#include "../../std/map.hpp"
-#include "../../std/variant.hpp"
+#include <variant>
#include "../AutomatonBase.h"
#include "../common/SingleInitialState.h"
#include "../common/InputAlphabet.h"
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
index b4724843e03454c569a664d7cf60f6b653b6da20..394fe736c87be74b6108a7ed329c52b5bce44d42 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
@@ -6,7 +6,6 @@
*/
#include "RealTimeHeightDeterministicNPDA.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h
index b3b6911b20b013f253020c084ba05fd3ba6edb19..e1c6a23886be390c6c78e85f22800ffed8438206 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.h
@@ -10,8 +10,7 @@
#include <map>
#include <vector>
-#include "../../std/map.hpp"
-#include "../../std/variant.hpp"
+#include <variant>
#include "../AutomatonBase.h"
#include "../common/MultiInitialStates.h"
#include "../common/InputAlphabet.h"
diff --git a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
index ba7a558be4636df8298d5f0a36e78c119fa368f5..2b1edfcce370636274abc85cd85696994167e60b 100644
--- a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
+++ b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
@@ -6,7 +6,6 @@
*/
#include "SinglePopDPDA.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/automaton/PDA/SinglePopDPDA.h b/alib2data/src/automaton/PDA/SinglePopDPDA.h
index dd9a248a14bd6801a462b61b60c10ac534a6daca..b14fb3f948caaf459af3e4b04ce50518c6e922ee 100644
--- a/alib2data/src/automaton/PDA/SinglePopDPDA.h
+++ b/alib2data/src/automaton/PDA/SinglePopDPDA.h
@@ -11,7 +11,7 @@
#include <set>
#include <map>
#include <vector>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../AutomatonBase.h"
#include "../common/SingleInitialState.h"
#include "../common/SingleInitialSymbolPushdownStoreAlphabet.h"
diff --git a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
index 2a14234aafa7cebfe6c1c6c56489d7fa7390cbef..e4d5a147656c1957bb05d0f9d21a02a3ba7b662b 100644
--- a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
+++ b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
@@ -6,7 +6,6 @@
*/
#include "SinglePopNPDA.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/automaton/PDA/SinglePopNPDA.h b/alib2data/src/automaton/PDA/SinglePopNPDA.h
index cb3e381a99efa98fbbe94c152661b23ca4d42f12..8284bf1c1457c877b22f8e63a1b4600b66807339 100644
--- a/alib2data/src/automaton/PDA/SinglePopNPDA.h
+++ b/alib2data/src/automaton/PDA/SinglePopNPDA.h
@@ -11,7 +11,7 @@
#include <set>
#include <map>
#include <vector>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../AutomatonBase.h"
#include "../common/SingleInitialState.h"
#include "../common/SingleInitialSymbolPushdownStoreAlphabet.h"
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
index c4447ac516248598e90d31671a61a34cff50da47..f805b38f8b0afd2083fd02dc0cfadd1a8da67199 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
@@ -6,7 +6,6 @@
*/
#include "VisiblyPushdownDPDA.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h
index 2331ef5caab93a2289f1ffc9bcc154d2ddeb66ec..516f5305a1219d449b1fe3e1c94693516cb7dd6d 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.h
@@ -10,7 +10,6 @@
#include <map>
#include <vector>
-#include "../../std/map.hpp"
#include "../AutomatonBase.h"
#include "../common/SingleInitialState.h"
#include "../common/CallReturnLocalInputAlphabet.h"
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
index d332756b877b947ea51d71dd81ba4d96a875a9cd..69d45f5cd690c04043b6867b175960a9ee909da5 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
@@ -6,7 +6,6 @@
*/
#include "VisiblyPushdownNPDA.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h
index 721e31babcd11dab6d1171f5a523022959d84fad..9b3cb34b67acf93486e4f6b00f3e8f8def842454 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.h
@@ -10,7 +10,6 @@
#include <map>
#include <vector>
-#include "../../std/map.hpp"
#include "../AutomatonBase.h"
#include "../common/MultiInitialStates.h"
#include "../common/CallReturnLocalInputAlphabet.h"
diff --git a/alib2data/src/automaton/TM/OneTapeDTM.cpp b/alib2data/src/automaton/TM/OneTapeDTM.cpp
index f4043e36fa3e6fd33c58e0abd4dc0cc4118c31a4..c4a86cd0cca81c7317a978ba5f26e559268c19b6 100644
--- a/alib2data/src/automaton/TM/OneTapeDTM.cpp
+++ b/alib2data/src/automaton/TM/OneTapeDTM.cpp
@@ -6,7 +6,6 @@
*/
#include "OneTapeDTM.h"
-#include "../../std/map.hpp"
#include "../AutomatonException.h"
#include <sstream>
diff --git a/alib2data/src/automaton/common/InputAlphabet.cpp b/alib2data/src/automaton/common/InputAlphabet.cpp
index 8485d9485bdef170e1b20e5f2884bded44dca21a..9d880c1fa345970ea06d1dafb1cdd3316ed08aab 100644
--- a/alib2data/src/automaton/common/InputAlphabet.cpp
+++ b/alib2data/src/automaton/common/InputAlphabet.cpp
@@ -9,7 +9,6 @@
#include <algorithm>
#include "../AutomatonException.h"
-#include "../../std/set.hpp"
namespace automaton {
diff --git a/alib2data/src/automaton/common/Shift.h b/alib2data/src/automaton/common/Shift.h
index 751783b4266209fa230dffc60f9bba147daa4f58..9bd37b10f1868c0b7a98b24806c1191b4f2c03b0 100644
--- a/alib2data/src/automaton/common/Shift.h
+++ b/alib2data/src/automaton/common/Shift.h
@@ -9,7 +9,7 @@
#define SHIFT_H_
#include <string>
-#include "../../std/compare.hpp"
+#include <compare>
namespace automaton {
diff --git a/alib2data/src/std/visitor.hpp b/alib2data/src/common/visitor.hpp
similarity index 100%
rename from alib2data/src/std/visitor.hpp
rename to alib2data/src/common/visitor.hpp
diff --git a/alib2data/src/container/Container.h b/alib2data/src/container/Container.h
index 88b2471702d2bbf240a5d03fdff931985d1f9f13..07e00c9289d683c9ccd821db5bb414fdf85f6fbc 100644
--- a/alib2data/src/container/Container.h
+++ b/alib2data/src/container/Container.h
@@ -8,8 +8,6 @@
#ifndef CONTAINER_H_
#define CONTAINER_H_
-#include "../std/visitor.hpp"
-#include "../std/compare.hpp"
#include "ContainerBase.h"
#include "../common/wrapper.hpp"
diff --git a/alib2data/src/container/ContainerBase.h b/alib2data/src/container/ContainerBase.h
index 58ae13185cb3f97ec58c76bc6c098efae746d4e3..84608d550e175b068426ded35be289067c71a8b0 100644
--- a/alib2data/src/container/ContainerBase.h
+++ b/alib2data/src/container/ContainerBase.h
@@ -8,7 +8,6 @@
#ifndef CONTAINER_BASE_H_
#define CONTAINER_BASE_H_
-#include "../common/base.hpp"
#include "../object/ObjectBase.h"
namespace container {
diff --git a/alib2data/src/container/ContainerFromXMLParser.hpp b/alib2data/src/container/ContainerFromXMLParser.hpp
index 84dc6df0199378214bfcd3f6476e2f81e2bf152d..11750428cb349a1efe2c01f4c0301cda6af4102b 100644
--- a/alib2data/src/container/ContainerFromXMLParser.hpp
+++ b/alib2data/src/container/ContainerFromXMLParser.hpp
@@ -8,7 +8,7 @@
#ifndef CONTAINER_FROM_XML_PARSER_H_
#define CONTAINER_FROM_XML_PARSER_H_
-#include "../std/variant.hpp"
+#include <variant>
#include "../sax/FromXMLParserHelper.h"
#include "ContainerFeatures.h"
diff --git a/alib2data/src/container/ContainerToXMLComposer.hpp b/alib2data/src/container/ContainerToXMLComposer.hpp
index fd4d685995b37bb7b6c6f0748271534d24d2bf6a..e643f6626463852c5a4461d4a3d7fbda621bccbb 100644
--- a/alib2data/src/container/ContainerToXMLComposer.hpp
+++ b/alib2data/src/container/ContainerToXMLComposer.hpp
@@ -9,7 +9,7 @@
#define CONTAINER_TO_XML_COMPOSER_H_
#include <deque>
-#include "../std/variant.hpp"
+#include <variant>
#include "../sax/Token.h"
#include "Container.h"
diff --git a/alib2data/src/container/ObjectsMap.cpp b/alib2data/src/container/ObjectsMap.cpp
index 21e4e8b4e53f35e1ec3c0cfc96ed2d5458eef900..6e79bb8b478977e6103344fe5236198a0cf54cb7 100644
--- a/alib2data/src/container/ObjectsMap.cpp
+++ b/alib2data/src/container/ObjectsMap.cpp
@@ -6,7 +6,6 @@
*/
#include "ObjectsMap.h"
-#include "../std/map.hpp"
#include <cstdlib>
#include <iostream>
diff --git a/alib2data/src/container/ObjectsPair.cpp b/alib2data/src/container/ObjectsPair.cpp
index 0fa960ff2d300d693bcae055ca1a83fca8e8a36f..27734988fa2340cef2228230575d8f1a238e6131 100644
--- a/alib2data/src/container/ObjectsPair.cpp
+++ b/alib2data/src/container/ObjectsPair.cpp
@@ -6,7 +6,6 @@
*/
#include "ObjectsPair.h"
-#include "../std/map.hpp"
#include <cstdlib>
#include <iostream>
diff --git a/alib2data/src/container/ObjectsPair.h b/alib2data/src/container/ObjectsPair.h
index 6fbfa24c82bdd5ba065ba259311279318e6cca72..f3830f13c308c3f45d98878cfe36e10b47d72f6e 100644
--- a/alib2data/src/container/ObjectsPair.h
+++ b/alib2data/src/container/ObjectsPair.h
@@ -8,7 +8,7 @@
#ifndef OBJECTS_PAIR_H_
#define OBJECTS_PAIR_H_
-#include <map>
+#include <pair>
#include <string>
#include "../object/Object.h"
diff --git a/alib2data/src/container/ObjectsSet.cpp b/alib2data/src/container/ObjectsSet.cpp
index f4437f3ee884c852ccd4a4d6a3510d0d633c9b51..fb3c089a2919730934c9dd206cf371ea77385dfd 100644
--- a/alib2data/src/container/ObjectsSet.cpp
+++ b/alib2data/src/container/ObjectsSet.cpp
@@ -6,7 +6,6 @@
*/
#include "ObjectsSet.h"
-#include "../std/set.hpp"
#include <cstdlib>
#include <iostream>
diff --git a/alib2data/src/container/ObjectsVector.cpp b/alib2data/src/container/ObjectsVector.cpp
index 2e2de866473986c29411a4b11f7619fa9abc3d6d..d88e87e15a70d32a9f871b6966af673b799c40d5 100644
--- a/alib2data/src/container/ObjectsVector.cpp
+++ b/alib2data/src/container/ObjectsVector.cpp
@@ -6,7 +6,6 @@
*/
#include "ObjectsVector.h"
-#include "../std/vector.hpp"
#include <cstdlib>
#include <iostream>
diff --git a/alib2data/src/debug/bfdStacktrace.cpp b/alib2data/src/debug/bfdStacktrace.cpp
index 6f51fe19eabaf824207623940fc53385d0ca5e9f..02b2ca0c140b840b23a19cb6dba8eb95ae6b57d1 100644
--- a/alib2data/src/debug/bfdStacktrace.cpp
+++ b/alib2data/src/debug/bfdStacktrace.cpp
@@ -13,7 +13,7 @@
#include <sstream>
#include <string>
-#include "../std/map.hpp"
+#include <map>
#include "addr2line.h"
diff --git a/alib2data/src/debug/sigHandler.h b/alib2data/src/debug/sigHandler.h
index 76bf4ad5f220001c09b2711eb449943fdb91f25c..4de86c251b704f3812d5018039ddfa92ad234c90 100644
--- a/alib2data/src/debug/sigHandler.h
+++ b/alib2data/src/debug/sigHandler.h
@@ -1,7 +1,6 @@
#ifndef SIG_HANDLER_H_
#define SIG_HANDLER_H_
-#include <sstream>
#include <string>
namespace std {
diff --git a/alib2data/src/grammar/ContextFree/CFG.cpp b/alib2data/src/grammar/ContextFree/CFG.cpp
index d29574b51499da1806ed94240a8f7aacfe9bdef1..4944b190e1b22c143a49284b089a58866513ebd1 100644
--- a/alib2data/src/grammar/ContextFree/CFG.cpp
+++ b/alib2data/src/grammar/ContextFree/CFG.cpp
@@ -6,7 +6,6 @@
*/
#include "CFG.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
diff --git a/alib2data/src/grammar/ContextFree/CNF.cpp b/alib2data/src/grammar/ContextFree/CNF.cpp
index a25118884c67900d0f6f13097f2e20dfb392d25c..628a472912cbbb2e60a25f8eefe847660a88ab5d 100644
--- a/alib2data/src/grammar/ContextFree/CNF.cpp
+++ b/alib2data/src/grammar/ContextFree/CNF.cpp
@@ -6,7 +6,6 @@
*/
#include "CNF.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
diff --git a/alib2data/src/grammar/ContextFree/CNF.h b/alib2data/src/grammar/ContextFree/CNF.h
index 8f0ac76232716aec188d344cead8a4369431620d..5b30c24170ba68c41f4ea7d0bbb81225f02576df 100644
--- a/alib2data/src/grammar/ContextFree/CNF.h
+++ b/alib2data/src/grammar/ContextFree/CNF.h
@@ -12,7 +12,7 @@
#include <map>
#include <vector>
#include <sstream>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
index bcebe12a7e87eb1d01ef1e6fc554407185e0be5a..920354915052bb834acab9e44e4b7b7ca0372185 100644
--- a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
+++ b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
@@ -6,7 +6,6 @@
*/
#include "EpsilonFreeCFG.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
diff --git a/alib2data/src/grammar/ContextFree/GNF.cpp b/alib2data/src/grammar/ContextFree/GNF.cpp
index bbda9516ff9ce7305b37fc0ce5be45974f9e1483..fa6330790764d7d430cbecbaa2e989ec3f55ebca 100644
--- a/alib2data/src/grammar/ContextFree/GNF.cpp
+++ b/alib2data/src/grammar/ContextFree/GNF.cpp
@@ -6,7 +6,6 @@
*/
#include "GNF.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
diff --git a/alib2data/src/grammar/ContextFree/LG.cpp b/alib2data/src/grammar/ContextFree/LG.cpp
index 57f77675b0951988c3e11900889952e8904d7602..22217ef54ec6039baafa170f670f3c68f3415db7 100644
--- a/alib2data/src/grammar/ContextFree/LG.cpp
+++ b/alib2data/src/grammar/ContextFree/LG.cpp
@@ -6,7 +6,6 @@
*/
#include "LG.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
diff --git a/alib2data/src/grammar/ContextFree/LG.h b/alib2data/src/grammar/ContextFree/LG.h
index e8300c5b67fb557055d5d8e8a06a046752bdf1e7..07299fa74736880aa489307ee548042a58de1af7 100644
--- a/alib2data/src/grammar/ContextFree/LG.h
+++ b/alib2data/src/grammar/ContextFree/LG.h
@@ -13,7 +13,7 @@
#include <tuple>
#include <vector>
#include <sstream>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/ContextSensitive/CSG.cpp b/alib2data/src/grammar/ContextSensitive/CSG.cpp
index f036943d62026205a08df64f9a19a9bc3d4806b9..99cb1f35be2c97fdf10309465156440372443aef 100644
--- a/alib2data/src/grammar/ContextSensitive/CSG.cpp
+++ b/alib2data/src/grammar/ContextSensitive/CSG.cpp
@@ -6,7 +6,6 @@
*/
#include "CSG.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
index 143a423ba0bccdf9019b387c5a0c8b81cb892899..d153d4f79d2a90622fd0fe81ae74f8276ca6865a 100644
--- a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
+++ b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
@@ -6,7 +6,6 @@
*/
#include "NonContractingGrammar.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/grammar/Grammar.h b/alib2data/src/grammar/Grammar.h
index f1fc2dc27494fc22f187e7fe4cf44eb87a8c5a18..4e26f7b034f2a077d47a5fc90db4c44eb84c6265 100644
--- a/alib2data/src/grammar/Grammar.h
+++ b/alib2data/src/grammar/Grammar.h
@@ -8,8 +8,6 @@
#ifndef GRAMMAR_H_
#define GRAMMAR_H_
-#include "../std/visitor.hpp"
-#include "../std/compare.hpp"
#include "GrammarBase.h"
#include "../common/wrapper.hpp"
diff --git a/alib2data/src/grammar/GrammarBase.h b/alib2data/src/grammar/GrammarBase.h
index 0777ad1f82a22c9ac904450deef69c02e7b845a3..cc08c8f71f33acf0e1155b2cf593f55eef99196b 100644
--- a/alib2data/src/grammar/GrammarBase.h
+++ b/alib2data/src/grammar/GrammarBase.h
@@ -8,7 +8,6 @@
#ifndef GRAMMAR_BASE_H_
#define GRAMMAR_BASE_H_
-#include "../common/base.hpp"
#include "../object/ObjectBase.h"
#include "../exception/AlibException.h"
diff --git a/alib2data/src/grammar/GrammarFromStringLexer.cpp b/alib2data/src/grammar/GrammarFromStringLexer.cpp
index 79a2a2e1bda7c93dec31d109da831d1379edda19..23c22495e885457194b642d3ff191f93c6a25a19 100644
--- a/alib2data/src/grammar/GrammarFromStringLexer.cpp
+++ b/alib2data/src/grammar/GrammarFromStringLexer.cpp
@@ -6,7 +6,7 @@
*/
#include "GrammarFromStringLexer.h"
-#include "../std/istream.h"
+#include <istream>
namespace grammar {
diff --git a/alib2data/src/grammar/GrammarFromStringParser.h b/alib2data/src/grammar/GrammarFromStringParser.h
index a77ae036c19d22797cfb5d7a6e057eb9126b44e5..5cbc7360734db1c5c634351f8fa2cc3d3b145b8a 100644
--- a/alib2data/src/grammar/GrammarFromStringParser.h
+++ b/alib2data/src/grammar/GrammarFromStringParser.h
@@ -14,6 +14,7 @@
#include "../alphabet/Symbol.h"
#include <set>
#include <vector>
+#include <map>
namespace alib {
diff --git a/alib2data/src/grammar/GrammarFromXMLParser.h b/alib2data/src/grammar/GrammarFromXMLParser.h
index 44ffacb3b9820f806bde2cf8d811c208b97885bc..d999109163fe4ccfad76fa2ed7c7d13b1909f788 100644
--- a/alib2data/src/grammar/GrammarFromXMLParser.h
+++ b/alib2data/src/grammar/GrammarFromXMLParser.h
@@ -27,7 +27,7 @@
#include <deque>
#include <set>
-#include "../std/variant.hpp"
+#include <variant>
#include "../sax/Token.h"
namespace alib {
diff --git a/alib2data/src/grammar/Regular/LeftLG.cpp b/alib2data/src/grammar/Regular/LeftLG.cpp
index 34f3ea41cca5923a691935edc30fb07b7aaa3120..e8ae9f5998f6066cc6eba29eabac1dcba253484c 100644
--- a/alib2data/src/grammar/Regular/LeftLG.cpp
+++ b/alib2data/src/grammar/Regular/LeftLG.cpp
@@ -6,7 +6,6 @@
*/
#include "LeftLG.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/grammar/Regular/LeftLG.h b/alib2data/src/grammar/Regular/LeftLG.h
index 187228f9b06b81486b2282a6e96b296061257b3d..5cbc3a41f32c3484f87ac055a4e0d249e06b9c58 100644
--- a/alib2data/src/grammar/Regular/LeftLG.h
+++ b/alib2data/src/grammar/Regular/LeftLG.h
@@ -11,7 +11,7 @@
#include "../GrammarBase.h"
#include <map>
#include <vector>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/Regular/LeftRG.cpp b/alib2data/src/grammar/Regular/LeftRG.cpp
index d0b7c723f0ec93fde44518596b418af7885675c8..1299f241d9364592446fb2bbe453d3835f274188 100644
--- a/alib2data/src/grammar/Regular/LeftRG.cpp
+++ b/alib2data/src/grammar/Regular/LeftRG.cpp
@@ -6,7 +6,6 @@
*/
#include "LeftRG.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/grammar/Regular/LeftRG.h b/alib2data/src/grammar/Regular/LeftRG.h
index 16da0c4e13ff77d9cf284d5b643e24f722fb5411..f036487d476ea161c138df260240fbc7d7839af4 100644
--- a/alib2data/src/grammar/Regular/LeftRG.h
+++ b/alib2data/src/grammar/Regular/LeftRG.h
@@ -11,7 +11,7 @@
#include "../GrammarBase.h"
#include <map>
#include <vector>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/Regular/RightLG.cpp b/alib2data/src/grammar/Regular/RightLG.cpp
index 2adadf07fb003a29a6c0b481c4524b47110c2108..f15aaddbf10a3708a297444b74a9215010775d2c 100644
--- a/alib2data/src/grammar/Regular/RightLG.cpp
+++ b/alib2data/src/grammar/Regular/RightLG.cpp
@@ -6,7 +6,6 @@
*/
#include "RightLG.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/grammar/Regular/RightLG.h b/alib2data/src/grammar/Regular/RightLG.h
index e3b5275ffbbca077a4de11e45d97a423353ccc19..69f53a1ec34ea673447c58a058b1bdc34afb3b4c 100644
--- a/alib2data/src/grammar/Regular/RightLG.h
+++ b/alib2data/src/grammar/Regular/RightLG.h
@@ -11,7 +11,7 @@
#include "../GrammarBase.h"
#include <map>
#include <vector>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/Regular/RightRG.cpp b/alib2data/src/grammar/Regular/RightRG.cpp
index 59da54bc99f9a17963f925ccc16830fa54e202e5..0fb6ad414e5ad7dc5653e1c234eda3907419e7b4 100644
--- a/alib2data/src/grammar/Regular/RightRG.cpp
+++ b/alib2data/src/grammar/Regular/RightRG.cpp
@@ -6,7 +6,6 @@
*/
#include "RightRG.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/grammar/Regular/RightRG.h b/alib2data/src/grammar/Regular/RightRG.h
index 9431d9e4fbfed326d4dc23982cb41860450fbd81..ff32ca9644ed0c8d5ad3afb48b08519dde225484 100644
--- a/alib2data/src/grammar/Regular/RightRG.h
+++ b/alib2data/src/grammar/Regular/RightRG.h
@@ -11,7 +11,7 @@
#include "../GrammarBase.h"
#include <map>
#include <vector>
-#include "../../std/variant.hpp"
+#include <variant>
#include "../common/TerminalNonterminalAlphabetInitialSymbol.h"
namespace grammar {
diff --git a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
index 04f10d30e2bebe437878999cb9346885be3a9106..699f874d0a431dcec34475b5d8b89bc3f401cea4 100644
--- a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
@@ -6,7 +6,6 @@
*/
#include "ContextPreservingUnrestrictedGrammar.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
index 19186121a556343d00e74e99c22a4b85e0d94de3..50702a8e80b25cec91073323d8b9bfdd5b99f8e7 100644
--- a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
@@ -6,7 +6,6 @@
*/
#include "UnrestrictedGrammar.h"
-#include "../../std/map.hpp"
#include "../GrammarException.h"
#include <algorithm>
#include <sstream>
diff --git a/alib2data/src/graph/Graph.h b/alib2data/src/graph/Graph.h
index 7d47b0c256312391d97870ca0e55277bbf8d84f2..f4fe5bb2b9c68a298f1f61a196efccca3132a2f3 100644
--- a/alib2data/src/graph/Graph.h
+++ b/alib2data/src/graph/Graph.h
@@ -1,8 +1,6 @@
#ifndef GRAPH_H_
#define GRAPH_H_
-#include "../std/visitor.hpp"
-#include "../std/compare.hpp"
#include "../common/wrapper.hpp"
#include "GraphBase.h"
diff --git a/alib2data/src/graph/GraphBase.h b/alib2data/src/graph/GraphBase.h
index e3539fef1a6976721849661f4ea0724838dc6ee1..aafa9ff94c228fd03de5c47e32902516b2df94b2 100644
--- a/alib2data/src/graph/GraphBase.h
+++ b/alib2data/src/graph/GraphBase.h
@@ -2,7 +2,6 @@
#define GRAPH_BASE_H_
#include "common/Macros.h"
-#include "../common/base.hpp"
#include "../object/ObjectBase.h"
namespace graph {
diff --git a/alib2data/src/graph/GraphToStringComposer.h b/alib2data/src/graph/GraphToStringComposer.h
index 54ecda9ddcefb01f28f7079bb143b166ad2c904c..052bf35671b94724c7bc3a46d3553f16df95cde6 100644
--- a/alib2data/src/graph/GraphToStringComposer.h
+++ b/alib2data/src/graph/GraphToStringComposer.h
@@ -9,7 +9,6 @@
#include "common/GraphElement.h"
#include "directed/DirectedGraph.h"
#include "undirected/UndirectedGraph.h"
-#include "../std/visitor.hpp"
#include "../sax/Token.h"
namespace graph {
diff --git a/alib2data/src/graph/GraphToXMLComposer.cpp b/alib2data/src/graph/GraphToXMLComposer.cpp
index 5bba12af369ee384552b8b9e96a515387c2425e8..f8891e17860db11337548570fcebe24fa0635c92 100644
--- a/alib2data/src/graph/GraphToXMLComposer.cpp
+++ b/alib2data/src/graph/GraphToXMLComposer.cpp
@@ -2,7 +2,7 @@
#include "GraphRepresentation.h"
#include "../XmlApi.hpp"
-#include "../std/itos.h"
+#include <string>
namespace graph {
diff --git a/alib2data/src/graph/GraphToXMLComposer.h b/alib2data/src/graph/GraphToXMLComposer.h
index f1b32c46ea7b862c944ab9041733d6f5af8232fd..ef876f36688eae35ecbdb5afeca6cc50e0280819 100644
--- a/alib2data/src/graph/GraphToXMLComposer.h
+++ b/alib2data/src/graph/GraphToXMLComposer.h
@@ -8,7 +8,6 @@
#include "common/GraphElement.h"
#include "directed/DirectedGraph.h"
#include "undirected/UndirectedGraph.h"
-#include "../std/visitor.hpp"
#include "../sax/Token.h"
namespace alib {
diff --git a/alib2data/src/graph/common/GraphElement.h b/alib2data/src/graph/common/GraphElement.h
index ac6a1d8ff0b02179e967acbaa0631d38d9a3585f..cf60cae928a1cb66e6f9857106e12ecf04b237a6 100644
--- a/alib2data/src/graph/common/GraphElement.h
+++ b/alib2data/src/graph/common/GraphElement.h
@@ -5,7 +5,7 @@
#include <string>
#include <functional>
-#include "../../std/visitor.hpp"
+#include "../../common/visitor.hpp"
#include "../../object/Object.h"
namespace graph {
diff --git a/alib2data/src/graph/directed/AdjacencyListDirectedGraph.cpp b/alib2data/src/graph/directed/AdjacencyListDirectedGraph.cpp
index 183b78b7d9581d7c8ff1d41d3f93bbf952839d50..565567c4549a8a7500d2761b5168bef5aea997d0 100644
--- a/alib2data/src/graph/directed/AdjacencyListDirectedGraph.cpp
+++ b/alib2data/src/graph/directed/AdjacencyListDirectedGraph.cpp
@@ -1,5 +1,5 @@
#include "AdjacencyListDirectedGraph.h"
-#include "../../std/compare.hpp"
+#include <compare>
#include <algorithm>
diff --git a/alib2data/src/graph/directed/AdjacencyMatrixDirectedGraph.cpp b/alib2data/src/graph/directed/AdjacencyMatrixDirectedGraph.cpp
index 0f1598b82adf2e8341a80b0dc46eed311bf1cb72..d4631d8d1517826934e74cefc213f5417fee8909 100644
--- a/alib2data/src/graph/directed/AdjacencyMatrixDirectedGraph.cpp
+++ b/alib2data/src/graph/directed/AdjacencyMatrixDirectedGraph.cpp
@@ -1,5 +1,5 @@
#include "AdjacencyMatrixDirectedGraph.h"
-#include "../../std/compare.hpp"
+#include <compare>
namespace graph {
diff --git a/alib2data/src/graph/directed/DirectedGraph.cpp b/alib2data/src/graph/directed/DirectedGraph.cpp
index c7b2349c384ab2a5463068e2a338c6224de40ba2..a2dfc1f4cb8520b4d143b31afe94d2bec8b214af 100644
--- a/alib2data/src/graph/directed/DirectedGraph.cpp
+++ b/alib2data/src/graph/directed/DirectedGraph.cpp
@@ -2,7 +2,6 @@
#include "IDirectedGraph.h"
#include "AdjacencyListDirectedGraph.h"
#include "AdjacencyMatrixDirectedGraph.h"
-#include "../../std/set.hpp"
#include <iostream>
#include <algorithm>
diff --git a/alib2data/src/graph/directed/DirectedGraph.h b/alib2data/src/graph/directed/DirectedGraph.h
index dc6ff344e6d16a96ad0c53c1ecd5f911b6058c82..e1c309ec224a4dd6fd5ccf308a0866201662f5da 100644
--- a/alib2data/src/graph/directed/DirectedGraph.h
+++ b/alib2data/src/graph/directed/DirectedGraph.h
@@ -2,6 +2,7 @@
#define DIRECTED_GRAPH_H_
#include <unordered_map>
+#include <set>
#include "../GraphBase.h"
#include "../GraphRepresentation.h"
diff --git a/alib2data/src/graph/undirected/AdjacencyListUndirectedGraph.cpp b/alib2data/src/graph/undirected/AdjacencyListUndirectedGraph.cpp
index 3d54453729e335a1978aa2023f39eb2f426b896e..b1365d3241a943035e321c09deb9c25c6197bf0c 100644
--- a/alib2data/src/graph/undirected/AdjacencyListUndirectedGraph.cpp
+++ b/alib2data/src/graph/undirected/AdjacencyListUndirectedGraph.cpp
@@ -1,5 +1,5 @@
#include "AdjacencyListUndirectedGraph.h"
-#include "../../std/compare.hpp"
+#include <compare>
#include "utils.h"
namespace graph {
diff --git a/alib2data/src/graph/undirected/AdjacencyMatrixUndirectedGraph.cpp b/alib2data/src/graph/undirected/AdjacencyMatrixUndirectedGraph.cpp
index a1d42d092176fce490483a25b2e451546a7cb248..25818ebfc40361058ba982588b5655dac723e4b2 100644
--- a/alib2data/src/graph/undirected/AdjacencyMatrixUndirectedGraph.cpp
+++ b/alib2data/src/graph/undirected/AdjacencyMatrixUndirectedGraph.cpp
@@ -1,5 +1,5 @@
#include "AdjacencyMatrixUndirectedGraph.h"
-#include "../../std/compare.hpp"
+#include <compare>
#include "utils.h"
namespace graph {
diff --git a/alib2data/src/graph/undirected/UndirectedGraph.cpp b/alib2data/src/graph/undirected/UndirectedGraph.cpp
index 2c35fa860067ff8372d6c1fd0496a0e9b0118fde..b88aadf2f86d887ea24b06cbad588ebeb37cc3a8 100644
--- a/alib2data/src/graph/undirected/UndirectedGraph.cpp
+++ b/alib2data/src/graph/undirected/UndirectedGraph.cpp
@@ -2,7 +2,6 @@
#include "IUndirectedGraph.h"
#include "AdjacencyListUndirectedGraph.h"
#include "AdjacencyMatrixUndirectedGraph.h"
-#include "../../std/set.hpp"
#include <iostream>
#include <algorithm>
diff --git a/alib2data/src/graph/undirected/UndirectedGraph.h b/alib2data/src/graph/undirected/UndirectedGraph.h
index b99bdb086b3ceecc64b653c4330543fbddf292e9..cff66b121b570ad6f9fac872bfc5fdd0bd90bc2d 100644
--- a/alib2data/src/graph/undirected/UndirectedGraph.h
+++ b/alib2data/src/graph/undirected/UndirectedGraph.h
@@ -2,6 +2,7 @@
#define UNDIRECTED_GRAPH_H_
#include <unordered_map>
+#include <set>
#include "../GraphBase.h"
#include "../GraphRepresentation.h"
diff --git a/alib2data/src/graph/undirected/utils.h b/alib2data/src/graph/undirected/utils.h
index 706c19ba0d64658094cdda4c1bb292d8ae58d458..a95114ff7019d7104f50c70e1ea46323d37c2f54 100644
--- a/alib2data/src/graph/undirected/utils.h
+++ b/alib2data/src/graph/undirected/utils.h
@@ -1,6 +1,7 @@
#ifndef GRAPH_UTILS_H_
#define GRAPH_UTILS_H_
+#include <list>
#include <algorithm>
#include "../common/Node.h"
diff --git a/alib2data/src/label/HexavigesimalLabel.cpp b/alib2data/src/label/HexavigesimalLabel.cpp
index 3c767facc48a0810740c2637146c6604898499ed..41843273096ff089ebd22c74abd4ecb0c9236d91 100644
--- a/alib2data/src/label/HexavigesimalLabel.cpp
+++ b/alib2data/src/label/HexavigesimalLabel.cpp
@@ -6,7 +6,6 @@
*/
#include "HexavigesimalLabel.h"
-#include "../std/hexavigesimal.h"
namespace label {
diff --git a/alib2data/src/label/HexavigesimalLabel.h b/alib2data/src/label/HexavigesimalLabel.h
index 65aa7a6e7e018b92352eae48186a8a06d977f5bb..eca737c5ddacc9a9bcd6baec963fa4d747a1cbc9 100644
--- a/alib2data/src/label/HexavigesimalLabel.h
+++ b/alib2data/src/label/HexavigesimalLabel.h
@@ -8,7 +8,7 @@
#ifndef HEXAVIGESIMAL_LABEL_H_
#define HEXAVIGESIMAL_LABEL_H_
-#include "../std/hexavigesimal.h"
+#include <hexavigesimal>
#include <ostream>
#include "LabelBase.h"
diff --git a/alib2data/src/label/Label.h b/alib2data/src/label/Label.h
index 40c8719d708be58891bec3f56f35f7341b154c90..a9463ce23b3136d18a1828ae4af97f4fbf31aafb 100644
--- a/alib2data/src/label/Label.h
+++ b/alib2data/src/label/Label.h
@@ -8,8 +8,6 @@
#ifndef LABEL_H_
#define LABEL_H_
-#include "../std/visitor.hpp"
-#include "../std/compare.hpp"
#include "../common/wrapper.hpp"
#include "LabelBase.h"
diff --git a/alib2data/src/label/LabelBase.h b/alib2data/src/label/LabelBase.h
index 2180e896c0aa345bd88747ce5de0cbb8666f5748..fe0b81816aa34f5b21ef1ad9af45aea12df09d8f 100644
--- a/alib2data/src/label/LabelBase.h
+++ b/alib2data/src/label/LabelBase.h
@@ -8,7 +8,6 @@
#ifndef LABEL_BASE_H_
#define LABEL_BASE_H_
-#include "../common/base.hpp"
#include "../object/ObjectBase.h"
namespace label {
diff --git a/alib2data/src/label/LabelPairLabel.cpp b/alib2data/src/label/LabelPairLabel.cpp
index 508464828fb8cb0fe93ee2249bf3a2bb48131ac7..4932d395c8b170322d29271a4cbedb3810e78db5 100644
--- a/alib2data/src/label/LabelPairLabel.cpp
+++ b/alib2data/src/label/LabelPairLabel.cpp
@@ -6,7 +6,7 @@
*/
#include "LabelPairLabel.h"
-#include "../std/pair.hpp"
+#include <pair>
#include <sstream>
namespace label {
diff --git a/alib2data/src/label/LabelSetLabel.cpp b/alib2data/src/label/LabelSetLabel.cpp
index b82adeafdbaa3b712284907c3a59625ba55e0f17..a6e66aff4a97ffffb62407a1bbc6e39204c9c5ec 100644
--- a/alib2data/src/label/LabelSetLabel.cpp
+++ b/alib2data/src/label/LabelSetLabel.cpp
@@ -6,7 +6,7 @@
*/
#include "LabelSetLabel.h"
-#include "../std/set.hpp"
+#include <set>
#include <sstream>
namespace label {
diff --git a/alib2data/src/label/LabelToStringComposer.h b/alib2data/src/label/LabelToStringComposer.h
index a70d52b61fb4fd4231777eb45dd382c00d3e4ae0..84489777506188883f44f8875822203d6ae88665 100644
--- a/alib2data/src/label/LabelToStringComposer.h
+++ b/alib2data/src/label/LabelToStringComposer.h
@@ -8,7 +8,7 @@
#ifndef LABEL_TO_STRING_COMPOSER_H_
#define LABEL_TO_STRING_COMPOSER_H_
-#include <sstream>
+#include <ostream>
#include "Label.h"
namespace label {
diff --git a/alib2data/src/label/LabelToXMLComposer.cpp b/alib2data/src/label/LabelToXMLComposer.cpp
index b8672a5b05459cbdf03281704d10385711d6c9e1..3b9db387f55c5232d5b00380b5f0111c0f0d184c 100644
--- a/alib2data/src/label/LabelToXMLComposer.cpp
+++ b/alib2data/src/label/LabelToXMLComposer.cpp
@@ -6,7 +6,7 @@
*/
#include "LabelToXMLComposer.h"
-#include "../std/itos.h"
+#include <string>
#include "../XmlApi.hpp"
diff --git a/alib2data/src/label/NextLabel.cpp b/alib2data/src/label/NextLabel.cpp
index f7642b5db00be85cb6ce84fb5664b28e01ff7f80..cf13a230c6268d6909e3de7a7daff14db0156a6f 100644
--- a/alib2data/src/label/NextLabel.cpp
+++ b/alib2data/src/label/NextLabel.cpp
@@ -9,7 +9,7 @@
#include "../primitive/NextPrimitive.h"
#include "PrimitiveLabel.h"
#include "HexavigesimalLabel.h"
-#include "../std/itos.h"
+#include <string>
#include "../exception/AlibException.h"
#include "LabelSetLabel.h"
#include "ObjectLabel.h"
diff --git a/alib2data/src/label/UniqueLabel.cpp b/alib2data/src/label/UniqueLabel.cpp
index ff4364899e506eb40586e0d14c6c86ba2e90ae20..496ab1581395461c7301ebf53ec7d9ad1fa55140 100644
--- a/alib2data/src/label/UniqueLabel.cpp
+++ b/alib2data/src/label/UniqueLabel.cpp
@@ -6,7 +6,6 @@
*/
#include "UniqueLabel.h"
-#include "../std/set.hpp"
#include <sstream>
namespace label {
diff --git a/alib2data/src/object/Object.h b/alib2data/src/object/Object.h
index b29d8b5764ea3fc37ccaeff7dd6699138a035cb5..bcb7209ef98d1ccd0b9df7ee3061d9cb84721a75 100644
--- a/alib2data/src/object/Object.h
+++ b/alib2data/src/object/Object.h
@@ -9,7 +9,6 @@
#define OBJECT_H_
#include "../common/wrapper.hpp"
-#include "../std/compare.hpp"
namespace alib {
@@ -22,7 +21,7 @@ typedef alib::wrapper<ObjectBase> Object;
} /* namespace alib */
-#include "ObjectBase.h"
+#include "ObjectBase.h" //TODO potreba?
namespace std {
diff --git a/alib2data/src/object/ObjectBase.h b/alib2data/src/object/ObjectBase.h
index cf2dd385cba2967fae88d3ca9a4487f60d2d80d5..42204a9f233f4e10d5af453b1c32b5ceebe7e080 100644
--- a/alib2data/src/object/ObjectBase.h
+++ b/alib2data/src/object/ObjectBase.h
@@ -8,8 +8,8 @@
#ifndef OBJECT_BASE_H_
#define OBJECT_BASE_H_
-#include "../std/visitor.hpp"
-#include "../std/compare.hpp"
+#include "../common/visitor.hpp"
+#include <compare>
#include "../common/base.hpp"
namespace alib {
diff --git a/alib2data/src/object/Void.h b/alib2data/src/object/Void.h
index bd1fa9f57ac99bce6d545baf494a9c2f642e3f23..cd400bed8f09e1a9b4c6ae0eeb1a768587c6f48a 100644
--- a/alib2data/src/object/Void.h
+++ b/alib2data/src/object/Void.h
@@ -9,8 +9,6 @@
#define VOID_H_
#include "ObjectBase.h"
-#include "../std/visitor.hpp"
-#include "../common/wrapper.hpp"
namespace alib {
diff --git a/alib2data/src/primitive/NextPrimitive.cpp b/alib2data/src/primitive/NextPrimitive.cpp
index 4a77fbb25615a5c1e6cab2cee769ee9d38ee18b2..35155773dad9f2a0016282d4016e099fc13a1dcd 100644
--- a/alib2data/src/primitive/NextPrimitive.cpp
+++ b/alib2data/src/primitive/NextPrimitive.cpp
@@ -11,7 +11,7 @@
#include "Character.h"
#include "Unsigned.h"
#include "Bool.h"
-#include "../std/itos.h"
+#include <string>
namespace primitive {
diff --git a/alib2data/src/primitive/Primitive.h b/alib2data/src/primitive/Primitive.h
index a6a8521e608e2f4145302c8969edd5983fdbd455..4e11ba5f3d935efeac3647d59da89842f266f913 100644
--- a/alib2data/src/primitive/Primitive.h
+++ b/alib2data/src/primitive/Primitive.h
@@ -8,8 +8,6 @@
#ifndef PRIMITIVE_H_
#define PRIMITIVE_H_
-#include "../std/visitor.hpp"
-#include "../std/compare.hpp"
#include "../common/wrapper.hpp"
#include "PrimitiveBase.h"
diff --git a/alib2data/src/primitive/PrimitiveBase.h b/alib2data/src/primitive/PrimitiveBase.h
index 8414ce2e7df15739a732887f542f5f1045c574d7..4ff1465fc6f929e0a8fe9a35b4bf1feadfe190d2 100644
--- a/alib2data/src/primitive/PrimitiveBase.h
+++ b/alib2data/src/primitive/PrimitiveBase.h
@@ -8,7 +8,6 @@
#ifndef PRIMITIVE_BASE_H_
#define PRIMITIVE_BASE_H_
-#include "../common/base.hpp"
#include "../object/ObjectBase.h"
namespace primitive {
diff --git a/alib2data/src/primitive/PrimitiveFromXMLParser.cpp b/alib2data/src/primitive/PrimitiveFromXMLParser.cpp
index 39390e44853df0b78add486b5db37d92c3457928..e95ef5e99a647c0295a8f2cbe2c552f94e7aa59c 100644
--- a/alib2data/src/primitive/PrimitiveFromXMLParser.cpp
+++ b/alib2data/src/primitive/PrimitiveFromXMLParser.cpp
@@ -8,7 +8,7 @@
#include "PrimitiveFromXMLParser.h"
#include "../sax/ParserException.h"
#include <algorithm>
-#include "../std/stou.h"
+#include <string>
#include "../XmlApi.hpp"
diff --git a/alib2data/src/primitive/PrimitiveToXMLComposer.cpp b/alib2data/src/primitive/PrimitiveToXMLComposer.cpp
index da87f5b4e4d5beb83b01667fcdd7df966e5c9d57..5991f919df79b25120cda89bf9ccba1f70f99797 100644
--- a/alib2data/src/primitive/PrimitiveToXMLComposer.cpp
+++ b/alib2data/src/primitive/PrimitiveToXMLComposer.cpp
@@ -9,8 +9,7 @@
#include "Integer.h"
#include "String.h"
#include "Character.h"
-#include "../std/itos.h"
-#include "../std/utos.h"
+#include <string>
#include "../XmlApi.hpp"
diff --git a/alib2data/src/regexp/RegExp.h b/alib2data/src/regexp/RegExp.h
index b989f65b92c122afcc876af6abb6ecb37b5b0387..f36003ba6af6038fab06e67a9ad5b9fe63a1c3b9 100644
--- a/alib2data/src/regexp/RegExp.h
+++ b/alib2data/src/regexp/RegExp.h
@@ -8,8 +8,6 @@
#ifndef REG_EXP_H_
#define REG_EXP_H_
-#include "../std/visitor.hpp"
-#include "../std/compare.hpp"
#include "../common/wrapper.hpp"
#include "RegExpBase.h"
#include "../alphabet/Symbol.h"
diff --git a/alib2data/src/regexp/RegExpBase.h b/alib2data/src/regexp/RegExpBase.h
index 5c34c328826bce07bf05c24c097807ff752bb8cb..103f005fa757fc600b7544b6ee944ed9ccb0c3cd 100644
--- a/alib2data/src/regexp/RegExpBase.h
+++ b/alib2data/src/regexp/RegExpBase.h
@@ -8,7 +8,6 @@
#ifndef REG_EXP_BASE_H_
#define REG_EXP_BASE_H_
-#include "../common/base.hpp"
#include "../object/ObjectBase.h"
namespace regexp {
diff --git a/alib2data/src/regexp/RegExpToXMLComposer.h b/alib2data/src/regexp/RegExpToXMLComposer.h
index 8a231d39917934ba0792fda379530109b302f81a..e544dfb9638d3bc1891f26c104f32ee2be0b01e0 100644
--- a/alib2data/src/regexp/RegExpToXMLComposer.h
+++ b/alib2data/src/regexp/RegExpToXMLComposer.h
@@ -12,7 +12,6 @@
#include "RegExp.h"
#include "unbounded/UnboundedRegExpElements.h"
#include "formal/FormalRegExpElements.h"
-#include "../std/visitor.hpp"
#include "../sax/Token.h"
namespace alib {
@@ -27,15 +26,15 @@ namespace regexp {
/**
* This class contains methods to print XML representation of regular expression to the output stream.
*/
-class RegExpToXMLComposer :public UnboundedRegExpElement::const_visitor_type, public FormalRegExpElement::const_visitor_type {
+class RegExpToXMLComposer : public UnboundedRegExpElement::const_visitor_type, public FormalRegExpElement::const_visitor_type {
void Visit(void*, const UnboundedRegExpAlternation& alternation) const;
void Visit(void*, const UnboundedRegExpConcatenation& concatenation) const;
void Visit(void*, const UnboundedRegExpIteration& iteration) const;
void Visit(void*, const UnboundedRegExpSymbol& symbol) const;
void Visit(void*, const UnboundedRegExpEpsilon& epsilon) const;
void Visit(void*, const UnboundedRegExpEmpty& empty) const;
-
-
+
+
void Visit(void*, const FormalRegExpAlternation& alternation) const;
void Visit(void*, const FormalRegExpConcatenation& concatenation) const;
void Visit(void*, const FormalRegExpIteration& iteration) const;
diff --git a/alib2data/src/regexp/formal/FormalRegExp.cpp b/alib2data/src/regexp/formal/FormalRegExp.cpp
index 5ee5062e11ebd31996a3c8d571429ec3652d43ee..7fca860131c7cf4aac32fbdce87b58fc42c247c9 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExp.cpp
@@ -14,7 +14,6 @@
#include <algorithm>
#include <sstream>
-#include "../../std/set.hpp"
#include "../unbounded/UnboundedRegExp.h"
namespace regexp {
diff --git a/alib2data/src/regexp/formal/FormalRegExp.h b/alib2data/src/regexp/formal/FormalRegExp.h
index 3f986b0ffcf7295d1b91fd3221d8c58ac69de91d..40dd4fc51b8e13d1a547d5bf21bfb6485bfde335 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.h
+++ b/alib2data/src/regexp/formal/FormalRegExp.h
@@ -13,7 +13,6 @@
#include <string>
#include <set>
#include "FormalRegExpElement.h"
-#include "../../std/visitor.hpp"
#include "../RegExpBase.h"
#include "../common/RegExpAlphabet.h"
diff --git a/alib2data/src/regexp/formal/FormalRegExpElement.h b/alib2data/src/regexp/formal/FormalRegExpElement.h
index 4a1e92393521be730228dfa6609736de034320c0..a0e44de6654e05f1d54a71f2d990cf810a6038e8 100644
--- a/alib2data/src/regexp/formal/FormalRegExpElement.h
+++ b/alib2data/src/regexp/formal/FormalRegExpElement.h
@@ -8,7 +8,7 @@
#ifndef FORMAL_REG_EXP_ELEMENT_H_
#define FORMAL_REG_EXP_ELEMENT_H_
-#include "../../std/visitor.hpp"
+#include "../../common/visitor.hpp"
#include "../../alphabet/Symbol.h"
#include "FormalRegExp.h"
#include <set>
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
index cd3f15d6a56c93948e60e3cd5fbcc228bcb99ec4..6ca3a15e48d19d5121c410b5fe23a8ef8d5bfc26 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
@@ -14,7 +14,6 @@
#include <algorithm>
#include <sstream>
-#include "../../std/set.hpp"
#include "../formal/FormalRegExp.h"
namespace regexp {
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.h b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
index 3d2e654d31936a50c9e14f52a56b44b2986c1324..c6ccb04384be1c6a904fd3e9942fb89709e1798c 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
@@ -13,7 +13,6 @@
#include <string>
#include <set>
#include "UnboundedRegExpElement.h"
-#include "../../std/visitor.hpp"
#include "../RegExpBase.h"
#include "../common/RegExpAlphabet.h"
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpElement.h b/alib2data/src/regexp/unbounded/UnboundedRegExpElement.h
index 684a2e35bd8559c6b94dd15d03da8fc5eca74f5d..1dfe5ed18323d88ee51e4181cb8fce2f3540ff73 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpElement.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpElement.h
@@ -8,7 +8,7 @@
#ifndef UNBOUNDED_REG_EXP_ELEMENT_H_
#define UNBOUNDED_REG_EXP_ELEMENT_H_
-#include "../../std/visitor.hpp"
+#include "../../common/visitor.hpp"
#include "../../alphabet/Symbol.h"
#include "UnboundedRegExp.h"
#include <set>
diff --git a/alib2data/src/std/compare.hpp b/alib2data/src/std/compare.hpp
deleted file mode 100644
index 7a22279d586428265b91681895150e71e11a0ffd..0000000000000000000000000000000000000000
--- a/alib2data/src/std/compare.hpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * compare.hpp
- *
- * Created on: Apr 1, 2013
- * Author: Jan Travnicek
- */
-
-#ifndef COMPARE_HPP_
-#define COMPARE_HPP_
-
-#include <set>
-#include <list>
-#include <vector>
-#include <string>
-#include <map>
-#include <unordered_map>
-#include <tuple>
-
-namespace std {
-
-template<class T>
-struct compare {
- int operator()(T first, T second) const;
-};
-
-template<>
-struct compare<bool> {
- int operator()(bool first, bool second) const {
- return first - second;
- }
-};
-
-template<>
-struct compare<int> {
- int operator()(int first, int second) const {
- return first - second;
- }
-};
-
-template<>
-struct compare<double> {
- int operator()(double first, double second) const {
- return first - second;
- }
-};
-
-template<class T>
-struct compare<set<T>> {
- int operator()(const set<T>& first, const set<T>& second) const {
- if(first.size() < second.size()) return -1;
- if(first.size() > second.size()) return 1;
-
- compare<T> comp;
- for(auto iterF = first.begin(), iterS = second.begin(); iterF != first.end(); iterF++, iterS++) {
- int res = comp(*iterF, *iterS);
- if(res != 0) return res;
- }
- return 0;
- }
-};
-
-template<class T>
-struct compare<list<T>> {
- int operator()(const list<T>& first, const list<T>& second) const {
- if(first.size() < second.size()) return -1;
- if(first.size() > second.size()) return 1;
-
- compare<T> comp;
- for(auto iterF = first.begin(), iterS = second.begin(); iterF != first.end(); iterF++, iterS++) {
- int res = comp(*iterF, *iterS);
- if(res != 0) return res;
- }
- return 0;
- }
-};
-
-template<class T>
-struct compare<vector<T>> {
- int operator()(const vector<T>& first, const vector<T>& second) const {
- if(first.size() < second.size()) return -1;
- if(first.size() > second.size()) return 1;
-
- compare<T> comp;
- for(auto iterF = first.begin(), iterS = second.begin(); iterF != first.end(); iterF++, iterS++) {
- int res = comp(*iterF, *iterS);
- if(res != 0) return res;
- }
- return 0;
- }
-};
-
-template<class T, class R>
-struct compare<pair<T, R>> {
- int operator()(const pair<T, R>& first, const pair<T, R>& second) const {
- compare<T> compT;
- compare<R> compR;
-
- int res = compT(first.first, second.first);
- if(res == 0) res = compR(first.second, second.second);
- return res;
- }
-};
-
-template<class T, class R>
-struct compare<map<T, R>> {
- int operator()(const map<T, R>& first, const map<T, R>& second) const {
- if(first.size() < second.size()) return -1;
- if(first.size() > second.size()) return 1;
-
- compare<std::pair<T, R>> comp;
- for(auto iterF = first.begin(), iterS = second.begin(); iterF != first.end(); iterF++, iterS++) {
- int res = comp(*iterF, *iterS);
- if(res != 0) return res;
- }
- return 0;
- }
-};
-
-template<class T, class R>
-struct compare<unordered_map<T, R>> {
- int operator()(const unordered_map<T, R>& first, const unordered_map<T, R>& second) const {
- if(first.size() < second.size()) return -1;
- if(first.size() > second.size()) return 1;
-
- compare<R> comp;
- for(auto iter = first.begin(); iter != first.end(); iter++) {
- auto search = second.find(iter->first);
- if(search == second.end()) return -1;
- int res = comp(iter->second, search->second);
- if(res != 0) return res;
- }
- return 0;
- }
-};
-
-template<int I, typename Tuple>
-struct compareTupleHelper;
-
-template<int I, typename Tuple>
-struct compareTupleHelper {
- static int compHelp(const Tuple& t1, const Tuple& t2) {
- compare<typename tuple_element<I, Tuple>::type> comp;
- int res = comp(std::get<I>(t1), std::get<I>(t2));
- if(res != 0) return res;
- return compareTupleHelper<I - 1, Tuple>::compHelp(t1, t2);
- }
-};
-
-template<class Tuple>
-struct compareTupleHelper<0, Tuple> {
- static int compHelp(const Tuple& t1, const Tuple& t2) {
- compare<typename tuple_element<0, Tuple>::type> comp;
- return comp(std::get<0>(t1), std::get<0>(t2));
- }
-};
-
-
-template<typename ... Ts>
-struct compare<tuple<Ts...>> {
- int operator()(const tuple<Ts...>& first, const tuple<Ts...>& second) const {
- return compareTupleHelper<tuple_size<std::tuple<Ts...>>::value - 1, std::tuple<Ts...>>::compHelp(first, second);
- }
-};
-
-template<>
-struct compare<string> {
- int operator()(const string& first, const string& second) const {
- return first.compare(second);
- }
-};
-
-
-template<int I, typename Tie>
-struct compareTieHelper;
-
-template<int I, typename Tie>
-struct compareTieHelper {
- static int compHelp(const Tie& t1, const Tie& t2) {
- compare<typename std::remove_const<typename std::remove_reference<typename tuple_element<I, Tie>::type>::type>::type> comp;
- int res = comp(std::get<I>(t1), std::get<I>(t2));
- if(res != 0) return res;
- return compareTieHelper<I - 1, Tie>::compHelp(t1, t2);
- }
-};
-
-template<class Tie>
-struct compareTieHelper<0, Tie> {
- static int compHelp(const Tie& t1, const Tie& t2) {
- compare<typename std::remove_const<typename std::remove_reference<typename tuple_element<0, Tie>::type>::type>::type> comp;
- return comp(std::get<0>(t1), std::get<0>(t2));
- }
-};
-
-
-template<typename ... Ts>
-struct compare<tuple<Ts&...>> {
- int operator()(const tuple<Ts&...>& first, const tuple<Ts&...>& second) const {
- return compareTieHelper<tuple_size<std::tuple<Ts&...>>::value - 1, std::tuple<Ts&...>>::compHelp(first, second);
- }
-};
-
-} /* namespace std */
-
-#endif /* COMPARE_HPP_ */
diff --git a/alib2data/src/std/itos.cpp b/alib2data/src/std/itos.cpp
deleted file mode 100644
index 66423b21812b9fca3b5a623ad9755f242c7ac0d8..0000000000000000000000000000000000000000
--- a/alib2data/src/std/itos.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "itos.h"
-
-namespace std {
-
-string itos(int integer, int) {
- stringstream ss;
- ss << integer;
- return ss.str();
-}
-
-}
diff --git a/alib2data/src/std/itos.h b/alib2data/src/std/itos.h
deleted file mode 100644
index 219df670d0d0f69f8b0216b52c52d47f05df6179..0000000000000000000000000000000000000000
--- a/alib2data/src/std/itos.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ITOS_H_
-#define ITOS_H_
-
-#include <sstream>
-#include <string>
-
-namespace std {
-
-string itos(int integer, int base = 10);
-
-} /* namespace std */
-
-#endif /* ITOS_H_ */
diff --git a/alib2data/src/std/list.hpp b/alib2data/src/std/list.hpp
deleted file mode 100644
index 4e37432e6292779910b9c065cd38a84039094799..0000000000000000000000000000000000000000
--- a/alib2data/src/std/list.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef __LIST_HPP_
-#define __LIST_HPP_
-
-#include <list>
-
-namespace std {
-
-template< class T >
-std::ostream& operator<<(std::ostream& out, const std::list<T>& list);
-
-}
-
-#include "deque.hpp"
-#include "set.hpp"
-#include "map.hpp"
-#include "pair.hpp"
-#include "tuple.hpp"
-#include "vector.hpp"
-#include <iostream>
-
-namespace std {
-
-template< class T >
-std::ostream& operator<<(std::ostream& out, const std::list<T>& list) {
- out << "[";
-
- bool first = true;
- for(const T& item : list) {
- if(!first) out << ", ";
- first = false;
- out << item;
- }
-
- out << "]";
- return out;
-}
-
-} /* namespace std */
-
-#endif /* __LIST_HPP_ */
-
diff --git a/alib2data/src/std/pair.hpp b/alib2data/src/std/pair.hpp
deleted file mode 100644
index a1a7e4eb5245d72d058eda2bacbdbad8d90738d2..0000000000000000000000000000000000000000
--- a/alib2data/src/std/pair.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __PAIR_HPP_
-#define __PAIR_HPP_
-
-#include <map>
-
-namespace std {
-
-template< class T, class R >
-std::ostream& operator<<(std::ostream& out, const std::pair<T, R>& pair);
-
-}
-
-#include "deque.hpp"
-#include "set.hpp"
-#include "map.hpp"
-#include "list.hpp"
-#include "tuple.hpp"
-#include "vector.hpp"
-#include <iostream>
-
-namespace std {
-
-template< class T, class R >
-std::ostream& operator<<(std::ostream& out, const std::pair<T, R>& pair) {
- out << "(" << pair.first << ", " << pair.second << ")";
- return out;
-}
-
-} /* namespace std */
-
-#endif /* __PAIR_HPP_ */
-
diff --git a/alib2data/src/std/stou.cpp b/alib2data/src/std/stou.cpp
deleted file mode 100644
index d1de978dc72e1d530be6537e5b73c7590603c3de..0000000000000000000000000000000000000000
--- a/alib2data/src/std/stou.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "stou.h"
-
-namespace std {
-
-unsigned stou(const std::string& string, int) {
- stringstream ss(string);
- unsigned integer;
- ss >> integer;
- return integer;
-}
-
-}
diff --git a/alib2data/src/std/stou.h b/alib2data/src/std/stou.h
deleted file mode 100644
index c6a04fe3fe40ffc59e5ea80d8474456da2963a65..0000000000000000000000000000000000000000
--- a/alib2data/src/std/stou.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef STOU_H_
-#define STOU_H_
-
-#include <sstream>
-#include <string>
-
-namespace std {
-
-unsigned stou(const std::string&, int base = 10);
-
-} /* namespace std */
-
-#endif /* STOU_H_ */
diff --git a/alib2data/src/std/tuple.hpp b/alib2data/src/std/tuple.hpp
deleted file mode 100644
index 1c10279aaf2f0e9fe2cb0b5477250389298a3208..0000000000000000000000000000000000000000
--- a/alib2data/src/std/tuple.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef __TUPLE_HPP_
-#define __TUPLE_HPP_
-
-#include <tuple>
-
-namespace std {
-
-template< class... Ts>
-std::ostream& operator<<(std::ostream& out, const std::tuple<Ts...>& tuple);
-
-}
-
-#include "deque.hpp"
-#include "set.hpp"
-#include "map.hpp"
-#include "list.hpp"
-#include "pair.hpp"
-#include "vector.hpp"
-#include <iostream>
-
-namespace std {
-
-template<int I, class Tuple>
-struct operator_shift_left_impl;
-
-template<int I, class Tuple>
-struct operator_shift_left_impl {
- static void operator_shift_left(ostream& out, const Tuple& t) {
- operator_shift_left_impl<I - 1, Tuple>::operator_shift_left(out, t);
- out << ", " << get<I>(t);
- }
-};
-
-template<class Tuple>
-struct operator_shift_left_impl<0, Tuple> {
- static void operator_shift_left(ostream& out, const Tuple& t) {
- out << get<0>(t);
- }
-};
-
-template< class... Ts>
-std::ostream& operator<<(std::ostream& out, const std::tuple<Ts...>& tuple) {
- out << "(";
- operator_shift_left_impl<tuple_size<std::tuple<Ts...>>::value - 1, std::tuple<Ts...>>::operator_shift_left(out, tuple);
- out << ")";
- return out;
-}
-
-} /* namespace std */
-
-#endif /* __TUPLE_HPP_ */
-
diff --git a/alib2data/src/std/utos.cpp b/alib2data/src/std/utos.cpp
deleted file mode 100644
index fbec7d462b65d7e450d5b530f6dd02777d3d9197..0000000000000000000000000000000000000000
--- a/alib2data/src/std/utos.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "utos.h"
-
-namespace std {
-
-string utos(unsigned integer, int) {
- stringstream ss;
- ss << integer;
- return ss.str();
-}
-
-}
diff --git a/alib2data/src/std/utos.h b/alib2data/src/std/utos.h
deleted file mode 100644
index 726d5e0430e434ed4359a348e17f27358414b84c..0000000000000000000000000000000000000000
--- a/alib2data/src/std/utos.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef UTOS_H_
-#define UTOS_H_
-
-#include <sstream>
-#include <string>
-
-namespace std {
-
-string utos(unsigned integer, int base = 10);
-
-} /* namespace std */
-
-#endif /* UTOS_H_ */
diff --git a/alib2data/src/std/vector.hpp b/alib2data/src/std/vector.hpp
deleted file mode 100644
index f5c76371af3af2c86993b2476ab8eaab4ccf5478..0000000000000000000000000000000000000000
--- a/alib2data/src/std/vector.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef __VECTOR_HPP_
-#define __VECTOR_HPP_
-
-#include <vector>
-
-namespace std {
-
-template< class T >
-std::ostream& operator<<(std::ostream& out, const std::vector<T>& vector);
-
-}
-
-#include "deque.hpp"
-#include "set.hpp"
-#include "map.hpp"
-#include "pair.hpp"
-#include "tuple.hpp"
-#include "list.hpp"
-#include <iostream>
-
-namespace std {
-
-template< class T >
-std::ostream& operator<<(std::ostream& out, const std::vector<T>& vector) {
- out << "[";
-
- bool first = true;
- for(const T& item : vector) {
- if(!first) out << ", ";
- first = false;
- out << item;
- }
-
- out << "]";
- return out;
-}
-
-} /* namespace std */
-
-#endif /* __VECTOR_HPP_ */
-
diff --git a/alib2data/src/string/CyclicString.h b/alib2data/src/string/CyclicString.h
index 18a63a7f47a5397b67d0f44a3bc609ba25df5ce8..779ec6ab140fc00c11f4fd4404a419fef8ffcec6 100644
--- a/alib2data/src/string/CyclicString.h
+++ b/alib2data/src/string/CyclicString.h
@@ -12,7 +12,6 @@
#include <set>
#include <vector>
-#include "../std/visitor.hpp"
#include "../alphabet/Symbol.h"
#include "StringBase.h"
#include "common/StringAlphabet.h"
diff --git a/alib2data/src/string/Epsilon.h b/alib2data/src/string/Epsilon.h
index 30621a85c060c05ef8b217d46d512cb890089563..305072d4dead6ffd98b466a56ef87e40651b9a7d 100644
--- a/alib2data/src/string/Epsilon.h
+++ b/alib2data/src/string/Epsilon.h
@@ -12,7 +12,6 @@
#include <set>
#include <vector>
-#include "../std/visitor.hpp"
#include "../alphabet/Symbol.h"
#include "StringBase.h"
#include "common/StringAlphabet.h"
diff --git a/alib2data/src/string/LinearString.h b/alib2data/src/string/LinearString.h
index 5138e70158b86f64fc1a0cdd3fddf079cc826975..208799eef1c983fbfdd320e30664925039a533a6 100644
--- a/alib2data/src/string/LinearString.h
+++ b/alib2data/src/string/LinearString.h
@@ -12,7 +12,6 @@
#include <set>
#include <vector>
-#include "../std/visitor.hpp"
#include "../alphabet/Symbol.h"
#include "StringBase.h"
#include "common/StringAlphabet.h"
diff --git a/alib2data/src/string/String.h b/alib2data/src/string/String.h
index 2ef1e1800132b44bafae156f7c8331348cd60810..fe4514b8a2860890151435dd553affa3005b4f4a 100644
--- a/alib2data/src/string/String.h
+++ b/alib2data/src/string/String.h
@@ -8,10 +8,8 @@
#ifndef STRING_H_
#define STRING_H_
-#include "../std/visitor.hpp"
-#include "../std/compare.hpp"
-#include "../common/wrapper.hpp"
#include "StringBase.h"
+#include "../common/wrapper.hpp"
#include "../alphabet/Symbol.h"
namespace string {
diff --git a/alib2data/src/string/StringBase.h b/alib2data/src/string/StringBase.h
index cda2b7a8dc5d939f97cb24ffb4a040e735eb963c..bd7627fb72b55b04cd576665ecb0714ab690b03d 100644
--- a/alib2data/src/string/StringBase.h
+++ b/alib2data/src/string/StringBase.h
@@ -8,7 +8,6 @@
#ifndef STRING_BASE_H_
#define STRING_BASE_H_
-#include "../std/visitor.hpp"
#include "../object/ObjectBase.h"
namespace string {
diff --git a/alib2data/src/string/StringFromStringParser.h b/alib2data/src/string/StringFromStringParser.h
index 46e35acaccadf9be48ecce25020f147db5cef5d4..0212a952adcb6fd49e851e649892d3707fb2c432 100644
--- a/alib2data/src/string/StringFromStringParser.h
+++ b/alib2data/src/string/StringFromStringParser.h
@@ -12,6 +12,8 @@
#include "StringFeatures.h"
#include "StringFromStringLexer.h"
+#include <vector>
+
namespace alib {
template<typename T>
diff --git a/alib2data/test-src/std/StdVisitorTest.cpp b/alib2data/test-src/common/VisitorTest.cpp
similarity index 93%
rename from alib2data/test-src/std/StdVisitorTest.cpp
rename to alib2data/test-src/common/VisitorTest.cpp
index 7963d0820c1dcb403c2cc2e5a0bfb8410d8809ce..a59db252bb4f11c9b5fcbdd10ce8db0806192fbf 100644
--- a/alib2data/test-src/std/StdVisitorTest.cpp
+++ b/alib2data/test-src/common/VisitorTest.cpp
@@ -1,16 +1,16 @@
-#include "StdVisitorTest.h"
-#include "std/visitor.hpp"
+#include "VisitorTest.h"
+#include "common/visitor.hpp"
#include "common/base.hpp"
#include <set>
#include <string>
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StdVisitorTest, "std" );
-CPPUNIT_TEST_SUITE_REGISTRATION( StdVisitorTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VisitorTest, "std" );
+CPPUNIT_TEST_SUITE_REGISTRATION( VisitorTest );
-void StdVisitorTest::setUp() {
+void VisitorTest::setUp() {
}
-void StdVisitorTest::tearDown() {
+void VisitorTest::tearDown() {
}
class Tmp1;
@@ -225,7 +225,7 @@ class TmpPromotingVisitor : public VisitableTmpBase::const_promoting_visitor_typ
}
};
-void StdVisitorTest::testVisitor() {
+void VisitorTest::testVisitor() {
TmpVisitor visitor;
Tmp1 tmp1(2);
@@ -236,7 +236,7 @@ void StdVisitorTest::testVisitor() {
CPPUNIT_ASSERT(a == 1);
}
-void StdVisitorTest::testSameVisitor() {
+void VisitorTest::testSameVisitor() {
TmpSameVisitor visitor;
Tmp2 tmpA(2);
@@ -247,7 +247,8 @@ void StdVisitorTest::testSameVisitor() {
CPPUNIT_ASSERT(a == 2);
}
-void StdVisitorTest::testPromoteVisitor() {
+
+void VisitorTest::testPromoteVisitor() {
TmpPromotingVisitor visitor;
Tmp1 tmp1(1);
diff --git a/alib2data/test-src/std/StdVisitorTest.h b/alib2data/test-src/common/VisitorTest.h
similarity index 80%
rename from alib2data/test-src/std/StdVisitorTest.h
rename to alib2data/test-src/common/VisitorTest.h
index bb2890cd70cd78466e9ac9e5b0b258b70b8531ee..3991d37c8056735d2a542cb90213e61382d97e10 100644
--- a/alib2data/test-src/std/StdVisitorTest.h
+++ b/alib2data/test-src/common/VisitorTest.h
@@ -3,9 +3,9 @@
#include <cppunit/extensions/HelperMacros.h>
-class StdVisitorTest : public CppUnit::TestFixture
+class VisitorTest : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( StdVisitorTest );
+ CPPUNIT_TEST_SUITE( VisitorTest );
CPPUNIT_TEST( testPromoteVisitor );
CPPUNIT_TEST( testSameVisitor );
CPPUNIT_TEST( testVisitor );
diff --git a/alib2data/test-src/std/StdTest.cpp b/alib2data/test-src/std/StdTest.cpp
deleted file mode 100644
index d64d5fb65c9acff5c12c2077c31e1fa864909292..0000000000000000000000000000000000000000
--- a/alib2data/test-src/std/StdTest.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "StdTest.h"
-#include "std/variant.hpp"
-#include <set>
-
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StdTest, "std" );
-CPPUNIT_TEST_SUITE_REGISTRATION( StdTest );
-
-void StdTest::setUp() {
-}
-
-void StdTest::tearDown() {
-}
-
-void StdTest::testIsBaseOf() {
- CPPUNIT_ASSERT( ( std::is_base_of_any<int, int, std::string, StdTest::test>::value ) == true );
- CPPUNIT_ASSERT( ( std::is_base_of<int, int>::value ) == true );
- CPPUNIT_ASSERT( ( std::is_base_of<int, std::string>::value ) == false );
- CPPUNIT_ASSERT( ( std::is_base_of<int, StdTest::test>::value ) == false );
-}
-
-void StdTest::testVariant() {
- std::variant<int, std::string, StdTest::test> d(10);
- CPPUNIT_ASSERT( d.is<int>() );
- CPPUNIT_ASSERT( d.get<int>() == 10 );
-
- std::string str = "abcde";
- d.set<std::string>(str);
- CPPUNIT_ASSERT( d.is<std::string>() );
- CPPUNIT_ASSERT( d.get<std::string>() == str );
-
- d.set<StdTest::test>(StdTest::test());
- *(d.get<StdTest::test>().holder) = 42;
-
- StdTest::test tmp;
- *(tmp.holder) = 42;
- CPPUNIT_ASSERT( d.is<StdTest::test>() );
- CPPUNIT_ASSERT( d.get<StdTest::test>() == tmp );
-
- std::variant<int, std::string, StdTest::test> e(d);
- CPPUNIT_ASSERT( e.get<StdTest::test>() == tmp );
-
- *(e.get<StdTest::test>().holder) = 43;
-
- CPPUNIT_ASSERT( (d < e) == true );
- CPPUNIT_ASSERT( (e < d) == false );
-
- CPPUNIT_ASSERT( (e == d) == false );
-
- d = std::variant<int, std::string, StdTest::test>(0);
- d = e;
-
- CPPUNIT_ASSERT( *(d.get<StdTest::test>().holder) == 43 );
-
- CPPUNIT_ASSERT( (d < e) == false );
- CPPUNIT_ASSERT( (e < d) == false );
-
- CPPUNIT_ASSERT( (e == d) == true );
-}
-
-void StdTest::testVariantSet() {
- StdTest::test tmp;
- *(tmp.holder) = 42;
-
- std::string str = "abcde";
-
- std::variant<int, std::string, StdTest::test> d(StdTest::test {});
- *(d.get<StdTest::test>().holder) = 42;
- std::variant<int, std::string, StdTest::test> e(d);
-
- std::variant<int, std::string, StdTest::test> f(5);
-
- std::variant<int, std::string, StdTest::test> g(str);
-
- std::set<std::variant<int, std::string, StdTest::test>> testSet;
- testSet.insert(d);
- testSet.insert(e);
- testSet.insert(f);
- testSet.insert(g);
-
- CPPUNIT_ASSERT( testSet.size() == 3 );
-
- for(std::set<std::variant<int, std::string, StdTest::test>>::const_iterator iter = testSet.begin(); iter != testSet.end(); iter++) {
- if(iter->is<int>())
- CPPUNIT_ASSERT( iter->get<int>() == 5);
- if(iter->is<std::string>())
- CPPUNIT_ASSERT( iter->get<std::string>() == str );
- if(iter->is<StdTest::test>())
- CPPUNIT_ASSERT( iter->get<StdTest::test>() == tmp );
- }
-
- std::variant<StdTest::test2, std::string, StdTest::test> h("aa");
- CPPUNIT_ASSERT( h.is<std::string>() );
-
- std::map<std::variant<std::string, int>, int> testMap;
- testMap.insert(std::make_pair(std::variant<std::string, int> {"aa"}, 10));
-
- CPPUNIT_ASSERT( testMap.size() == 1 );
- CPPUNIT_ASSERT( testMap.find(std::variant<std::string, int> {"aa"}) != testMap.end() );
- CPPUNIT_ASSERT( testMap.find(std::variant<std::string, int> {10}) == testMap.end() );
-
- testMap.insert(std::make_pair(std::variant<std::string, int> {"ab"}, 11));
- testMap.insert(std::make_pair(std::variant<std::string, int> {3}, 13));
-
- CPPUNIT_ASSERT( testMap.find(std::variant<std::string, int> {"aa"}) != testMap.end() );
- CPPUNIT_ASSERT( testMap.find(std::variant<std::string, int> {10}) == testMap.end() );
-}
diff --git a/alib2elgo/makefile b/alib2elgo/makefile
index 06337bb233ec243371724bdf14de12d55523aee0..e7a302f306706cb08c22221d797553927c9711bd 100644
--- a/alib2elgo/makefile
+++ b/alib2elgo/makefile
@@ -9,11 +9,11 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -rdynamic -shared -lxml2
-TEST_LDFLAGS_DEBUG:= -Llib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -lcppunit -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -rdynamic -shared -lxml2
+TEST_LDFLAGS_DEBUG:= -Llib-debug -L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -lcppunit -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-debug -rdynamic -shared -lxml2
-TEST_LDFLAGS_RELEASE:= -Llib-release -L../alib2data/lib-release -L../alib2algo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -lcppunit -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-debug -rdynamic -shared -lxml2
+TEST_LDFLAGS_RELEASE:= -Llib-release -L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -lcppunit -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
@@ -43,7 +43,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
@@ -95,7 +95,7 @@ test-obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../\$$(DEPTH)src/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../\$$(DEPTH)src/ -I../../\$$(DEPTH)alib2std/src/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
@@ -203,10 +203,10 @@ build-tests-release: test-bin-release/$(TESTBIN)
unit-test-debug: build-tests-debug
- LD_LIBRARY_PATH="../alib2data/lib-debug;../alib2algo/lib-debug;lib-debug" test-bin-debug/$(TESTBIN)
+ LD_LIBRARY_PATH="../alib2std/lib-debug;../alib2data/lib-debug;../alib2algo/lib-debug;lib-debug" test-bin-debug/$(TESTBIN)
unit-test-release: build-tests-release
- LD_LIBRARY_PATH="../alib2data/lib-release;../alib2algo/lib-release;lib-release" test-bin-release/$(TESTBIN)
+ LD_LIBRARY_PATH="../alib2std/lib-release;../alib2data/lib-release;../alib2algo/lib-release;lib-release" test-bin-release/$(TESTBIN)
diff --git a/alib2elgo/src/automaton/properties/efficient/AllEpsilonClosure.cpp b/alib2elgo/src/automaton/properties/efficient/AllEpsilonClosure.cpp
index 8171e797a31c31c6e4a55ef5db18df7bcc489553..148ff0fcc9dc9a9eb933bd5d6c09467ff890e80f 100644
--- a/alib2elgo/src/automaton/properties/efficient/AllEpsilonClosure.cpp
+++ b/alib2elgo/src/automaton/properties/efficient/AllEpsilonClosure.cpp
@@ -17,7 +17,6 @@
#include <set>
#include <map>
-#include <std/map.hpp>
#include <iostream>
#include <regexp/properties/RegExpEpsilon.h>
diff --git a/alib2std/makefile b/alib2std/makefile
new file mode 100644
index 0000000000000000000000000000000000000000..4d60b8ac75f2a4265987eab8368406122c7d965b
--- /dev/null
+++ b/alib2std/makefile
@@ -0,0 +1,225 @@
+SHELL:=/bin/bash
+LIBRARY:=libalib2std.so
+TESTBIN:=alib2test
+
+define NEW_LINE
+
+
+endef
+
+export NEW_LINE
+
+LDFLAGS_DEBUG:=-lbfd -liberty -lz -ldl -rdynamic -shared -lxml2
+TEST_LDFLAGS_DEBUG:= -Llib-debug -rdynamic -lxml2 -lalib2std -lcppunit -Wl,-rpath,.
+
+LDFLAGS_RELEASE:=-rdynamic -shared -lxml2
+TEST_LDFLAGS_RELEASE:= -Llib-release -rdynamic -lxml2 -lalib2std -lcppunit -Wl,-rpath,.
+
+OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
+TEST_OBJECTS_DEBUG:=$(patsubst test-src/%.cpp, test-obj-debug/%.o, $(shell find test-src/ -name *cpp))
+
+OBJECTS_RELEASE:=$(patsubst src/%.cpp, obj-release/%.o, $(filter-out $(wildcard src/debug/*), $(shell find src/ -name *cpp)))
+TEST_OBJECTS_RELEASE:=$(patsubst test-src/%.cpp, test-obj-release/%.o, $(shell find test-src/ -name *cpp))
+
+.PHONY: all build-debug build-tests-debug clean-debug doc
+
+all:
+ @echo "What to do master?"
+
+obj%/makefile: makefile
+ mkdir -p $(dir $@)
+ echo "\
+ SHELL:=/bin/bash$${NEW_LINE}\
+ SRCDIR:=$${NEW_LINE}\
+ DEPTH:=$${NEW_LINE}\
+ OBJECTS_BASE_DIR:=$${NEW_LINE}\
+ $${NEW_LINE}\
+ define NEW_LINE$${NEW_LINE}\
+ $${NEW_LINE}\
+ $${NEW_LINE}\
+ endef$${NEW_LINE}\
+ $${NEW_LINE}\
+ export NEW_LINE$${NEW_LINE}\
+ $${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/$${NEW_LINE}\
+ $${NEW_LINE}\
+ SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
+ DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
+ OBJECTS:= \$$(patsubst %.d, %.o, \$$(DEPENDENCIES))$${NEW_LINE}\
+ SOURCES_DIRS:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -mindepth 1 -type d)$${NEW_LINE}\
+ OBJECTS_DIRS:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%, %/, \$$(SOURCES_DIRS))$${NEW_LINE}\
+ OBJECTS_DIRS_MAKEFILES:= \$$(patsubst %, %makefile, \$$(OBJECTS_DIRS))$${NEW_LINE}\
+ $${NEW_LINE}\
+ .PHONY: all$${NEW_LINE}\
+ .PRECIOUS: \$$(DEPENDECIES) \$$(OBJECTS_DIRS_MAKEFILES)$${NEW_LINE}\
+ $${NEW_LINE}\
+ all: \$$(OBJECTS_DIRS) \$$(OBJECTS)$${NEW_LINE}\
+ $${NEW_LINE}\
+ %.d: makefile$${NEW_LINE}\
+ @echo \"\\$${NEW_LINE}\
+ \$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d,../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d,../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\$$\$${NEW_LINE}\\$${NEW_LINE}\
+ \$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\")) makefile\$$\$${NEW_LINE}\\$${NEW_LINE}\
+ \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\$$\$${NEW_LINE}\\$${NEW_LINE}\
+ \" > \$$@$${NEW_LINE}\
+ $${NEW_LINE}\
+ %/makefile: makefile$${NEW_LINE}\
+ mkdir -p \$$(dir \$$@)$${NEW_LINE}\
+ cp makefile \$$@$${NEW_LINE}\
+ $${NEW_LINE}\
+ %/: FORCE | %/makefile$${NEW_LINE}\
+ @accesstime=\`stat -c %Y \$$@\` && \\$${NEW_LINE}\
+ \$$(MAKE) -C \$$@ SRCDIR=\$$(SRCDIR)\$$(notdir \$$(patsubst %/, %, \$$@))/ DEPTH=\$$(DEPTH)../ OBJECTS_BASE_DIR=\$$(OBJECTS_BASE_DIR) SOURCES_BASE_DIR=\$$(SOURCES_BASE_DIR) CXX_OTHER_FLAGS=\"\$$(CXX_OTHER_FLAGS)\" && \\$${NEW_LINE}\
+ accesstime2=\`stat -c %Y \$$@\` && \\$${NEW_LINE}\
+ if [ "\$$\$$accesstime" -ne "\$$\$$accesstime2" ]; then \\$${NEW_LINE}\
+ touch .; \\$${NEW_LINE}\
+ fi$${NEW_LINE}\
+ $${NEW_LINE}\
+ FORCE:$${NEW_LINE}\
+ $${NEW_LINE}\
+ -include \$$(DEPENDENCIES)" > $@
+
+test-obj%/makefile: makefile
+ mkdir -p $(dir $@)
+ echo "\
+ SHELL:=/bin/bash$${NEW_LINE}\
+ SRCDIR:=$${NEW_LINE}\
+ DEPTH:=$${NEW_LINE}\
+ OBJECTS_BASE_DIR:=$${NEW_LINE}\
+ $${NEW_LINE}\
+ define NEW_LINE$${NEW_LINE}\
+ $${NEW_LINE}\
+ $${NEW_LINE}\
+ endef$${NEW_LINE}\
+ $${NEW_LINE}\
+ export NEW_LINE$${NEW_LINE}\
+ $${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src/$${NEW_LINE}\
+ $${NEW_LINE}\
+ SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
+ DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
+ OBJECTS:= \$$(patsubst %.d, %.o, \$$(DEPENDENCIES))$${NEW_LINE}\
+ SOURCES_DIRS:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -mindepth 1 -type d)$${NEW_LINE}\
+ OBJECTS_DIRS:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%, %/, \$$(SOURCES_DIRS))$${NEW_LINE}\
+ OBJECTS_DIRS_MAKEFILES:= \$$(patsubst %, %makefile, \$$(OBJECTS_DIRS))$${NEW_LINE}\
+ $${NEW_LINE}\
+ .PHONY: all$${NEW_LINE}\
+ .PRECIOUS: \$$(DEPENDECIES) \$$(OBJECTS_DIRS_MAKEFILES)$${NEW_LINE}\
+ $${NEW_LINE}\
+ all: \$$(OBJECTS_DIRS) \$$(OBJECTS)$${NEW_LINE}\
+ $${NEW_LINE}\
+ %.d: makefile$${NEW_LINE}\
+ @echo \"\\$${NEW_LINE}\
+ \$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d,../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d,../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\$$\$${NEW_LINE}\\$${NEW_LINE}\
+ \$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\")) makefile\$$\$${NEW_LINE}\\$${NEW_LINE}\
+ \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\$$\$${NEW_LINE}\\$${NEW_LINE}\
+ \" > \$$@$${NEW_LINE}\
+ $${NEW_LINE}\
+ %/makefile: makefile$${NEW_LINE}\
+ mkdir -p \$$(dir \$$@)$${NEW_LINE}\
+ cp makefile \$$@$${NEW_LINE}\
+ $${NEW_LINE}\
+ %/: FORCE | %/makefile$${NEW_LINE}\
+ @accesstime=\`stat -c %Y \$$@\` && \\$${NEW_LINE}\
+ \$$(MAKE) -C \$$@ SRCDIR=\$$(SRCDIR)\$$(notdir \$$(patsubst %/, %, \$$@))/ DEPTH=\$$(DEPTH)../ OBJECTS_BASE_DIR=\$$(OBJECTS_BASE_DIR) SOURCES_BASE_DIR=\$$(SOURCES_BASE_DIR) CXX_OTHER_FLAGS=\"\$$(CXX_OTHER_FLAGS)\" && \\$${NEW_LINE}\
+ accesstime2=\`stat -c %Y \$$@\` && \\$${NEW_LINE}\
+ if [ "\$$\$$accesstime" -ne "\$$\$$accesstime2" ]; then \\$${NEW_LINE}\
+ touch .; \\$${NEW_LINE}\
+ fi$${NEW_LINE}\
+ $${NEW_LINE}\
+ FORCE:$${NEW_LINE}\
+ $${NEW_LINE}\
+ -include \$$(DEPENDENCIES)" > $@
+
+debug: unit-test-debug
+
+release: unit-test-release
+
+clean: clean-debug clean-release
+ $(RM) -r doc
+
+test: unit-test-debug unit-test-release
+
+
+
+lib-debug/$(LIBRARY): $(OBJECTS_DEBUG) obj-debug/
+ mkdir -p $(dir $@)
+ $(CXX) $(OBJECTS_DEBUG) -o $@ $(LDFLAGS_DEBUG)
+
+lib-release/$(LIBRARY): $(OBJECTS_RELEASE) obj-release/
+ mkdir -p $(dir $@)
+ $(CXX) $(OBJECTS_RELEASE) -o $@ $(LDFLAGS_RELEASE)
+
+
+
+obj-debug/: FORCE obj-debug/makefile
+ $(MAKE) -C $@ OBJECTS_BASE_DIR=obj-debug SOURCES_BASE_DIR=src CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
+
+obj-release/: FORCE obj-release/makefile
+ $(MAKE) -C $@ OBJECTS_BASE_DIR=obj-release SOURCES_BASE_DIR=src CXX_OTHER_FLAGS="-O3 -DRELEASE"
+
+
+
+$(OBJECTS_DEBUG): obj-debug/
+
+$(OBJECTS_RELEASE): obj-release/
+
+
+build-debug: lib-debug/$(LIBRARY)
+
+build-release: lib-release/$(LIBRARY)
+
+
+
+test-bin-debug/$(TESTBIN): lib-debug/$(LIBRARY) $(TEST_OBJECTS_DEBUG) test-obj-debug/
+ mkdir -p $(dir $@)
+ $(CXX) $(TEST_OBJECTS_DEBUG) -o $@ $(TEST_LDFLAGS_DEBUG)
+
+test-bin-release/$(TESTBIN): lib-release/$(LIBRARY) $(TEST_OBJECTS_RELEASE) test-obj-release/
+ mkdir -p $(dir $@)
+ $(CXX) $(TEST_OBJECTS_RELEASE) -o $@ $(TEST_LDFLAGS_RELEASE)
+
+
+
+test-obj-debug/: FORCE test-obj-debug/makefile
+ $(MAKE) -C $@ OBJECTS_BASE_DIR=test-obj-debug SOURCES_BASE_DIR=test-src CXX_OTHER_FLAGS="-g -O0 -DDEBUG"
+
+test-obj-release/: FORCE test-obj-release/makefile
+ $(MAKE) -C $@ OBJECTS_BASE_DIR=test-obj-release SOURCES_BASE_DIR=test-src CXX_OTHER_FLAGS="-O3 -DRELEASE"
+
+
+
+$(TEST_OBJECTS_DEBUG): test-obj-debug/
+
+$(TEST_OBJECTS_RELEASE): test-obj-release/
+
+
+
+build-tests-debug: test-bin-debug/$(TESTBIN)
+
+build-tests-release: test-bin-release/$(TESTBIN)
+
+
+
+unit-test-debug: build-tests-debug
+ LD_LIBRARY_PATH="lib-debug" test-bin-debug/$(TESTBIN)
+
+unit-test-release: build-tests-release
+ LD_LIBRARY_PATH="lib-release" test-bin-release/$(TESTBIN)
+
+
+
+clean-debug:
+ $(RM) -r *.o *.d lib-debug obj-debug test-bin-debug test-obj-debug CppUnitTestResults.xml
+
+clean-release:
+ $(RM) -r *.o *.d lib-release obj-release test-bin-release test-obj-release CppUnitTestResults.xml
+
+
+
+FORCE:
+
+
+
+doc:
+ doxygen
+
diff --git a/alib2std/src/compare b/alib2std/src/compare
new file mode 100644
index 0000000000000000000000000000000000000000..9a9cd74051ed629c3fe132c52e414941c867d40b
--- /dev/null
+++ b/alib2std/src/compare
@@ -0,0 +1,6 @@
+#ifndef __COMPARE_HEADER_WRAPPER_
+#define __COMPARE_HEADER_WRAPPER_
+
+#include "extensions/compare.hpp"
+
+#endif /* __COMPARE_HEADER_WRAPPER_ */
diff --git a/alib2std/src/deque b/alib2std/src/deque
new file mode 100644
index 0000000000000000000000000000000000000000..1d29e1d263c16ef3b8c7bb11bea424d796d7296f
--- /dev/null
+++ b/alib2std/src/deque
@@ -0,0 +1,10 @@
+#ifndef __DEQUE_HEADER_WRAPPER_
+#define __DEQUE_HEADER_WRAPPER_
+
+#include <bits/../deque>
+#include <ostream>
+#include "compare"
+#include "extensions/deque.hpp"
+
+#endif /* __DEQUE_HEADER_WRAPPER_ */
+
diff --git a/alib2std/src/extensions/compare.hpp b/alib2std/src/extensions/compare.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..08f4869e56b4845268f0348525aa31dbb3fe4246
--- /dev/null
+++ b/alib2std/src/extensions/compare.hpp
@@ -0,0 +1,41 @@
+/*
+ * compare.hpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#ifndef COMPARE_HPP_
+#define COMPARE_HPP_
+
+namespace std {
+
+template<class T>
+struct compare {
+ int operator()(T first, T second) const;
+};
+
+template<>
+struct compare<bool> {
+ int operator()(bool first, bool second) const {
+ return first - second;
+ }
+};
+
+template<>
+struct compare<int> {
+ int operator()(int first, int second) const {
+ return first - second;
+ }
+};
+
+template<>
+struct compare<double> {
+ int operator()(double first, double second) const {
+ return first - second;
+ }
+};
+
+} /* namespace std */
+
+#endif /* COMPARE_HPP_ */
diff --git a/alib2data/src/std/deque.hpp b/alib2std/src/extensions/deque.hpp
similarity index 56%
rename from alib2data/src/std/deque.hpp
rename to alib2std/src/extensions/deque.hpp
index b649e2e06bd8d60a8111c5c12fd3d6a1bfb24c6f..0b317937c2bad45f64ab01c239f259a0e70e1b6f 100644
--- a/alib2data/src/std/deque.hpp
+++ b/alib2std/src/extensions/deque.hpp
@@ -1,23 +1,13 @@
+/*
+ * deque.hpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
#ifndef __DEQUE_HPP_
#define __DEQUE_HPP_
-#include <deque>
-
-namespace std {
-
-template< class T >
-std::ostream& operator<<(std::ostream& out, const std::deque<T>& list);
-
-}
-
-#include "set.hpp"
-#include "map.hpp"
-#include "pair.hpp"
-#include "list.hpp"
-#include "tuple.hpp"
-#include "vector.hpp"
-#include <iostream>
-
namespace std {
template< class T >
diff --git a/alib2data/src/std/hexavigesimal.cpp b/alib2std/src/extensions/hexavigesimal.cpp
similarity index 89%
rename from alib2data/src/std/hexavigesimal.cpp
rename to alib2std/src/extensions/hexavigesimal.cpp
index cc544a4400cda79b83c39bc174f97d6d4b0238e9..836481746762dc9c5d56b77f5015121c39477254 100644
--- a/alib2data/src/std/hexavigesimal.cpp
+++ b/alib2std/src/extensions/hexavigesimal.cpp
@@ -1,11 +1,11 @@
/*
- * Hexavigesimal.cpp
+ * hexavigesimal.cpp
*
- * Created on: 19. 4. 2014
- * Author: Tomas Pecka
+ * Created on: 19. 4. 2014
+ * Author: Tomas Pecka
*/
-#include "hexavigesimal.h"
+#include "../hexavigesimal"
#include <stdexcept>
namespace std {
diff --git a/alib2data/src/std/hexavigesimal.h b/alib2std/src/extensions/hexavigesimal.h
similarity index 92%
rename from alib2data/src/std/hexavigesimal.h
rename to alib2std/src/extensions/hexavigesimal.h
index 1d3be3bcfe27a1d16424baaaa472aed5db80246d..91f5d2369d786f71265f332ae01ecdff713442b2 100644
--- a/alib2data/src/std/hexavigesimal.h
+++ b/alib2std/src/extensions/hexavigesimal.h
@@ -1,8 +1,8 @@
/*
- * Hexavigesimal.h
+ * hexavigesimal.h
*
- * Created on: 19. 4. 2014
- * Author: Tomas Pecka
+ * Created on: 19. 4. 2014
+ * Author: Tomas Pecka
*/
#ifndef HEXAVIGESIMAL_H_
diff --git a/alib2data/src/std/istream.cpp b/alib2std/src/extensions/istream.cpp
similarity index 86%
rename from alib2data/src/std/istream.cpp
rename to alib2std/src/extensions/istream.cpp
index 206bad40055cace49cacee7986fb9fb6cf16b1ed..80e2536a9ed1fc770755c4fd9972cb5efead37fe 100644
--- a/alib2data/src/std/istream.cpp
+++ b/alib2std/src/extensions/istream.cpp
@@ -1,4 +1,11 @@
-#include "istream.h"
+/*
+ * istream.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "../istream"
std::istream& oprr(std::istream& in, const std::string& str, bool start) {
if(str.size() == 0) return in;
diff --git a/alib2data/src/std/istream.h b/alib2std/src/extensions/istream.h
similarity index 59%
rename from alib2data/src/std/istream.h
rename to alib2std/src/extensions/istream.h
index 3d5167191f0463ca0ca6b4760e7915b0b166f1f1..2fad59c8eb8b511696cc1439630b984de127ad9e 100644
--- a/alib2data/src/std/istream.h
+++ b/alib2std/src/extensions/istream.h
@@ -1,9 +1,15 @@
+/*
+ * istream.hpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
#ifndef ISTREAM_H_
#define ISTREAM_H_
-#include <iostream>
#include <string>
std::istream& operator>>(std::istream& in, const std::string& str);
-#endif
\ No newline at end of file
+#endif
diff --git a/alib2std/src/extensions/list.hpp b/alib2std/src/extensions/list.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..389234eb555fc1ed3307e495d00d855400c3cb15
--- /dev/null
+++ b/alib2std/src/extensions/list.hpp
@@ -0,0 +1,46 @@
+/*
+ * list.hpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#ifndef __LIST_HPP_
+#define __LIST_HPP_
+
+namespace std {
+
+template< class T >
+std::ostream& operator<<(std::ostream& out, const std::list<T>& list) {
+ out << "[";
+
+ bool first = true;
+ for(const T& item : list) {
+ if(!first) out << ", ";
+ first = false;
+ out << item;
+ }
+
+ out << "]";
+ return out;
+}
+
+template<class T>
+struct compare<list<T>> {
+ int operator()(const list<T>& first, const list<T>& second) const {
+ if(first.size() < second.size()) return -1;
+ if(first.size() > second.size()) return 1;
+
+ compare<T> comp;
+ for(auto iterF = first.begin(), iterS = second.begin(); iterF != first.end(); iterF++, iterS++) {
+ int res = comp(*iterF, *iterS);
+ if(res != 0) return res;
+ }
+ return 0;
+ }
+};
+
+} /* namespace std */
+
+#endif /* __LIST_HPP_ */
+
diff --git a/alib2data/src/std/map.hpp b/alib2std/src/extensions/map.hpp
similarity index 69%
rename from alib2data/src/std/map.hpp
rename to alib2std/src/extensions/map.hpp
index c968dbf65e53019b1406e221269d20974c7b0de9..9b1f6313a0eaf021df3aa2d1be4b09722fabb0da 100644
--- a/alib2data/src/std/map.hpp
+++ b/alib2std/src/extensions/map.hpp
@@ -1,22 +1,14 @@
+/*
+ * map.hpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
#ifndef __MAP_HPP_
#define __MAP_HPP_
-#include <map>
-
-namespace std {
-
-template< class T, class R >
-std::ostream& operator<<(std::ostream& out, const std::map<T, R>& map);
-
-}
-
-#include "deque.hpp"
-#include "set.hpp"
#include "pair.hpp"
-#include "list.hpp"
-#include "tuple.hpp"
-#include "vector.hpp"
-#include <iostream>
namespace std {
@@ -35,6 +27,21 @@ std::ostream& operator<<(std::ostream& out, const std::map<T, R>& map) {
return out;
}
+template<class T, class R>
+struct compare<map<T, R>> {
+ int operator()(const map<T, R>& first, const map<T, R>& second) const {
+ if(first.size() < second.size()) return -1;
+ if(first.size() > second.size()) return 1;
+
+ compare<std::pair<T, R>> comp;
+ for(auto iterF = first.begin(), iterS = second.begin(); iterF != first.end(); iterF++, iterS++) {
+ int res = comp(*iterF, *iterS);
+ if(res != 0) return res;
+ }
+ return 0;
+ }
+};
+
template<typename map_type>
class key_iterator : public map_type::const_iterator {
public:
diff --git a/alib2std/src/extensions/pair.hpp b/alib2std/src/extensions/pair.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..a6dae535266b5eda896fe8bfedd50a1e2656820f
--- /dev/null
+++ b/alib2std/src/extensions/pair.hpp
@@ -0,0 +1,34 @@
+/*
+ * pair.hpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#ifndef __PAIR_HPP_
+#define __PAIR_HPP_
+
+namespace std {
+
+template< class T, class R >
+std::ostream& operator<<(std::ostream& out, const std::pair<T, R>& pair) {
+ out << "(" << pair.first << ", " << pair.second << ")";
+ return out;
+}
+
+template<class T, class R>
+struct compare<pair<T, R>> {
+ int operator()(const pair<T, R>& first, const pair<T, R>& second) const {
+ compare<T> compT;
+ compare<R> compR;
+
+ int res = compT(first.first, second.first);
+ if(res == 0) res = compR(first.second, second.second);
+ return res;
+ }
+};
+
+} /* namespace std */
+
+#endif /* __PAIR_HPP_ */
+
diff --git a/alib2data/src/std/pointer.hpp b/alib2std/src/extensions/pointer.hpp
similarity index 90%
rename from alib2data/src/std/pointer.hpp
rename to alib2std/src/extensions/pointer.hpp
index 46c9e710e21fda2390809d96c1d3afc483dd8457..13fb81a2826d9660230a7da1844d8622d94231f6 100644
--- a/alib2data/src/std/pointer.hpp
+++ b/alib2std/src/extensions/pointer.hpp
@@ -1,3 +1,10 @@
+/*
+ * pointer.hpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
#ifndef __POINTER_HPP_
#define __POINTER_HPP_
diff --git a/alib2data/src/std/set.hpp b/alib2std/src/extensions/set.hpp
similarity index 82%
rename from alib2data/src/std/set.hpp
rename to alib2std/src/extensions/set.hpp
index a3f2c611b8743f749aa540b2d6303076bfd1d588..96904208e3d7f166c614db7b96ac5ee656647253 100644
--- a/alib2data/src/std/set.hpp
+++ b/alib2std/src/extensions/set.hpp
@@ -1,23 +1,13 @@
+/*
+ * std.hpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
#ifndef __SET_HPP_
#define __SET_HPP_
-#include <set>
-
-namespace std {
-
-template< class T >
-std::ostream& operator<<(std::ostream& out, const std::set<T>& list);
-
-}
-
-#include "deque.hpp"
-#include "map.hpp"
-#include "pair.hpp"
-#include "list.hpp"
-#include "tuple.hpp"
-#include "vector.hpp"
-#include <iostream>
-
namespace std {
template< class T >
@@ -35,6 +25,21 @@ std::ostream& operator<<(std::ostream& out, const std::set<T>& list) {
return out;
}
+template<class T>
+struct compare<set<T>> {
+ int operator()(const set<T>& first, const set<T>& second) const {
+ if(first.size() < second.size()) return -1;
+ if(first.size() > second.size()) return 1;
+
+ compare<T> comp;
+ for(auto iterF = first.begin(), iterS = second.begin(); iterF != first.end(); iterF++, iterS++) {
+ int res = comp(*iterF, *iterS);
+ if(res != 0) return res;
+ }
+ return 0;
+ }
+};
+
template<class T>
bool empty_intersection(const set<T>& x, const set<T>& y) {
auto i = x.begin();
diff --git a/alib2std/src/extensions/string.cpp b/alib2std/src/extensions/string.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..84da99c3947063cd146d0d9129eb87131950e24a
--- /dev/null
+++ b/alib2std/src/extensions/string.cpp
@@ -0,0 +1,33 @@
+/*
+ * string.hpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#include "../compare"
+#include "../string"
+#include <sstream>
+
+namespace std {
+
+string itos(int integer, int) {
+ stringstream ss;
+ ss << integer;
+ return ss.str();
+}
+
+unsigned stou(const std::string& string, int) {
+ stringstream ss(string);
+ unsigned integer;
+ ss >> integer;
+ return integer;
+}
+
+string utos(unsigned integer, int) {
+ stringstream ss;
+ ss << integer;
+ return ss.str();
+}
+
+}
diff --git a/alib2std/src/extensions/string.hpp b/alib2std/src/extensions/string.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..ab70ebfb183cb187b0601aed66e4ed38cce142db
--- /dev/null
+++ b/alib2std/src/extensions/string.hpp
@@ -0,0 +1,28 @@
+/*
+ * string.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#ifndef STRING_HPP_
+#define STIRNG_HPP_
+
+namespace std {
+
+string itos(int integer, int base = 10);
+
+unsigned stou(const std::string&, int base = 10);
+
+string utos(unsigned integer, int base = 10);
+
+template<>
+struct compare<string> {
+ int operator()(const string& first, const string& second) const {
+ return first.compare(second);
+ }
+};
+
+} /* namespace std */
+
+#endif /* STRING_HPP_ */
diff --git a/alib2std/src/extensions/tuple.hpp b/alib2std/src/extensions/tuple.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..8c85a5c943408f2c434bd28f5e73ed528d111a5e
--- /dev/null
+++ b/alib2std/src/extensions/tuple.hpp
@@ -0,0 +1,104 @@
+/*
+ * tuple.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Jan Travnicek
+ */
+
+#ifndef __TUPLE_HPP_
+#define __TUPLE_HPP_
+
+namespace std {
+
+template<int I, class Tuple>
+struct operator_shift_left_impl;
+
+template<int I, class Tuple>
+struct operator_shift_left_impl {
+ static void operator_shift_left(ostream& out, const Tuple& t) {
+ operator_shift_left_impl<I - 1, Tuple>::operator_shift_left(out, t);
+ out << ", " << get<I>(t);
+ }
+};
+
+template<class Tuple>
+struct operator_shift_left_impl<0, Tuple> {
+ static void operator_shift_left(ostream& out, const Tuple& t) {
+ out << get<0>(t);
+ }
+};
+
+template< class... Ts>
+std::ostream& operator<<(std::ostream& out, const std::tuple<Ts...>& tuple) {
+ out << "(";
+ operator_shift_left_impl<tuple_size<std::tuple<Ts...>>::value - 1, std::tuple<Ts...>>::operator_shift_left(out, tuple);
+ out << ")";
+ return out;
+}
+
+
+
+template<int I, typename Tuple>
+struct compareTupleHelper;
+
+template<int I, typename Tuple>
+struct compareTupleHelper {
+ static int compHelp(const Tuple& t1, const Tuple& t2) {
+ compare<typename tuple_element<I, Tuple>::type> comp;
+ int res = comp(std::get<I>(t1), std::get<I>(t2));
+ if(res != 0) return res;
+ return compareTupleHelper<I - 1, Tuple>::compHelp(t1, t2);
+ }
+};
+
+template<class Tuple>
+struct compareTupleHelper<0, Tuple> {
+ static int compHelp(const Tuple& t1, const Tuple& t2) {
+ compare<typename tuple_element<0, Tuple>::type> comp;
+ return comp(std::get<0>(t1), std::get<0>(t2));
+ }
+};
+
+
+template<typename ... Ts>
+struct compare<tuple<Ts...>> {
+ int operator()(const tuple<Ts...>& first, const tuple<Ts...>& second) const {
+ return compareTupleHelper<tuple_size<std::tuple<Ts...>>::value - 1, std::tuple<Ts...>>::compHelp(first, second);
+ }
+};
+
+
+
+template<int I, typename Tie>
+struct compareTieHelper;
+
+template<int I, typename Tie>
+struct compareTieHelper {
+ static int compHelp(const Tie& t1, const Tie& t2) {
+ compare<typename std::remove_const<typename std::remove_reference<typename tuple_element<I, Tie>::type>::type>::type> comp;
+ int res = comp(std::get<I>(t1), std::get<I>(t2));
+ if(res != 0) return res;
+ return compareTieHelper<I - 1, Tie>::compHelp(t1, t2);
+ }
+};
+
+template<class Tie>
+struct compareTieHelper<0, Tie> {
+ static int compHelp(const Tie& t1, const Tie& t2) {
+ compare<typename std::remove_const<typename std::remove_reference<typename tuple_element<0, Tie>::type>::type>::type> comp;
+ return comp(std::get<0>(t1), std::get<0>(t2));
+ }
+};
+
+
+template<typename ... Ts>
+struct compare<tuple<Ts&...>> {
+ int operator()(const tuple<Ts&...>& first, const tuple<Ts&...>& second) const {
+ return compareTieHelper<tuple_size<std::tuple<Ts&...>>::value - 1, std::tuple<Ts&...>>::compHelp(first, second);
+ }
+};
+
+} /* namespace std */
+
+#endif /* __TUPLE_HPP_ */
+
diff --git a/alib2data/src/std/type_traits.hpp b/alib2std/src/extensions/type_traits.hpp
similarity index 89%
rename from alib2data/src/std/type_traits.hpp
rename to alib2std/src/extensions/type_traits.hpp
index d357fcdbe6443c194a4a61a25d0c6575e54347d5..ed02b7d8ad88454b0ca5bfcb8241e1de449dc128 100644
--- a/alib2data/src/std/type_traits.hpp
+++ b/alib2std/src/extensions/type_traits.hpp
@@ -1,6 +1,8 @@
-/**
- * Created on: Feb 28, 2014
- * Author: Jan Travnicek
+/*
+ * tuple.hpp
+ *
+ * Created on: Feb 28, 2014
+ * Author: Jan Travnicek
*/
#ifndef TYPE_TRAITS_HPP_
diff --git a/alib2std/src/extensions/unordered_map.hpp b/alib2std/src/extensions/unordered_map.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..e05f46314f4c7775725a21e73cc94813673c88e0
--- /dev/null
+++ b/alib2std/src/extensions/unordered_map.hpp
@@ -0,0 +1,48 @@
+/*
+ * unordered_map.hpp
+ *
+ * Created on: Feb 28, 2014
+ * Author: Jan Travnicek
+ */
+
+#ifndef __UNORDERED_MAP_HPP_
+#define __UNORDERED_MAP_HPP_
+
+namespace std {
+
+template< class T, class R >
+std::ostream& operator<<(std::ostream& out, const std::unordered_map<T, R>& map) {
+ out << "{";
+
+ bool first = true;
+ for(const std::pair<T, R>& item : map) {
+ if(!first) out << ", ";
+ first = false;
+ out << item;
+ }
+
+ out << "}";
+ return out;
+}
+
+template<class T, class R>
+struct compare<unordered_map<T, R>> {
+ int operator()(const unordered_map<T, R>& first, const unordered_map<T, R>& second) const {
+ if(first.size() < second.size()) return -1;
+ if(first.size() > second.size()) return 1;
+
+ compare<R> comp;
+ for(auto iter = first.begin(); iter != first.end(); iter++) {
+ auto search = second.find(iter->first);
+ if(search == second.end()) return -1;
+ int res = comp(iter->second, search->second);
+ if(res != 0) return res;
+ }
+ return 0;
+ }
+};
+
+} /* namespace std */
+
+#endif /* __UNORDERED_MAP_HPP_ */
+
diff --git a/alib2data/src/std/variant.hpp b/alib2std/src/extensions/variant.hpp
similarity index 97%
rename from alib2data/src/std/variant.hpp
rename to alib2std/src/extensions/variant.hpp
index 22352c04772419e877051f8f68cff67a71e4b184..7d5dc25a29851a776dfadce2c8e7935870385dc8 100644
--- a/alib2data/src/std/variant.hpp
+++ b/alib2std/src/extensions/variant.hpp
@@ -1,8 +1,9 @@
/**
- * https://gist.github.com/tibordp/6909880
- * Created on: Feb 28, 2014
- * Author: Tibor Djurica Potpara
- * Modified: Jan Travnicek
+ * https://gist.github.com/tibordp/6909880
+ *
+ * Created on: Feb 28, 2014
+ * Author: Tibor Djurica Potpara
+ * Modified: Jan Travnicek
*/
#ifndef VATIANT_HPP_
diff --git a/alib2std/src/extensions/vector.hpp b/alib2std/src/extensions/vector.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..088bd50e33aab09b1cf5fa6948b2a39f073c1c6e
--- /dev/null
+++ b/alib2std/src/extensions/vector.hpp
@@ -0,0 +1,46 @@
+/*
+ * vector.hpp
+ *
+ * Created on: Feb 28, 2014
+ * Author: Jan Travnicek
+ */
+
+#ifndef __VECTOR_HPP_
+#define __VECTOR_HPP_
+
+namespace std {
+
+template< class T >
+std::ostream& operator<<(std::ostream& out, const std::vector<T>& vector) {
+ out << "[";
+
+ bool first = true;
+ for(const T& item : vector) {
+ if(!first) out << ", ";
+ first = false;
+ out << item;
+ }
+
+ out << "]";
+ return out;
+}
+
+template<class T>
+struct compare<vector<T>> {
+ int operator()(const vector<T>& first, const vector<T>& second) const {
+ if(first.size() < second.size()) return -1;
+ if(first.size() > second.size()) return 1;
+
+ compare<T> comp;
+ for(auto iterF = first.begin(), iterS = second.begin(); iterF != first.end(); iterF++, iterS++) {
+ int res = comp(*iterF, *iterS);
+ if(res != 0) return res;
+ }
+ return 0;
+ }
+};
+
+} /* namespace std */
+
+#endif /* __VECTOR_HPP_ */
+
diff --git a/alib2std/src/hexavigesimal b/alib2std/src/hexavigesimal
new file mode 100644
index 0000000000000000000000000000000000000000..087b94ce5d070257a63556c3d1b4fc3a26de539b
--- /dev/null
+++ b/alib2std/src/hexavigesimal
@@ -0,0 +1,7 @@
+#ifndef __HEXAVIGESIMAL_HEADER_WRAPPER_
+#define __HEXAVIGESIMAL_HEADER_WRAPPER_
+
+#include "string"
+#include "extensions/hexavigesimal.h"
+
+#endif /* __HEXAVIGESIMAL_HEADER_WRAPPER_ */
diff --git a/alib2std/src/istream b/alib2std/src/istream
new file mode 100644
index 0000000000000000000000000000000000000000..0ba827946fa5e1fae9034591972ad13d1560bdda
--- /dev/null
+++ b/alib2std/src/istream
@@ -0,0 +1,8 @@
+#ifndef __ISTREAM_HEADER_WRAPPER_
+#define __ISTREAM_HEADER_WRAPPER_
+
+#include <bits/../istream>
+#include "string"
+#include "extensions/istream.h"
+
+#endif /* __ISTREAM_HEADER_WRAPPER_ */
diff --git a/alib2std/src/list b/alib2std/src/list
new file mode 100644
index 0000000000000000000000000000000000000000..0a88a69cecf19da7e91ef646f047b8ba7d91a896
--- /dev/null
+++ b/alib2std/src/list
@@ -0,0 +1,10 @@
+#ifndef __LIST_HEADER_WRAPPER_
+#define __LIST_HEADER_WRAPPER_
+
+#include <bits/../list>
+#include <ostream>
+#include "compare"
+#include "extensions/list.hpp"
+
+#endif /* __LIST_HEADER_WRAPPER_ */
+
diff --git a/alib2std/src/map b/alib2std/src/map
new file mode 100644
index 0000000000000000000000000000000000000000..24511250b0d3ade6f64107a3fd5195fbc964234c
--- /dev/null
+++ b/alib2std/src/map
@@ -0,0 +1,10 @@
+#ifndef __MAP_HEADER_WRAPPER_
+#define __MAP_HEADER_WRAPPER_
+
+#include <bits/../map>
+#include <ostream>
+#include "compare"
+#include "extensions/map.hpp"
+
+#endif /* __MAP_HEADER_WRAPPER_ */
+
diff --git a/alib2std/src/pair b/alib2std/src/pair
new file mode 100644
index 0000000000000000000000000000000000000000..f0d1d51b3704c1462fa44eed1fc4cbe2782485e9
--- /dev/null
+++ b/alib2std/src/pair
@@ -0,0 +1,8 @@
+#ifndef __PAIR_HEADER_WRAPPER_
+#define __PAIR_HEADER_WRAPPER_
+
+#include "map"
+#include "extensions/pair.hpp"
+
+#endif /* __PAIR_HEADER_WRAPPER_ */
+
diff --git a/alib2std/src/pointer b/alib2std/src/pointer
new file mode 100644
index 0000000000000000000000000000000000000000..59d9352ddf9faf4820666705b7ee260177e1138e
--- /dev/null
+++ b/alib2std/src/pointer
@@ -0,0 +1,8 @@
+#ifndef __POINTER_HEADER_WRAPPER_
+#define __POINTER_HEADER_WRAPPER_
+
+#include <cstdlib>
+#include "extensions/pointer.hpp"
+
+#endif /* __POINTER_HEADER_WRAPPER_ */
+
diff --git a/alib2std/src/set b/alib2std/src/set
new file mode 100644
index 0000000000000000000000000000000000000000..d8778ef34c17fec0a13789e13130e5429b410fb8
--- /dev/null
+++ b/alib2std/src/set
@@ -0,0 +1,10 @@
+#ifndef __SET_HEADER_WRAPPER_
+#define __SET_HEADER_WRAPPER_
+
+#include <bits/../set>
+#include <ostream>
+#include "compare"
+#include "extensions/set.hpp"
+
+#endif /* __SET_HEADER_WRAPPER_ */
+
diff --git a/alib2std/src/string b/alib2std/src/string
new file mode 100644
index 0000000000000000000000000000000000000000..9546b1983a45cc4c315a10f9709fc5ef05bd9c7a
--- /dev/null
+++ b/alib2std/src/string
@@ -0,0 +1,9 @@
+#ifndef __STRING_HEADER_WRAPPER_
+#define __STRING_HEADER_WRAPPER_
+
+#include <bits/../string>
+#include <ostream>
+#include "compare"
+#include "extensions/string.hpp"
+
+#endif /* __STRING_HEADER_WRAPPER_ */
diff --git a/alib2std/src/tuple b/alib2std/src/tuple
new file mode 100644
index 0000000000000000000000000000000000000000..ab88dc49dff69ebeab68762c94601ed10c1d747a
--- /dev/null
+++ b/alib2std/src/tuple
@@ -0,0 +1,10 @@
+#ifndef __TUPLE_HEADER_WRAPPER_
+#define __TUPLE_HEADER_WRAPPER_
+
+#include <bits/../tuple>
+#include <ostream>
+#include "compare"
+#include "extensions/tuple.hpp"
+
+#endif /* __TUPLE_HEADER_WRAPPER_ */
+
diff --git a/alib2std/src/type_traits b/alib2std/src/type_traits
new file mode 100644
index 0000000000000000000000000000000000000000..c612cf162b8a0bbe1677058910d5f05597147a9c
--- /dev/null
+++ b/alib2std/src/type_traits
@@ -0,0 +1,7 @@
+#ifndef __TYPE_TRAITS_HEADER_WRAPPER_
+#define __TYPE_TRAITS_HEADER_WRAPPER_
+
+#include <bits/../type_traits>
+#include "extensions/type_traits.hpp"
+
+#endif /* __TYPE_TRAITS_HEADER_WRAPPER_ */
diff --git a/alib2std/src/unordered_map b/alib2std/src/unordered_map
new file mode 100644
index 0000000000000000000000000000000000000000..ed74cc59391659acaeb59d24e1915645a92c05c6
--- /dev/null
+++ b/alib2std/src/unordered_map
@@ -0,0 +1,10 @@
+#ifndef __UNORDERED_MAP_HEADER_WRAPPER_
+#define __UNORDERED_MAP_HEADER_WRAPPER_
+
+#include <bits/../unordered_map>
+#include <ostream>
+#include "compare"
+#include "extensions/unordered_map.hpp"
+
+#endif /* __UNORDERED_MAP_HEADER_WRAPPER_ */
+
diff --git a/alib2std/src/variant b/alib2std/src/variant
new file mode 100644
index 0000000000000000000000000000000000000000..6a411100665e13e65e15dc7dc797425446fe6693
--- /dev/null
+++ b/alib2std/src/variant
@@ -0,0 +1,13 @@
+#ifndef __VATIANT_HEADER_WRAPPER_
+#define __VATIANT_HEADER_WRAPPER_
+
+#include <iostream>
+#include <utility>
+#include <typeinfo>
+#include "type_traits"
+#include "string"
+#include "compare"
+#include "extensions/variant.hpp"
+
+#endif /* __VARIANT_HEADER_WRAPPER */
+
diff --git a/alib2std/src/vector b/alib2std/src/vector
new file mode 100644
index 0000000000000000000000000000000000000000..5df5bd52eba22c57b00be1ea624e5efea133db1f
--- /dev/null
+++ b/alib2std/src/vector
@@ -0,0 +1,10 @@
+#ifndef __VECTOR_HEADER_WRAPPER_
+#define __VECTOR_HEADER_WRAPPER_
+
+#include <bits/../vector>
+#include <ostream>
+#include "compare"
+#include "extensions/vector.hpp"
+
+#endif /* __VECTOR_HEADER_WRAPPER_ */
+
diff --git a/alib2std/test-src/extensions/CompareTest.cpp b/alib2std/test-src/extensions/CompareTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..014405b436d836606e020c21bc03ad2d28d9c429
--- /dev/null
+++ b/alib2std/test-src/extensions/CompareTest.cpp
@@ -0,0 +1,35 @@
+#include "CompareTest.h"
+#include <set>
+#include <vector>
+#include <pair>
+
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( CompareTest, "bits" );
+CPPUNIT_TEST_SUITE_REGISTRATION( CompareTest );
+
+void CompareTest::setUp() {
+}
+
+void CompareTest::tearDown() {
+}
+
+void CompareTest::testCompare() {
+ std::vector<int> vector1 {1, 2, 3};
+ std::vector<int> vector2 {2, 3, 4};
+
+ std::compare<std::vector<int>> comp1;
+ CPPUNIT_ASSERT(comp1(vector1, vector2) < 0);
+
+ std::set<std::vector<int>> set1 {vector1};
+ std::set<std::vector<int>> set2 {vector2};
+
+ std::compare<std::set<std::vector<int>>> comp2;
+ CPPUNIT_ASSERT(comp2(set1, set2) < 0);
+
+ std::pair<std::set<std::vector<int>>, std::set<std::vector<int>>> pair1 {set1, set2};
+ std::pair<std::set<std::vector<int>>, std::set<std::vector<int>>> pair2 {set2, set1};
+
+ std::compare<std::pair<std::set<std::vector<int>>, std::set<std::vector<int>>>> comp3;
+ CPPUNIT_ASSERT(comp3(pair1, pair2) < 0);
+}
+
diff --git a/alib2std/test-src/extensions/CompareTest.h b/alib2std/test-src/extensions/CompareTest.h
new file mode 100644
index 0000000000000000000000000000000000000000..b56c879e93a51687cdc6fd2348cfb4c0f2c57a6c
--- /dev/null
+++ b/alib2std/test-src/extensions/CompareTest.h
@@ -0,0 +1,19 @@
+#ifndef COMPARE_TEST_H_
+#define COMPARE_TEST_H_
+
+#include <cppunit/extensions/HelperMacros.h>
+
+class CompareTest : public CppUnit::TestFixture
+{
+ CPPUNIT_TEST_SUITE( CompareTest );
+ CPPUNIT_TEST( testCompare );
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+ void setUp();
+ void tearDown();
+
+ void testCompare();
+};
+
+#endif // COMPARE_TEST_H_
diff --git a/alib2data/test-src/std/StdTestHexavigesimal.cpp b/alib2std/test-src/extensions/HexavigesimalTest.cpp
similarity index 84%
rename from alib2data/test-src/std/StdTestHexavigesimal.cpp
rename to alib2std/test-src/extensions/HexavigesimalTest.cpp
index 48d0d644b3319461b5c7f9b51264238b813ae61f..06634be2ece698ce545cd3e85cf226650be274ed 100644
--- a/alib2data/test-src/std/StdTestHexavigesimal.cpp
+++ b/alib2std/test-src/extensions/HexavigesimalTest.cpp
@@ -1,16 +1,16 @@
-#include "StdTestHexavigesimal.h"
-#include "std/hexavigesimal.h"
+#include "HexavigesimalTest.h"
+#include <hexavigesimal>
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StdTestHexavigesimal, "std" );
-CPPUNIT_TEST_SUITE_REGISTRATION( StdTestHexavigesimal );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( HexavigesimalTest, "bits" );
+CPPUNIT_TEST_SUITE_REGISTRATION( HexavigesimalTest );
-void StdTestHexavigesimal::setUp() {
+void HexavigesimalTest::setUp() {
}
-void StdTestHexavigesimal::tearDown() {
+void HexavigesimalTest::tearDown() {
}
-void StdTestHexavigesimal::test1() {
+void HexavigesimalTest::test1() {
CPPUNIT_ASSERT_EQUAL(std::string("A") , std::toBase26(0));
CPPUNIT_ASSERT_EQUAL(std::string("B") , std::toBase26(1));
CPPUNIT_ASSERT_EQUAL(std::string("Z") , std::toBase26(25));
diff --git a/alib2data/test-src/std/StdTestHexavigesimal.h b/alib2std/test-src/extensions/HexavigesimalTest.h
similarity index 71%
rename from alib2data/test-src/std/StdTestHexavigesimal.h
rename to alib2std/test-src/extensions/HexavigesimalTest.h
index 8e313dbdd999b961b53ef99e4458a7fe9e7acb8d..a201d2e9fd21a303964ec6d4b6c27b57d18c3479 100644
--- a/alib2data/test-src/std/StdTestHexavigesimal.h
+++ b/alib2std/test-src/extensions/HexavigesimalTest.h
@@ -3,9 +3,9 @@
#include <cppunit/extensions/HelperMacros.h>
-class StdTestHexavigesimal : public CppUnit::TestFixture
+class HexavigesimalTest : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( StdTestHexavigesimal );
+ CPPUNIT_TEST_SUITE( HexavigesimalTest );
CPPUNIT_TEST( test1 );
CPPUNIT_TEST_SUITE_END();
diff --git a/alib2std/test-src/extensions/OstreamTest.cpp b/alib2std/test-src/extensions/OstreamTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..263cb84024f1d5d3c9994c2ab1209b0633ba09e0
--- /dev/null
+++ b/alib2std/test-src/extensions/OstreamTest.cpp
@@ -0,0 +1,42 @@
+#include "OstreamTest.h"
+#include <set>
+#include <vector>
+#include <pair>
+#include <sstream>
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( OstreamTest, "bits" );
+CPPUNIT_TEST_SUITE_REGISTRATION( OstreamTest );
+
+void OstreamTest::setUp() {
+}
+
+void OstreamTest::tearDown() {
+}
+
+void OstreamTest::testOstream() {
+ std::vector<int> vector1 {1, 2, 3};
+ std::vector<int> vector2 {2, 3, 4};
+
+ std::stringstream ss1;
+ ss1 << vector1;
+ std::cout << ss1.str() << std::endl;
+ CPPUNIT_ASSERT("[1, 2, 3]" == ss1.str());
+
+ std::set<std::vector<int>> set1 {vector1};
+ std::set<std::vector<int>> set2 {vector2};
+
+ std::stringstream ss2;
+ ss2 << set1;
+ std::cout << ss2.str() << std::endl;
+ CPPUNIT_ASSERT("{[1, 2, 3]}" == ss2.str());
+
+ std::pair<std::set<std::vector<int>>, std::set<std::vector<int>>> pair1 {set1, set2};
+ std::pair<std::set<std::vector<int>>, std::set<std::vector<int>>> pair2 {set2, set1};
+
+ std::stringstream ss3;
+ ss3 << pair1;
+ std::cout << ss3.str() << std::endl;
+ CPPUNIT_ASSERT("({[1, 2, 3]}, {[2, 3, 4]})" == ss3.str());
+
+}
+
diff --git a/alib2std/test-src/extensions/OstreamTest.h b/alib2std/test-src/extensions/OstreamTest.h
new file mode 100644
index 0000000000000000000000000000000000000000..c2cf462681ca3b6f3a571d740bab2a1988ec88ac
--- /dev/null
+++ b/alib2std/test-src/extensions/OstreamTest.h
@@ -0,0 +1,19 @@
+#ifndef OSTREAM_TEST_H_
+#define OSTREAM_TEST_H_
+
+#include <cppunit/extensions/HelperMacros.h>
+
+class OstreamTest : public CppUnit::TestFixture
+{
+ CPPUNIT_TEST_SUITE( OstreamTest );
+ CPPUNIT_TEST( testOstream );
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+ void setUp();
+ void tearDown();
+
+ void testOstream();
+};
+
+#endif // OSTREAM_TEST_H_
diff --git a/alib2data/test-src/std/StdSet.cpp b/alib2std/test-src/extensions/SetTest.cpp
similarity index 63%
rename from alib2data/test-src/std/StdSet.cpp
rename to alib2std/test-src/extensions/SetTest.cpp
index 8fc9e8ed9f408f232c3c80d74373e4c7486a79eb..f5c4cbcc78b15670f8e52e28b88e5a433ff80f80 100644
--- a/alib2data/test-src/std/StdSet.cpp
+++ b/alib2std/test-src/extensions/SetTest.cpp
@@ -1,19 +1,17 @@
-#include "StdSet.h"
+#include "SetTest.h"
#include <set>
#include <algorithm>
-#include "alphabet/Symbol.h"
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SetTest, "bits" );
+CPPUNIT_TEST_SUITE_REGISTRATION( SetTest );
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StdSet, "std" );
-CPPUNIT_TEST_SUITE_REGISTRATION( StdSet );
-
-void StdSet::setUp() {
+void SetTest::setUp() {
}
-void StdSet::tearDown() {
+void SetTest::tearDown() {
}
-void StdSet::test1() {
+void SetTest::test1() {
int first[] = {5,10,15,20,25};
int second[] = {50,40,30,20,10};
std::vector<int> v(10); // 0 0 0 0 0 0 0 0 0 0
@@ -31,12 +29,12 @@ void StdSet::test1() {
}
-void StdSet::test2() {
- std::set<alphabet::Symbol> first = {alphabet::symbolFrom(1)};
- std::set<alphabet::Symbol> second = {alphabet::symbolFrom(1), alphabet::symbolFrom(2), alphabet::symbolFrom(3)};
+void SetTest::test2() {
+ std::set<int> first = {1};
+ std::set<int> second = {1, 2, 3};
- std::set<alphabet::Symbol> firstMinusSecond;
- std::set<alphabet::Symbol> secondMinusFirst;
+ std::set<int> firstMinusSecond;
+ std::set<int> secondMinusFirst;
std::set_difference (first.begin(), first.end(), second.begin(), second.end(), std::inserter(firstMinusSecond, firstMinusSecond.end()));
std::set_difference (second.begin(), second.end(), first.begin(), first.end(), std::inserter(secondMinusFirst, secondMinusFirst.end()));
diff --git a/alib2data/test-src/std/StdSet.h b/alib2std/test-src/extensions/SetTest.h
similarity index 77%
rename from alib2data/test-src/std/StdSet.h
rename to alib2std/test-src/extensions/SetTest.h
index 42578867d332dd88474aa9d8bfb1458c82df5c7c..bdad1fd2988f248ff105faace57e20eceedab609 100644
--- a/alib2data/test-src/std/StdSet.h
+++ b/alib2std/test-src/extensions/SetTest.h
@@ -3,9 +3,9 @@
#include <cppunit/extensions/HelperMacros.h>
-class StdSet : public CppUnit::TestFixture
+class SetTest : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( StdSet );
+ CPPUNIT_TEST_SUITE( SetTest );
CPPUNIT_TEST( test1 );
CPPUNIT_TEST( test2 );
CPPUNIT_TEST_SUITE_END();
diff --git a/alib2data/test-src/std/TypeInfoTest.cpp b/alib2std/test-src/extensions/TypeInfoTest.cpp
similarity index 96%
rename from alib2data/test-src/std/TypeInfoTest.cpp
rename to alib2std/test-src/extensions/TypeInfoTest.cpp
index da7a5c11faf9989385da20757752ffcba4daed67..068160f8898e726087eb18a6536e8ded106977e7 100644
--- a/alib2data/test-src/std/TypeInfoTest.cpp
+++ b/alib2std/test-src/extensions/TypeInfoTest.cpp
@@ -4,7 +4,7 @@
#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TypeInfoTest, "std" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TypeInfoTest, "bits" );
CPPUNIT_TEST_SUITE_REGISTRATION( TypeInfoTest );
void TypeInfoTest::setUp() {
diff --git a/alib2data/test-src/std/TypeInfoTest.h b/alib2std/test-src/extensions/TypeInfoTest.h
similarity index 100%
rename from alib2data/test-src/std/TypeInfoTest.h
rename to alib2std/test-src/extensions/TypeInfoTest.h
diff --git a/alib2std/test-src/extensions/TypeTraitsTest.cpp b/alib2std/test-src/extensions/TypeTraitsTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b353a2bf525f7bfc01a01e471d78b696a1197c1e
--- /dev/null
+++ b/alib2std/test-src/extensions/TypeTraitsTest.cpp
@@ -0,0 +1,19 @@
+#include "TypeTraitsTest.h"
+#include <type_traits>
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TypeTraitsTest, "bits" );
+CPPUNIT_TEST_SUITE_REGISTRATION( TypeTraitsTest );
+
+void TypeTraitsTest::setUp() {
+}
+
+void TypeTraitsTest::tearDown() {
+}
+
+void TypeTraitsTest::testIsBaseOf() {
+ CPPUNIT_ASSERT( ( std::is_base_of_any<int, int, std::string, TypeTraitsTest::test>::value ) == true );
+ CPPUNIT_ASSERT( ( std::is_base_of<int, int>::value ) == true );
+ CPPUNIT_ASSERT( ( std::is_base_of<int, std::string>::value ) == false );
+ CPPUNIT_ASSERT( ( std::is_base_of<int, TypeTraitsTest::test>::value ) == false );
+}
+
diff --git a/alib2std/test-src/extensions/TypeTraitsTest.h b/alib2std/test-src/extensions/TypeTraitsTest.h
new file mode 100644
index 0000000000000000000000000000000000000000..4154ebf443640c43c7a022fe9fc2aeafbb7f0be1
--- /dev/null
+++ b/alib2std/test-src/extensions/TypeTraitsTest.h
@@ -0,0 +1,68 @@
+#ifndef TYPE_TRAITS_TEST_H_
+#define TYPE_TRAITS_TEST_H_
+
+#include <cppunit/extensions/HelperMacros.h>
+
+class TypeTraitsTest : public CppUnit::TestFixture
+{
+ CPPUNIT_TEST_SUITE( TypeTraitsTest );
+ CPPUNIT_TEST( testIsBaseOf );
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+struct test {
+ int * holder;
+
+ test() {
+ //std::cout << "test()" << std::endl;
+ holder = new int();
+ }
+
+ test(test&& old) : holder(nullptr) {
+ //std::cout << "test(test&&)" << std::endl;
+ std::swap(holder,old.holder);
+ }
+
+ test(const test& old) {
+ //std::cout << "test(const test&)" << std::endl;
+ holder = new int(*old.holder);
+ }
+
+ ~test()
+ {
+ //std::cout << "~test()" << std::endl;
+ delete holder;
+ }
+
+ bool operator<(const test& other) const {
+ return *(this->holder) < *(other.holder);
+ }
+
+ bool operator==(const test& other) const {
+ return *(this->holder) == *(other.holder);
+ }
+
+ int compare(const test& other) const {
+ return *(this->holder) - *(other.holder);
+ }
+
+ friend std::ostream& operator<<(std::ostream& out, const test& other) {
+ out << *(other.holder);
+ return out;
+ }
+};
+
+struct test2 {
+ int i;
+
+ test2(int i) : i(i) {}
+};
+
+public:
+ void setUp();
+ void tearDown();
+
+ void testIsBaseOf();
+};
+
+#endif // TYPE_TRAITS_TEST_H_
diff --git a/alib2std/test-src/extensions/VariantTest.cpp b/alib2std/test-src/extensions/VariantTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d6cad62fddef63ec4fe487b242e044b0849e256f
--- /dev/null
+++ b/alib2std/test-src/extensions/VariantTest.cpp
@@ -0,0 +1,99 @@
+#include "VariantTest.h"
+#include <variant>
+#include <set>
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VariantTest, "bits" );
+CPPUNIT_TEST_SUITE_REGISTRATION( VariantTest );
+
+void VariantTest::setUp() {
+}
+
+void VariantTest::tearDown() {
+}
+
+void VariantTest::testVariant() {
+ std::variant<int, std::string, VariantTest::test> d(10);
+ CPPUNIT_ASSERT( d.is<int>() );
+ CPPUNIT_ASSERT( d.get<int>() == 10 );
+
+ std::string str = "abcde";
+ d.set<std::string>(str);
+ CPPUNIT_ASSERT( d.is<std::string>() );
+ CPPUNIT_ASSERT( d.get<std::string>() == str );
+
+ d.set<VariantTest::test>(VariantTest::test());
+ *(d.get<VariantTest::test>().holder) = 42;
+
+ VariantTest::test tmp;
+ *(tmp.holder) = 42;
+ CPPUNIT_ASSERT( d.is<VariantTest::test>() );
+ CPPUNIT_ASSERT( d.get<VariantTest::test>() == tmp );
+
+ std::variant<int, std::string, VariantTest::test> e(d);
+ CPPUNIT_ASSERT( e.get<VariantTest::test>() == tmp );
+
+ *(e.get<VariantTest::test>().holder) = 43;
+
+ CPPUNIT_ASSERT( (d < e) == true );
+ CPPUNIT_ASSERT( (e < d) == false );
+
+ CPPUNIT_ASSERT( (e == d) == false );
+
+ d = std::variant<int, std::string, VariantTest::test>(0);
+ d = e;
+
+ CPPUNIT_ASSERT( *(d.get<VariantTest::test>().holder) == 43 );
+
+ CPPUNIT_ASSERT( (d < e) == false );
+ CPPUNIT_ASSERT( (e < d) == false );
+
+ CPPUNIT_ASSERT( (e == d) == true );
+}
+
+void VariantTest::testVariantSet() {
+ VariantTest::test tmp;
+ *(tmp.holder) = 42;
+
+ std::string str = "abcde";
+
+ std::variant<int, std::string, VariantTest::test> d(VariantTest::test {});
+ *(d.get<VariantTest::test>().holder) = 42;
+ std::variant<int, std::string, VariantTest::test> e(d);
+
+ std::variant<int, std::string, VariantTest::test> f(5);
+
+ std::variant<int, std::string, VariantTest::test> g(str);
+
+ std::set<std::variant<int, std::string, VariantTest::test>> testSet;
+ testSet.insert(d);
+ testSet.insert(e);
+ testSet.insert(f);
+ testSet.insert(g);
+
+ CPPUNIT_ASSERT( testSet.size() == 3 );
+
+ for(std::set<std::variant<int, std::string, VariantTest::test>>::const_iterator iter = testSet.begin(); iter != testSet.end(); iter++) {
+ if(iter->is<int>())
+ CPPUNIT_ASSERT( iter->get<int>() == 5);
+ if(iter->is<std::string>())
+ CPPUNIT_ASSERT( iter->get<std::string>() == str );
+ if(iter->is<VariantTest::test>())
+ CPPUNIT_ASSERT( iter->get<VariantTest::test>() == tmp );
+ }
+
+ std::variant<VariantTest::test2, std::string, VariantTest::test> h("aa");
+ CPPUNIT_ASSERT( h.is<std::string>() );
+
+ std::map<std::variant<std::string, int>, int> testMap;
+ testMap.insert(std::make_pair(std::variant<std::string, int> {"aa"}, 10));
+
+ CPPUNIT_ASSERT( testMap.size() == 1 );
+ CPPUNIT_ASSERT( testMap.find(std::variant<std::string, int> {"aa"}) != testMap.end() );
+ CPPUNIT_ASSERT( testMap.find(std::variant<std::string, int> {10}) == testMap.end() );
+
+ testMap.insert(std::make_pair(std::variant<std::string, int> {"ab"}, 11));
+ testMap.insert(std::make_pair(std::variant<std::string, int> {3}, 13));
+
+ CPPUNIT_ASSERT( testMap.find(std::variant<std::string, int> {"aa"}) != testMap.end() );
+ CPPUNIT_ASSERT( testMap.find(std::variant<std::string, int> {10}) == testMap.end() );
+}
diff --git a/alib2data/test-src/std/StdTest.h b/alib2std/test-src/extensions/VariantTest.h
similarity index 84%
rename from alib2data/test-src/std/StdTest.h
rename to alib2std/test-src/extensions/VariantTest.h
index 20f727dd4c8f72074f1ba6d3cf69461439f9cda5..30451770d092ff6dea6ef619a8c9cdb7c2bd27ae 100644
--- a/alib2data/test-src/std/StdTest.h
+++ b/alib2std/test-src/extensions/VariantTest.h
@@ -2,12 +2,11 @@
#define VARIANT_TEST_H_
#include <cppunit/extensions/HelperMacros.h>
-#include "std/compare.hpp"
+#include <compare>
-class StdTest : public CppUnit::TestFixture
+class VariantTest : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( StdTest );
- CPPUNIT_TEST( testIsBaseOf );
+ CPPUNIT_TEST_SUITE( VariantTest );
CPPUNIT_TEST( testVariant );
CPPUNIT_TEST( testVariantSet );
CPPUNIT_TEST_SUITE_END();
@@ -73,8 +72,8 @@ public:
namespace std {
template<>
-struct compare<StdTest::test> {
- int operator()(const StdTest::test& first, const StdTest::test& second) {
+struct compare<VariantTest::test> {
+ int operator()(const VariantTest::test& first, const VariantTest::test& second) {
return first.compare(second);
}
};
diff --git a/alib2std/test-src/main.cpp b/alib2std/test-src/main.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0c2f15bc1cc5ae72887893e8aeeb70c3b7f7d21a
--- /dev/null
+++ b/alib2std/test-src/main.cpp
@@ -0,0 +1,162 @@
+#include <tclap/CmdLine.h>
+
+#include <cppunit/CompilerOutputter.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/TestResultCollector.h>
+#include <cppunit/TestResult.h>
+#include <cppunit/XmlOutputter.h>
+
+#include <cppunit/Test.h>
+#include <cppunit/TestFailure.h>
+#include <cppunit/portability/Stream.h>
+#include <cppunit/TestListener.h>
+#include <cppunit/SourceLine.h>
+#include <cppunit/Exception.h>
+
+CPPUNIT_NS_BEGIN
+
+class CPPUNIT_API TestProgressListener : public TestListener
+{
+public:
+ TestProgressListener();
+
+ virtual ~TestProgressListener();
+
+ void startTest( Test *test );
+
+ void addFailure( const TestFailure &failure );
+
+ void endTest( Test *test );
+
+ int getResult() const;
+
+ void printResults() const;
+
+private:
+ TestProgressListener( const TestProgressListener © );
+
+ void operator =( const TestProgressListener © );
+
+private:
+ int m_Failures;
+ int m_Tests;
+ int m_Assertions;
+ bool m_lastTestFailed;
+};
+
+TestProgressListener::TestProgressListener() : m_Failures( 0 ), m_Tests(0), m_Assertions(0), m_lastTestFailed( false )
+{
+}
+
+TestProgressListener::~TestProgressListener()
+{
+}
+
+void TestProgressListener::startTest( Test * test )
+{
+ stdCOut() << test->getName() << ":" << "\n";
+ stdCOut().flush();
+
+ m_lastTestFailed = false;
+ m_Tests++;
+}
+
+void TestProgressListener::addFailure( const TestFailure &failure )
+{
+ stdCOut() << (failure.isError() ? "error" : "assertion") << " : " << failure.failedTestName() << " : " << failure.sourceLine().lineNumber() << "\n";
+ stdCOut() << "Exception " << failure.thrownException()->message().details();
+
+ m_lastTestFailed = true;
+ if(failure.isError()) m_Failures++; else m_Assertions++;
+}
+
+void TestProgressListener::endTest( Test * test)
+{
+ stdCOut() << "Result (" << test->getName() << ")";
+ stdCOut().flush();
+
+ if ( !m_lastTestFailed )
+ stdCOut() << " : OK";
+ else
+ stdCOut() << " : Fail";
+ stdCOut() << "\n\n";
+}
+
+int TestProgressListener::getResult() const {
+ return m_Failures + m_Assertions;
+}
+
+void TestProgressListener::printResults() const {
+ stdCOut() << "Overal result: Tests: " << m_Tests << " Assertions: " << m_Assertions << " Failures: " << m_Failures << "\n";
+}
+
+CPPUNIT_NS_END
+
+int main(int argc, char* argv[]) {
+ try {
+ TCLAP::CmdLine cmd("Main test binary.", ' ', "0.01");
+
+ TCLAP::MultiArg<std::string> testPathSegments("p", "path", "test path", false, "string" );
+ cmd.add( testPathSegments );
+
+ cmd.parse(argc, argv);
+
+ CppUnit::TestResult controller;
+
+ CppUnit::TestResultCollector result;
+ controller.addListener( &result );
+
+ CppUnit::TestProgressListener progressListener;
+ controller.addListener( &progressListener );
+
+ CppUnit::Test *suite = NULL;
+ std::string testPath = "";
+ if(testPathSegments.getValue().size() == 0) {
+ // Get the top level suite from the registry
+ suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
+ } else if(testPathSegments.getValue().size() == 1) {
+ suite = CppUnit::TestFactoryRegistry::getRegistry(testPathSegments.getValue()[0]).makeTest();
+ } else {
+ suite = CppUnit::TestFactoryRegistry::getRegistry(testPathSegments.getValue()[0]).makeTest();
+ bool first = true;
+ for(const std::string& path : testPathSegments.getValue()) {
+ if(first) {
+ first = false;
+ continue;
+ }
+ testPath += path + "/";
+ }
+ testPath.pop_back();
+ }
+
+ // Adds the test to the list of test to run
+ CppUnit::TextUi::TestRunner runner;
+ runner.addTest( suite );
+
+ // Change the default outputter to a compiler error format outputter
+ runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(), std::cerr ) );
+ // Run the tests.
+ runner.run( controller, testPath );
+
+ progressListener.printResults();
+
+ std::ofstream xmlFileResults("CppUnitTestResults.xml");
+ CppUnit::XmlOutputter xmlOut(&result, xmlFileResults);
+ xmlOut.write();
+
+ return progressListener.getResult();
+/* } catch(const exception::AlibException& exception) {
+ std::cerr << exception.getCause() << std::endl;
+ return 1;*/
+ } catch(const TCLAP::ArgException& exception) {
+ std::cerr << exception.error() << std::endl;
+ return 2;
+ } catch (const std::exception& exception) {
+ std::cerr << "Exception caught: " << exception.what() << std::endl;
+ return 3;
+ } catch(...) {
+ std::cerr << "Unknown exception caught." << std::endl;
+ return 127;
+ }
+}
diff --git a/aminimize2/makefile b/aminimize2/makefile
index 07fa40b3ef54abe8a570a54188a399829f5c1e35..b4a6e5b3fbe4f896ee026e4829190bc8d4fa0e89 100644
--- a/aminimize2/makefile
+++ b/aminimize2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/anormalize2/makefile b/anormalize2/makefile
index 034230062ec3df0bfedc01cbdf6b3b9f38c724ad..5d970992e8d7d8ec86a595f320f99ea4c98ca1c8 100644
--- a/anormalize2/makefile
+++ b/anormalize2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/arand2/makefile b/arand2/makefile
index 955b428f8d8de9af021a75de8b48e183d97a0a45..9d80d0d8052d70ba0e7542fe76c762235f58e5e9 100644
--- a/arand2/makefile
+++ b/arand2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/arename2/makefile b/arename2/makefile
index d2fc5a53cf5c1f70fc9125755ca4c3feec8e4f6a..1e732d9fc14d07c4e965cc5aa9b4b1d71ef27c17 100644
--- a/arename2/makefile
+++ b/arename2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/areverse2/makefile b/areverse2/makefile
index 602d9de77d9f8763336697396643f444747b6a7d..351302c292d629af2b6c552b5ed04cf2bd346084 100644
--- a/areverse2/makefile
+++ b/areverse2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/arun2/makefile b/arun2/makefile
index 196a16df988744185b76ac2f8619f6a6d64d5d3d..b453ecf1f19e5573265aa6297b30f910aad799c2 100644
--- a/arun2/makefile
+++ b/arun2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/astat2/makefile b/astat2/makefile
index d801990c5171f691060c97bccd4c5e2ea5d233dd..9585bc05e7662c588e97245915c84eaec568a391 100644
--- a/astat2/makefile
+++ b/astat2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/astringology2/makefile b/astringology2/makefile
index 7c5563bcabb70d37e39a2e377ce9a708855cf424..909750dc95d9903132531940c3176ed7c3611594 100644
--- a/astringology2/makefile
+++ b/astringology2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/atrim2/makefile b/atrim2/makefile
index 93a759e66f1a81f4edb0ad94e56169a3b4c08473..aa5ad097b8a5bee7374d0dae8387160a5c6b3203 100644
--- a/atrim2/makefile
+++ b/atrim2/makefile
@@ -8,9 +8,9 @@ endef
export NEW_LINE
-LDFLAGS_DEBUG:=-L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_DEBUG:=-L../alib2std/lib-debug -L../alib2data/lib-debug -L../alib2algo/lib-debug -L../alib2elgo/lib-debug -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
-LDFLAGS_RELEASE:=-L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
+LDFLAGS_RELEASE:=-L../alib2std/lib-release -L../alib2data/lib-release -L../alib2algo/lib-release -L../alib2elgo/lib-release -rdynamic -lxml2 -lalib2std -lalib2data -lalib2algo -lalib2elgo -Wl,-rpath,.
OBJECTS_DEBUG:=$(patsubst src/%.cpp, obj-debug/%.o, $(shell find src/ -name *cpp))
@@ -36,7 +36,7 @@ obj%/makefile: makefile
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
+ CXXFLAGS:= -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC -I/usr/include/libxml2/ -I../../\$$(DEPTH)alib2std/src -I../../\$$(DEPTH)alib2data/src/ -I../../\$$(DEPTH)alib2algo/src/ -I../../\$$(DEPTH)alib2elgo/src/$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst ../\$$(DEPTH)\$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, ../\$$(DEPTH)\$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/makefile b/makefile
index b9872ba03a595399da50f6eb8d1fd8a4c4ae5bba..ceb618d20e7e22ba0f1a2533a61de56dd51d73e1 100644
--- a/makefile
+++ b/makefile
@@ -3,6 +3,7 @@ APPPATH = /usr/bin
LIBPATH = /usr/lib
BINFOLDER = bin
+STD_LIB = alib2std
CORE_LIB = alib2data
ALGO_LIB = alib2algo
ELGO_LIB = alib2elgo
@@ -50,12 +51,12 @@ endif
SUBDIRS_WITH_MAKE = $(dir $(wildcard */makefile))
-.PHONY: $(addsuffix .all-debug , $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \
- $(addsuffix .all-release, $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
- $(addsuffix .build-debug , $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \
- $(addsuffix .build-release, $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
- $(addsuffix .build-debug-tests , $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \
- $(addsuffix .build-release-tests, $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
+.PHONY: $(addsuffix .all-debug , $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \
+ $(addsuffix .all-release, $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
+ $(addsuffix .build-debug , $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \
+ $(addsuffix .build-release, $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
+ $(addsuffix .build-debug-tests , $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS)) \
+ $(addsuffix .build-release-tests, $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
all-debug build-debug build-test-debug unit-test-debug clean-debug \
all-release build-release build-test-release unit-test-release clean-release \
debug release clean doc all
@@ -68,7 +69,7 @@ all:
debug: all-debug
mkdir -p $(addsuffix -debug, $(BINFOLDER))
rm -rf $(addsuffix -debug, $(BINFOLDER))/*
- for dir in $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB); do \
+ for dir in $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB); do \
cp $$dir/lib-debug/* $(addsuffix -debug, $(BINFOLDER)); \
done
for dir in $(SUBDIRS_BINS); do \
@@ -84,7 +85,7 @@ debug: all-debug
release: all-release
mkdir -p $(addsuffix -release, $(BINFOLDER))
rm -rf $(addsuffix -release, $(BINFOLDER))/*
- for dir in $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB); do \
+ for dir in $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB); do \
cp $$dir/lib-release/* $(addsuffix -release, $(BINFOLDER)); \
done
for dir in $(SUBDIRS_BINS); do \
@@ -102,25 +103,28 @@ clean : clean-debug clean-release
-all-debug : $(addsuffix .all-debug , $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
+all-debug : $(addsuffix .all-debug , $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
-all-release : $(addsuffix .all-release, $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
+all-release : $(addsuffix .all-release, $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
-build-debug : $(addsuffix .build-debug , $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
+build-debug : $(addsuffix .build-debug , $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
-build-release: $(addsuffix .build-release, $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
+build-release: $(addsuffix .build-release, $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
-build-tests-debug : $(addsuffix .build-tests-debug , $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB))
+build-tests-debug : $(addsuffix .build-tests-debug , $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB))
-build-tests-release: $(addsuffix .build-tests-release, $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB))
+build-tests-release: $(addsuffix .build-tests-release, $(STD_LIB) $(CORE_LIB) $(ALGO_LIB) $(ELGO_LIB))
-$(addsuffix .all-debug, $(CORE_LIB)):
+$(addsuffix .all-debug, $(STD_LIB)):
+ $(MAKE) debug -C $(basename $@)
+
+$(addsuffix .all-debug, $(CORE_LIB)): $(addsuffix .all-debug, $(STD_LIB))
$(MAKE) debug -C $(basename $@)
$(addsuffix .all-debug, $(ALGO_LIB)): $(addsuffix .all-debug, $(CORE_LIB))
@@ -134,7 +138,10 @@ $(addsuffix .all-debug, $(SUBDIRS_BINS)): $(addsuffix .all-debug, $(ELGO_LIB))
-$(addsuffix .all-release, $(CORE_LIB)):
+$(addsuffix .all-release, $(STD_LIB)):
+ $(MAKE) release -C $(basename $@)
+
+$(addsuffix .all-release, $(CORE_LIB)): $(addsuffix .all-release, $(STD_LIB))
$(MAKE) release -C $(basename $@)
$(addsuffix .all-release, $(ALGO_LIB)): $(addsuffix .all-release, $(CORE_LIB))
@@ -148,7 +155,10 @@ $(addsuffix .all-release, $(SUBDIRS_BINS)): $(addsuffix .all-release, $(ELGO_LIB
-$(addsuffix .build-debug, $(CORE_LIB)):
+$(addsuffix .build-debug, $(STD_LIB)):
+ $(MAKE) build-debug -C $(basename $@)
+
+$(addsuffix .build-debug, $(CORE_LIB)): $(addsuffix .build-debug, $(STD_LIB))
$(MAKE) build-debug -C $(basename $@)
$(addsuffix .build-debug, $(ALGO_LIB)): $(addsuffix .build-debug, $(CORE_LIB))
@@ -162,7 +172,10 @@ $(addsuffix .build-debug, $(SUBDIRS_BINS)): $(addsuffix .build-debug, $(ELGO_LIB
-$(addsuffix .build-release, $(CORE_LIB)):
+$(addsuffix .build-release, $(STD_LIB)):
+ $(MAKE) build-release -C $(basename $@)
+
+$(addsuffix .build-release, $(CORE_LIB)): $(addsuffix .build-release, $(STD_LIB))
$(MAKE) build-release -C $(basename $@)
$(addsuffix .build-release, $(ALGO_LIB)): $(addsuffix .build-release, $(CORE_LIB))
@@ -176,15 +189,24 @@ $(addsuffix .build-release, $(SUBDIRS_BINS)): $(addsuffix .build-release, $(ELGO
-$(addsuffix .build-tests-debug, $(CORE_LIB)): $(addsuffix .build-debug, $(CORE_LIB))
+$(addsuffix .build-tests-debug, $(STD_LIB)): $(addsuffix .build-debug, $(STD_LIB))
+ $(MAKE) build-tests-debug -C $(basename $@)
+
+$(addsuffix .build-tests-debug, $(CORE_LIB)): $(addsuffix .build-tests-debug, $(STD_LIB)) $(addsuffix .build-debug, $(CORE_LIB))
$(MAKE) build-tests-debug -C $(basename $@)
$(addsuffix .build-tests-debug, $(ALGO_LIB)): $(addsuffix .build-tests-debug, $(CORE_LIB)) $(addsuffix .build-debug, $(ALGO_LIB))
$(MAKE) build-tests-debug -C $(basename $@)
+$(addsuffix .build-tests-debug, $(ELGO_LIB)): $(addsuffix .build-tests-debug, $(ALGO_LIB)) $(addsuffix .build-debug, $(ELGO_LIB))
+ $(MAKE) build-tests-debug -C $(basename $@)
-$(addsuffix .build-tests-release, $(CORE_LIB)): $(addsuffix .build-release, $(CORE_LIB))
+
+$(addsuffix .build-tests-release, $(STD_LIB)): $(addsuffix .build-release, $(STD_LIB))
+ $(MAKE) build-tests-release -C $(basename $@)
+
+$(addsuffix .build-tests-release, $(CORE_LIB)): $(addsuffix .build-tests-release, $(STD_LIB)) $(addsuffix .build-release, $(CORE_LIB))
$(MAKE) build-tests-release -C $(basename $@)
$(addsuffix .build-tests-release, $(ALGO_LIB)): $(addsuffix .build-tests-release, $(CORE_LIB)) $(addsuffix .build-release, $(ALGO_LIB))