diff --git a/alib2algo/src/grammar/parsing/AbsorbTerminalSymbol.cpp b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/AbsorbTerminalSymbol.cpp rename to alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.cpp diff --git a/alib2algo/src/grammar/parsing/AbsorbTerminalSymbol.h b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h similarity index 100% rename from alib2algo/src/grammar/parsing/AbsorbTerminalSymbol.h rename to alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.h diff --git a/alib2algo/src/grammar/parsing/CornerSubstitution.cpp b/alib2algo_experimental/src/grammar/parsing/CornerSubstitution.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/CornerSubstitution.cpp rename to alib2algo_experimental/src/grammar/parsing/CornerSubstitution.cpp diff --git a/alib2algo/src/grammar/parsing/CornerSubstitution.h b/alib2algo_experimental/src/grammar/parsing/CornerSubstitution.h similarity index 100% rename from alib2algo/src/grammar/parsing/CornerSubstitution.h rename to alib2algo_experimental/src/grammar/parsing/CornerSubstitution.h diff --git a/alib2algo/src/grammar/parsing/DeterministicLL1Grammar.cpp b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp similarity index 98% rename from alib2algo/src/grammar/parsing/DeterministicLL1Grammar.cpp rename to alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp index 591b88d35c39d8969ee1084a3083be08cde2c2ff..0f40c34fb0df54c837ad3933745cca52678cfdce 100644 --- a/alib2algo/src/grammar/parsing/DeterministicLL1Grammar.cpp +++ b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp @@ -14,7 +14,7 @@ #include <exception/CommonException.h> #include <algorithm> -#include "../properties/RecursiveNonterminal.h" +#include <grammar/properties/RecursiveNonterminal.h> namespace grammar { diff --git a/alib2algo/src/grammar/parsing/DeterministicLL1Grammar.h b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.h similarity index 100% rename from alib2algo/src/grammar/parsing/DeterministicLL1Grammar.h rename to alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.h diff --git a/alib2algo/src/grammar/parsing/DeterministicLL1ParseTable.cpp b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/DeterministicLL1ParseTable.cpp rename to alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.cpp diff --git a/alib2algo/src/grammar/parsing/DeterministicLL1ParseTable.h b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.h similarity index 100% rename from alib2algo/src/grammar/parsing/DeterministicLL1ParseTable.h rename to alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.h diff --git a/alib2algo/src/grammar/parsing/ExtractRightContext.cpp b/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/ExtractRightContext.cpp rename to alib2algo_experimental/src/grammar/parsing/ExtractRightContext.cpp diff --git a/alib2algo/src/grammar/parsing/ExtractRightContext.h b/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.h similarity index 100% rename from alib2algo/src/grammar/parsing/ExtractRightContext.h rename to alib2algo_experimental/src/grammar/parsing/ExtractRightContext.h diff --git a/alib2algo/src/grammar/parsing/First.cpp b/alib2algo_experimental/src/grammar/parsing/First.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/First.cpp rename to alib2algo_experimental/src/grammar/parsing/First.cpp diff --git a/alib2algo/src/grammar/parsing/First.h b/alib2algo_experimental/src/grammar/parsing/First.h similarity index 100% rename from alib2algo/src/grammar/parsing/First.h rename to alib2algo_experimental/src/grammar/parsing/First.h diff --git a/alib2algo/src/grammar/parsing/Follow.cpp b/alib2algo_experimental/src/grammar/parsing/Follow.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/Follow.cpp rename to alib2algo_experimental/src/grammar/parsing/Follow.cpp diff --git a/alib2algo/src/grammar/parsing/Follow.h b/alib2algo_experimental/src/grammar/parsing/Follow.h similarity index 100% rename from alib2algo/src/grammar/parsing/Follow.h rename to alib2algo_experimental/src/grammar/parsing/Follow.h diff --git a/alib2algo/src/grammar/parsing/HandleFirstFirstConflict.cpp b/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/HandleFirstFirstConflict.cpp rename to alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.cpp diff --git a/alib2algo/src/grammar/parsing/HandleFirstFirstConflict.h b/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.h similarity index 100% rename from alib2algo/src/grammar/parsing/HandleFirstFirstConflict.h rename to alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.h diff --git a/alib2algo/src/grammar/parsing/HandleFirstFollowConflict.cpp b/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.cpp similarity index 98% rename from alib2algo/src/grammar/parsing/HandleFirstFollowConflict.cpp rename to alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.cpp index 67350372fe50f5f32972b0a2edb2baa911c0744a..a24084ed2dcadfd038c9b83306896f6618b75075 100644 --- a/alib2algo/src/grammar/parsing/HandleFirstFollowConflict.cpp +++ b/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.cpp @@ -8,7 +8,7 @@ #include "HandleFirstFollowConflict.h" #include "First.h" #include "Follow.h" -#include "../properties/NullableNonterminals.h" +#include <grammar/properties/NullableNonterminals.h> #include "AbsorbTerminalSymbol.h" #include "ExtractRightContext.h" diff --git a/alib2algo/src/grammar/parsing/HandleFirstFollowConflict.h b/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.h similarity index 100% rename from alib2algo/src/grammar/parsing/HandleFirstFollowConflict.h rename to alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.h diff --git a/alib2algo/src/grammar/parsing/LL1ParseTable.cpp b/alib2algo_experimental/src/grammar/parsing/LL1ParseTable.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/LL1ParseTable.cpp rename to alib2algo_experimental/src/grammar/parsing/LL1ParseTable.cpp diff --git a/alib2algo/src/grammar/parsing/LL1ParseTable.h b/alib2algo_experimental/src/grammar/parsing/LL1ParseTable.h similarity index 100% rename from alib2algo/src/grammar/parsing/LL1ParseTable.h rename to alib2algo_experimental/src/grammar/parsing/LL1ParseTable.h diff --git a/alib2algo/src/grammar/parsing/LR0Parser.cpp b/alib2algo_experimental/src/grammar/parsing/LR0Parser.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/LR0Parser.cpp rename to alib2algo_experimental/src/grammar/parsing/LR0Parser.cpp diff --git a/alib2algo/src/grammar/parsing/LR0Parser.h b/alib2algo_experimental/src/grammar/parsing/LR0Parser.h similarity index 100% rename from alib2algo/src/grammar/parsing/LR0Parser.h rename to alib2algo_experimental/src/grammar/parsing/LR0Parser.h diff --git a/alib2algo/src/grammar/parsing/LRParser.cpp b/alib2algo_experimental/src/grammar/parsing/LRParser.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/LRParser.cpp rename to alib2algo_experimental/src/grammar/parsing/LRParser.cpp diff --git a/alib2algo/src/grammar/parsing/LRParser.h b/alib2algo_experimental/src/grammar/parsing/LRParser.h similarity index 100% rename from alib2algo/src/grammar/parsing/LRParser.h rename to alib2algo_experimental/src/grammar/parsing/LRParser.h diff --git a/alib2algo/src/grammar/parsing/LeftFactorize.cpp b/alib2algo_experimental/src/grammar/parsing/LeftFactorize.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/LeftFactorize.cpp rename to alib2algo_experimental/src/grammar/parsing/LeftFactorize.cpp diff --git a/alib2algo/src/grammar/parsing/LeftFactorize.h b/alib2algo_experimental/src/grammar/parsing/LeftFactorize.h similarity index 100% rename from alib2algo/src/grammar/parsing/LeftFactorize.h rename to alib2algo_experimental/src/grammar/parsing/LeftFactorize.h diff --git a/alib2algo/src/grammar/parsing/SLR1ParseTable.cpp b/alib2algo_experimental/src/grammar/parsing/SLR1ParseTable.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/SLR1ParseTable.cpp rename to alib2algo_experimental/src/grammar/parsing/SLR1ParseTable.cpp diff --git a/alib2algo/src/grammar/parsing/SLR1ParseTable.h b/alib2algo_experimental/src/grammar/parsing/SLR1ParseTable.h similarity index 100% rename from alib2algo/src/grammar/parsing/SLR1ParseTable.h rename to alib2algo_experimental/src/grammar/parsing/SLR1ParseTable.h diff --git a/alib2algo/src/grammar/parsing/common/Substitute.cpp b/alib2algo_experimental/src/grammar/parsing/common/Substitute.cpp similarity index 100% rename from alib2algo/src/grammar/parsing/common/Substitute.cpp rename to alib2algo_experimental/src/grammar/parsing/common/Substitute.cpp diff --git a/alib2algo/src/grammar/parsing/common/Substitute.h b/alib2algo_experimental/src/grammar/parsing/common/Substitute.h similarity index 100% rename from alib2algo/src/grammar/parsing/common/Substitute.h rename to alib2algo_experimental/src/grammar/parsing/common/Substitute.h diff --git a/alib2algo/test-src/grammar/parsing/AbsorbTerminalSymbol.cpp b/alib2algo_experimental/test-src/grammar/parsing/AbsorbTerminalSymbol.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/AbsorbTerminalSymbol.cpp rename to alib2algo_experimental/test-src/grammar/parsing/AbsorbTerminalSymbol.cpp diff --git a/alib2algo/test-src/grammar/parsing/AbsorbTerminalSymbol.h b/alib2algo_experimental/test-src/grammar/parsing/AbsorbTerminalSymbol.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/AbsorbTerminalSymbol.h rename to alib2algo_experimental/test-src/grammar/parsing/AbsorbTerminalSymbol.h diff --git a/alib2algo/test-src/grammar/parsing/CornerSubstitution.cpp b/alib2algo_experimental/test-src/grammar/parsing/CornerSubstitution.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/CornerSubstitution.cpp rename to alib2algo_experimental/test-src/grammar/parsing/CornerSubstitution.cpp diff --git a/alib2algo/test-src/grammar/parsing/CornerSubstitution.h b/alib2algo_experimental/test-src/grammar/parsing/CornerSubstitution.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/CornerSubstitution.h rename to alib2algo_experimental/test-src/grammar/parsing/CornerSubstitution.h diff --git a/alib2algo/test-src/grammar/parsing/ExtractRightContext.cpp b/alib2algo_experimental/test-src/grammar/parsing/ExtractRightContext.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/ExtractRightContext.cpp rename to alib2algo_experimental/test-src/grammar/parsing/ExtractRightContext.cpp diff --git a/alib2algo/test-src/grammar/parsing/ExtractRightContext.h b/alib2algo_experimental/test-src/grammar/parsing/ExtractRightContext.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/ExtractRightContext.h rename to alib2algo_experimental/test-src/grammar/parsing/ExtractRightContext.h diff --git a/alib2algo/test-src/grammar/parsing/FirstTest.cpp b/alib2algo_experimental/test-src/grammar/parsing/FirstTest.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/FirstTest.cpp rename to alib2algo_experimental/test-src/grammar/parsing/FirstTest.cpp diff --git a/alib2algo/test-src/grammar/parsing/FirstTest.h b/alib2algo_experimental/test-src/grammar/parsing/FirstTest.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/FirstTest.h rename to alib2algo_experimental/test-src/grammar/parsing/FirstTest.h diff --git a/alib2algo/test-src/grammar/parsing/FollowTest.cpp b/alib2algo_experimental/test-src/grammar/parsing/FollowTest.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/FollowTest.cpp rename to alib2algo_experimental/test-src/grammar/parsing/FollowTest.cpp diff --git a/alib2algo/test-src/grammar/parsing/FollowTest.h b/alib2algo_experimental/test-src/grammar/parsing/FollowTest.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/FollowTest.h rename to alib2algo_experimental/test-src/grammar/parsing/FollowTest.h diff --git a/alib2algo/test-src/grammar/parsing/HandleFirstFirstConflict.cpp b/alib2algo_experimental/test-src/grammar/parsing/HandleFirstFirstConflict.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/HandleFirstFirstConflict.cpp rename to alib2algo_experimental/test-src/grammar/parsing/HandleFirstFirstConflict.cpp diff --git a/alib2algo/test-src/grammar/parsing/HandleFirstFirstConflict.h b/alib2algo_experimental/test-src/grammar/parsing/HandleFirstFirstConflict.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/HandleFirstFirstConflict.h rename to alib2algo_experimental/test-src/grammar/parsing/HandleFirstFirstConflict.h diff --git a/alib2algo/test-src/grammar/parsing/HandleFirstFollowConflict.cpp b/alib2algo_experimental/test-src/grammar/parsing/HandleFirstFollowConflict.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/HandleFirstFollowConflict.cpp rename to alib2algo_experimental/test-src/grammar/parsing/HandleFirstFollowConflict.cpp diff --git a/alib2algo/test-src/grammar/parsing/HandleFirstFollowConflict.h b/alib2algo_experimental/test-src/grammar/parsing/HandleFirstFollowConflict.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/HandleFirstFollowConflict.h rename to alib2algo_experimental/test-src/grammar/parsing/HandleFirstFollowConflict.h diff --git a/alib2algo/test-src/grammar/parsing/LL1ParseTable.cpp b/alib2algo_experimental/test-src/grammar/parsing/LL1ParseTable.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/LL1ParseTable.cpp rename to alib2algo_experimental/test-src/grammar/parsing/LL1ParseTable.cpp diff --git a/alib2algo/test-src/grammar/parsing/LL1ParseTable.h b/alib2algo_experimental/test-src/grammar/parsing/LL1ParseTable.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/LL1ParseTable.h rename to alib2algo_experimental/test-src/grammar/parsing/LL1ParseTable.h diff --git a/alib2algo/test-src/grammar/parsing/LR0Parser.cpp b/alib2algo_experimental/test-src/grammar/parsing/LR0Parser.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/LR0Parser.cpp rename to alib2algo_experimental/test-src/grammar/parsing/LR0Parser.cpp diff --git a/alib2algo/test-src/grammar/parsing/LR0Parser.h b/alib2algo_experimental/test-src/grammar/parsing/LR0Parser.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/LR0Parser.h rename to alib2algo_experimental/test-src/grammar/parsing/LR0Parser.h diff --git a/alib2algo/test-src/grammar/parsing/LRParser.cpp b/alib2algo_experimental/test-src/grammar/parsing/LRParser.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/LRParser.cpp rename to alib2algo_experimental/test-src/grammar/parsing/LRParser.cpp diff --git a/alib2algo/test-src/grammar/parsing/LRParser.h b/alib2algo_experimental/test-src/grammar/parsing/LRParser.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/LRParser.h rename to alib2algo_experimental/test-src/grammar/parsing/LRParser.h diff --git a/alib2algo/test-src/grammar/parsing/LeftFactorize.cpp b/alib2algo_experimental/test-src/grammar/parsing/LeftFactorize.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/LeftFactorize.cpp rename to alib2algo_experimental/test-src/grammar/parsing/LeftFactorize.cpp diff --git a/alib2algo/test-src/grammar/parsing/LeftFactorize.h b/alib2algo_experimental/test-src/grammar/parsing/LeftFactorize.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/LeftFactorize.h rename to alib2algo_experimental/test-src/grammar/parsing/LeftFactorize.h diff --git a/alib2algo/test-src/grammar/parsing/SLR1ParseTable.cpp b/alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.cpp similarity index 100% rename from alib2algo/test-src/grammar/parsing/SLR1ParseTable.cpp rename to alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.cpp diff --git a/alib2algo/test-src/grammar/parsing/SLR1ParseTable.h b/alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.h similarity index 100% rename from alib2algo/test-src/grammar/parsing/SLR1ParseTable.h rename to alib2algo_experimental/test-src/grammar/parsing/SLR1ParseTable.h diff --git a/alib2data/src/grammar/parsing/LRParserTypes.h b/alib2data_experimental/src/grammar/parsing/LRParserTypes.h similarity index 92% rename from alib2data/src/grammar/parsing/LRParserTypes.h rename to alib2data_experimental/src/grammar/parsing/LRParserTypes.h index 2047ff259ea629c935397f9d9087a1809689234a..7d297d4b9203019e527bf36ac520827e80e406d1 100644 --- a/alib2data/src/grammar/parsing/LRParserTypes.h +++ b/alib2data_experimental/src/grammar/parsing/LRParserTypes.h @@ -8,8 +8,8 @@ #ifndef LR_PARSER_TYPES_H_ #define LR_PARSER_TYPES_H_ -#include "../../alphabet/Symbol.h" -#include "../../label/Label.h" +#include <alphabet/Symbol.h> +#include <label/Label.h> #include <map> #include <set> diff --git a/alib2data/src/label/LR0ItemsLabel.cpp b/alib2data_experimental/src/label/LR0ItemsLabel.cpp similarity index 97% rename from alib2data/src/label/LR0ItemsLabel.cpp rename to alib2data_experimental/src/label/LR0ItemsLabel.cpp index 971cf9b92d2d59edd06d4834733e4b8f5edc08e8..06fdc47725ae854d08e267a8cf51606ade522bfd 100644 --- a/alib2data/src/label/LR0ItemsLabel.cpp +++ b/alib2data_experimental/src/label/LR0ItemsLabel.cpp @@ -7,10 +7,10 @@ #include "LR0ItemsLabel.h" #include <sax/FromXMLParserHelper.h> -#include "Label.h" +#include <label/Label.h> #include <object/Object.h> #include <core/xmlApi.hpp> -#include "UniqueLabel.h" +#include <label/UniqueLabel.h> #include <container/ObjectsMap.h> #include <container/ObjectsSet.h> #include <container/ObjectsVector.h> diff --git a/alib2data/src/label/LR0ItemsLabel.h b/alib2data_experimental/src/label/LR0ItemsLabel.h similarity index 96% rename from alib2data/src/label/LR0ItemsLabel.h rename to alib2data_experimental/src/label/LR0ItemsLabel.h index e04e7116c0e8f3efc7754095c6ab4c452fe5a32b..275a9c58274478d8a45cb8d52cf95c4e4967d7bc 100644 --- a/alib2data/src/label/LR0ItemsLabel.h +++ b/alib2data_experimental/src/label/LR0ItemsLabel.h @@ -13,9 +13,9 @@ #include <vector> #include <object/Object.h> -#include "LabelBase.h" -#include "Label.h" -#include "../alphabet/Symbol.h" +#include <label/LabelBase.h> +#include <label/Label.h> +#include <alphabet/Symbol.h> #include "../grammar/parsing/LRParserTypes.h" namespace label { diff --git a/anormalize2/makefile.conf b/anormalize2/makefile.conf index b60510140cc36030afd046c1c96ae1a174f6d0a6..83077b7cfa04f047e92eec5700a97a3abe75e979 100644 --- a/anormalize2/makefile.conf +++ b/anormalize2/makefile.conf @@ -1,4 +1,4 @@ EXECUTABLE:=anormalize2 -LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/ -LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2 -INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ +LINK_PATHS=../alib2elgo/ ../alib2algo_experimental/ ../alib2algo/ ../alib2data_experimental/ ../alib2data/ ../alib2common/ ../alib2std/ +LINK_LIBRARIES=alib2elgo alib2algo_experimental alib2algo alib2data_experimental alib2data alib2common alib2std xml2 +INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo_experimental/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data_experimental/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/