From 2b616243fb921155ccf06e436c8348bf8237005e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:29:40 +0200 Subject: [PATCH 01/19] Redundant include guards To reduce compilation time explodes in ctre.hpp --- include/ctre.hpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/ctre.hpp b/include/ctre.hpp index fcc4b0d8..65f423b5 100644 --- a/include/ctre.hpp +++ b/include/ctre.hpp @@ -1,10 +1,24 @@ #ifndef CTRE_V2__CTRE__HPP #define CTRE_V2__CTRE__HPP +#ifndef CTRE_V2__CTRE__LITERALS__HPP #include "ctre/literals.hpp" +#endif + +#ifndef CTRE_V2__CTRE__FUNCTIONS__HPP #include "ctre/functions.hpp" +#endif + +#ifndef CTRE_V2__CTRE__ITERATOR__HPP #include "ctre/iterators.hpp" +#endif + +#ifndef CTRE_V2__CTRE__RANGE__HPP #include "ctre/range.hpp" +#endif + +#ifndef CTRE_V2__CTRE__OPERATORS__HPP #include "ctre/operators.hpp" +#endif #endif From f50e1432b644341bebef7ba6fd4dd2c5d2060ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:30:39 +0200 Subject: [PATCH 02/19] Redundant include guards in range.hpp To reduce compilation time explodes --- include/ctre/range.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/ctre/range.hpp b/include/ctre/range.hpp index f546dd2b..ab574bfe 100644 --- a/include/ctre/range.hpp +++ b/include/ctre/range.hpp @@ -1,7 +1,9 @@ #ifndef CTRE_V2__CTRE__RANGE__HPP #define CTRE_V2__CTRE__RANGE__HPP -#include "iterators.hpp" +#ifndef CTRE_V2__CTRE__ITERATOR__HPP +#include "ctre/iterators.hpp" +#endif namespace ctre { From 19f60229f07a4db5d05ed43dfff59cb058dedf6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:32:06 +0200 Subject: [PATCH 03/19] Redundant include guards in iterators.hpp To reduce compilation time explodes --- include/ctre/iterators.hpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/ctre/iterators.hpp b/include/ctre/iterators.hpp index e22ba881..73a9f696 100644 --- a/include/ctre/iterators.hpp +++ b/include/ctre/iterators.hpp @@ -1,8 +1,13 @@ #ifndef CTRE_V2__CTRE__ITERATOR__HPP #define CTRE_V2__CTRE__ITERATOR__HPP -#include "literals.hpp" -#include "functions.hpp" +#ifndef CTRE_V2__CTRE__LITERALS__HPP +#include "ctre/literals.hpp" +#endif + +#ifndef CTRE_V2__CTRE__FUNCTIONS__HPP +#include "ctre/functions.hpp" +#endif namespace ctre { From 58be456e817fb05528767c4d90cd52aeffc2d3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:35:09 +0200 Subject: [PATCH 04/19] Redundant include guards in functions.hpp To reduce compilation time explodes --- include/ctre/functions.hpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/ctre/functions.hpp b/include/ctre/functions.hpp index b8f9df6b..ca44c91f 100644 --- a/include/ctre/functions.hpp +++ b/include/ctre/functions.hpp @@ -2,10 +2,22 @@ #define CTRE_V2__CTRE__FUNCTIONS__HPP #include "../ctll.hpp" + +#ifndef CTRE__PCRE_ACTIONS__HPP #include "pcre_actions.hpp" +#endif + +#ifndef CTRE__EVALUATION__HPP #include "evaluation.hpp" +#endif + +#ifndef CTRE__WRAPPER__HPP #include "wrapper.hpp" +#endif + +#ifndef CTRE__ID__HPP #include "id.hpp" +#endif namespace ctre { From 553798731d28dd7b226e259824a630cb712e1cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:36:06 +0200 Subject: [PATCH 05/19] Redundant include guards in functions.hpp #2 added CTRE_V2__CTLL__HPP redundant guard --- include/ctre/functions.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ctre/functions.hpp b/include/ctre/functions.hpp index ca44c91f..85378fc3 100644 --- a/include/ctre/functions.hpp +++ b/include/ctre/functions.hpp @@ -1,7 +1,9 @@ #ifndef CTRE_V2__CTRE__FUNCTIONS__HPP #define CTRE_V2__CTRE__FUNCTIONS__HPP +#ifndef CTRE_V2__CTLL__HPP #include "../ctll.hpp" +#endif #ifndef CTRE__PCRE_ACTIONS__HPP #include "pcre_actions.hpp" From 98a00c95ee61d8431fc5e11c57494713ce1a20fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:37:46 +0200 Subject: [PATCH 06/19] Redundant include guards in literals.hpp To reduce compilation time explodes --- include/ctre/literals.hpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/ctre/literals.hpp b/include/ctre/literals.hpp index 951d4c3f..0388d13f 100644 --- a/include/ctre/literals.hpp +++ b/include/ctre/literals.hpp @@ -1,11 +1,25 @@ #ifndef CTRE_V2__CTRE__LITERALS__HPP #define CTRE_V2__CTRE__LITERALS__HPP +#ifndef CTRE_V2__CTLL__HPP #include "../ctll.hpp" +#endif + +#ifndef CTRE__PCRE_ACTIONS__HPP #include "pcre_actions.hpp" +#endif + +#ifndef CTRE__EVALUATION__HPP #include "evaluation.hpp" +#endif + +#ifndef CTRE__WRAPPER__HPP #include "wrapper.hpp" +#endif + +#ifndef CTRE__ID__HPP #include "id.hpp" +#endif #ifndef __EDG__ From fba0c4055bfc83295917e6fbd1c50ab327d40378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:40:54 +0200 Subject: [PATCH 07/19] Redundant include guards in evaluation.hpp To reduce compilation time explodes --- include/ctre/evaluation.hpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/ctre/evaluation.hpp b/include/ctre/evaluation.hpp index 5755d430..cfc9b9ca 100644 --- a/include/ctre/evaluation.hpp +++ b/include/ctre/evaluation.hpp @@ -1,14 +1,40 @@ #ifndef CTRE__EVALUATION__HPP #define CTRE__EVALUATION__HPP + +#endif + +#ifndef CTRE__ATOMS__HPP #include "atoms.hpp" + +#endif + +#ifndef CTRE__ATOMS_CHARACTERS__HPP #include "atoms_characters.hpp" + +#ifndef CTRE__ATOMS_UNICODE__HPP #include "atoms_unicode.hpp" +#endif + +#ifndef CTRE__STARTS_WITH_ANCHOR__HPP #include "starts_with_anchor.hpp" +#endif + +#ifndef CTRE__UTILITY__HPP #include "utility.hpp" +#endif + +#ifndef CTRE__RETURN_TYPE__HPP #include "return_type.hpp" +#endif + +#ifndef CTRE__FIND_CAPTURES__HPP #include "find_captures.hpp" +#endif + +#ifndef CTRE__FIRST__HPP #include "first.hpp" +#endif // remove me when MSVC fix the constexpr bug #ifdef _MSC_VER From bd5dea4dc2b6b6c4778b052f2cc2c763c0ee2de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:41:22 +0200 Subject: [PATCH 08/19] Minor preprocessor errors fixed --- include/ctre/evaluation.hpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/ctre/evaluation.hpp b/include/ctre/evaluation.hpp index cfc9b9ca..61e8fca8 100644 --- a/include/ctre/evaluation.hpp +++ b/include/ctre/evaluation.hpp @@ -2,15 +2,13 @@ #define CTRE__EVALUATION__HPP -#endif - #ifndef CTRE__ATOMS__HPP #include "atoms.hpp" - #endif #ifndef CTRE__ATOMS_CHARACTERS__HPP #include "atoms_characters.hpp" +#endif #ifndef CTRE__ATOMS_UNICODE__HPP #include "atoms_unicode.hpp" From e15853b3e4b86e89d5c0cd78091d520d6009b966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 13:57:52 +0200 Subject: [PATCH 09/19] Redundant include guards in first.hpp To reduce compilation time explodes --- include/ctre/first.hpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/ctre/first.hpp b/include/ctre/first.hpp index d56ac04f..7bca3a1c 100644 --- a/include/ctre/first.hpp +++ b/include/ctre/first.hpp @@ -1,9 +1,18 @@ #ifndef CTRE__FIRST__HPP #define CTRE__FIRST__HPP +#ifndef CTRE__ATOMS__HPP #include "atoms.hpp" +#endif + +#ifndef CTRE__ATOMS_CHARACTERS__HPP #include "atoms_characters.hpp" +#endif + +#ifndef CTRE__ATOMS_UNICODE__HPP #include "atoms_unicode.hpp" +#endif + namespace ctre { From 56cf027fdce734551f3fae4574a44987deb7e7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 15:14:01 +0200 Subject: [PATCH 10/19] Redundant include guards in atoms_characters.hpp To reduce compilation time explodes --- include/ctre/atoms_characters.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/ctre/atoms_characters.hpp b/include/ctre/atoms_characters.hpp index 7d6009b0..52b54707 100644 --- a/include/ctre/atoms_characters.hpp +++ b/include/ctre/atoms_characters.hpp @@ -1,7 +1,10 @@ #ifndef CTRE__ATOMS_CHARACTERS__HPP #define CTRE__ATOMS_CHARACTERS__HPP +#ifndef CTRE__UTILITY__HPP #include "utility.hpp" +#endif + #include namespace ctre { From ec440ce8a4b0de3ab2df3b2f044fb8a39a3c6ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 15:16:49 +0200 Subject: [PATCH 11/19] Redundant include guards in find_captures.hpp To reduce compilation time explodes --- include/ctre/find_captures.hpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/ctre/find_captures.hpp b/include/ctre/find_captures.hpp index 338d266f..cbdb8c6c 100644 --- a/include/ctre/find_captures.hpp +++ b/include/ctre/find_captures.hpp @@ -1,10 +1,21 @@ #ifndef CTRE__FIND_CAPTURES__HPP #define CTRE__FIND_CAPTURES__HPP +#ifndef CTRE__ATOMS_CHARACTERS__HPP #include "atoms_characters.hpp" +#endif + +#ifndef CTRE__ATOMS_UNICODE__HPP #include "atoms_unicode.hpp" +#endif + +#ifndef CTRE__UTILITY__HPP #include "utility.hpp" +#endif + +#ifndef CTRE__RETURN_TYPE__HPP #include "return_type.hpp" +#endif namespace ctre { From 9e92e73b115a6599346077e695bfdc405f7dbf40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 15:20:28 +0200 Subject: [PATCH 12/19] Fixed bad file location --- include/ctre/range.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ctre/range.hpp b/include/ctre/range.hpp index ab574bfe..8a2050b3 100644 --- a/include/ctre/range.hpp +++ b/include/ctre/range.hpp @@ -2,7 +2,7 @@ #define CTRE_V2__CTRE__RANGE__HPP #ifndef CTRE_V2__CTRE__ITERATOR__HPP -#include "ctre/iterators.hpp" +#include "iterators.hpp" #endif namespace ctre { From 6f2e998cf5a9e0b439fae3686b06b3b0cbca09d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 15:23:34 +0200 Subject: [PATCH 13/19] Redundant include guards in pcre_actions.hpp To reduce compilation time explodes --- include/ctre/pcre_actions.hpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/ctre/pcre_actions.hpp b/include/ctre/pcre_actions.hpp index ecaad425..7c23c005 100644 --- a/include/ctre/pcre_actions.hpp +++ b/include/ctre/pcre_actions.hpp @@ -1,11 +1,26 @@ #ifndef CTRE__PCRE_ACTIONS__HPP #define CTRE__PCRE_ACTIONS__HPP +#ifndef CTRE__PCRE__HPP #include "pcre.hpp" +#endif + +#ifndef CTRE__ATOMS__HPP #include "atoms.hpp" +#endif + +#ifndef CTRE__ATOMS_CHARACTERS__HPP #include "atoms_characters.hpp" +#endif + +#ifndef CTRE__ATOMS_UNICODE__HPP #include "atoms_unicode.hpp" +#endif + +#ifndef CTRE__ID__HPP #include "id.hpp" +#endif + #include #include From 0293d5822b8a24e870726bd88b6b17d2240b53c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 15:48:07 +0200 Subject: [PATCH 14/19] Redundant include guards in return_type.hpp To reduce compilation time explodes --- include/ctre/return_type.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/ctre/return_type.hpp b/include/ctre/return_type.hpp index 19c4d23f..75407bb7 100644 --- a/include/ctre/return_type.hpp +++ b/include/ctre/return_type.hpp @@ -1,7 +1,10 @@ #ifndef CTRE__RETURN_TYPE__HPP #define CTRE__RETURN_TYPE__HPP +#ifndef CTRE__ID__HPP #include "id.hpp" +#endif + #include #include #include From 1b60d64a727ae757277a235694ddf16b736b7ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 15:49:37 +0200 Subject: [PATCH 15/19] Redundant include guards in wrapper.hpp To reduce compilation time explodes --- include/ctre/wrapper.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/ctre/wrapper.hpp b/include/ctre/wrapper.hpp index 0a672dd3..ebd14c0f 100644 --- a/include/ctre/wrapper.hpp +++ b/include/ctre/wrapper.hpp @@ -1,8 +1,14 @@ #ifndef CTRE__WRAPPER__HPP #define CTRE__WRAPPER__HPP +#ifndef CTRE__EVALUATION__HPP #include "evaluation.hpp" +#endif + +#ifndef CTRE__UTILITY__HPP #include "utility.hpp" +#endif + #include #include From 833626507785a99cbe0b03438a6f4eb7c7c21cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 15:51:32 +0200 Subject: [PATCH 16/19] Redundant include guards in ctll.hpp To reduce compilation time explodes --- include/ctll.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ctll.hpp b/include/ctll.hpp index 2fe40e34..00d152e5 100644 --- a/include/ctll.hpp +++ b/include/ctll.hpp @@ -1,6 +1,8 @@ #ifndef CTRE_V2__CTLL__HPP #define CTRE_V2__CTLL__HPP +#ifndef CTLL__PARSER__HPP #include "ctll/parser.hpp" +#endif #endif From bd4785a4cabb6e1662e282d77ec20ef46aa30403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 15:53:54 +0200 Subject: [PATCH 17/19] Redundant include guards in parser.hpp To reduce compilation time explodes --- include/ctll/parser.hpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/ctll/parser.hpp b/include/ctll/parser.hpp index d7fab77b..25e2e9e1 100644 --- a/include/ctll/parser.hpp +++ b/include/ctll/parser.hpp @@ -1,10 +1,21 @@ #ifndef CTLL__PARSER__HPP #define CTLL__PARSER__HPP +#ifndef CTLL__FIXED_STRING__GPP #include "fixed_string.hpp" +#endif + +#ifndef CTLL__TYPE_STACK__HPP #include "list.hpp" +#endif + +#ifndef CTLL__GRAMMARS__HPP #include "grammars.hpp" +#endif + +#ifndef CTLL__ACTIONS__HPP #include "actions.hpp" +#endif #include From f85a4d01d0d4f0bb570658d1f736b8c205754649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 15:55:07 +0200 Subject: [PATCH 18/19] Redundant include guards in list.hpp To reduce compilation time explodes --- include/ctll/list.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ctll/list.hpp b/include/ctll/list.hpp index 228ab72a..cae20a66 100644 --- a/include/ctll/list.hpp +++ b/include/ctll/list.hpp @@ -1,7 +1,9 @@ #ifndef CTLL__TYPE_STACK__HPP #define CTLL__TYPE_STACK__HPP +#ifndef CTLL__UTILITIES__HPP #include "utilities.hpp" +#endif namespace ctll { From f5ccd48cf6e1e98c05b220e8f3e2084f811bc722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Ramos=20Ruiz?= <46030516+jmramosr@users.noreply.github.com> Date: Wed, 16 Sep 2020 15:59:38 +0200 Subject: [PATCH 19/19] Minor edit: erased error folder location --- include/ctre/iterators.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ctre/iterators.hpp b/include/ctre/iterators.hpp index 73a9f696..a4176b17 100644 --- a/include/ctre/iterators.hpp +++ b/include/ctre/iterators.hpp @@ -2,11 +2,11 @@ #define CTRE_V2__CTRE__ITERATOR__HPP #ifndef CTRE_V2__CTRE__LITERALS__HPP -#include "ctre/literals.hpp" +#include "literals.hpp" #endif #ifndef CTRE_V2__CTRE__FUNCTIONS__HPP -#include "ctre/functions.hpp" +#include "functions.hpp" #endif namespace ctre {