From c63d03c61cc727f2d7d46f5f7f96eece22b74c7d Mon Sep 17 00:00:00 2001 From: Mike Gevaert Date: Thu, 28 Aug 2025 09:37:46 +0200 Subject: [PATCH 1/6] use updated lexertl14 --- 3rdparty/lexertl14 | 2 +- src/readers/NeurolucidaLexer.inc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/3rdparty/lexertl14 b/3rdparty/lexertl14 index cd5a1f13..5675f53d 160000 --- a/3rdparty/lexertl14 +++ b/3rdparty/lexertl14 @@ -1 +1 @@ -Subproject commit cd5a1f13f4d5d50da9475a91b837f196b34f5e7b +Subproject commit 5675f53d9bc29a2f3d692fb6499da739bf4309af diff --git a/src/readers/NeurolucidaLexer.inc b/src/readers/NeurolucidaLexer.inc index 118ad214..b6d3ed35 100644 --- a/src/readers/NeurolucidaLexer.inc +++ b/src/readers/NeurolucidaLexer.inc @@ -149,7 +149,6 @@ public: rules_.push("Splat[0-9]*", +Token::MARKER); rules_.push("Flower[0-9]*", +Token::MARKER); rules_.push("Circle[0-9]*", +Token::MARKER); - rules_.push("Flower[0-9]*", +Token::MARKER); rules_.push("TriStar[0-9]*", +Token::MARKER); rules_.push("OpenStar[0-9]*", +Token::MARKER); rules_.push("Asterisk[0-9]*", +Token::MARKER); From a568d1e3197f52766210665162d1ec879a8cddc6 Mon Sep 17 00:00:00 2001 From: Mike Gevaert Date: Wed, 26 Nov 2025 08:59:28 +0100 Subject: [PATCH 2/6] latest lexerl14 --- 3rdparty/lexertl14 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/lexertl14 b/3rdparty/lexertl14 index 5675f53d..b9613402 160000 --- a/3rdparty/lexertl14 +++ b/3rdparty/lexertl14 @@ -1 +1 @@ -Subproject commit 5675f53d9bc29a2f3d692fb6499da739bf4309af +Subproject commit b96134025ece820bbbcb693434c5a14691a49c54 From cb3f9494c442908d0009d01ee168e26867c2aac1 Mon Sep 17 00:00:00 2001 From: Mike Gevaert Date: Wed, 26 Nov 2025 09:09:49 +0100 Subject: [PATCH 3/6] disable warning on lexertl14 --- src/disable_error.h | 26 ++++++++++++++++++++++++++ src/readers/NeurolucidaLexer.inc | 10 +++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/disable_error.h diff --git a/src/disable_error.h b/src/disable_error.h new file mode 100644 index 00000000..47f5914a --- /dev/null +++ b/src/disable_error.h @@ -0,0 +1,26 @@ +/* Copyright (c) 2013-2023, EPFL/Blue Brain Project + * 2025, Open Brain Institute + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#define PRAGMA(x) _Pragma(#x) + +#if defined(__clang__) + #define DISABLE_WARNING_PUSH PRAGMA(clang diagnostic push) + #define DISABLE_WARNING_POP PRAGMA(clang diagnostic pop) + #define DISABLE_WARNING(warningName) PRAGMA(clang diagnostic ignored #warningName) +#elif defined(__GNUC__) + #define DISABLE_WARNING_PUSH PRAGMA(GCC diagnostic push) + #define DISABLE_WARNING_POP PRAGMA(GCC diagnostic pop) + #define DISABLE_WARNING(warningName) PRAGMA(GCC diagnostic ignored #warningName) +#elif defined(_MSC_VER) + #define DISABLE_WARNING_PUSH __pragma(warning(push)) + #define DISABLE_WARNING_POP __pragma(warning(pop)) + #define DISABLE_WARNING(warningNumber) __pragma(warning(disable: warningNumber)) +#else + #define DISABLE_WARNING_PUSH + #define DISABLE_WARNING_POP + #define DISABLE_WARNING(warningName) +#endif + diff --git a/src/readers/NeurolucidaLexer.inc b/src/readers/NeurolucidaLexer.inc index b6d3ed35..0e0c36a4 100644 --- a/src/readers/NeurolucidaLexer.inc +++ b/src/readers/NeurolucidaLexer.inc @@ -3,15 +3,23 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include "../disable_error.h" +#include "../error_message_generation.h" + #include #include + +DISABLE_WARNING_PUSH +DISABLE_WARNING(-Wnull-dereference) + #include #include #include #include -#include "../error_message_generation.h" +DISABLE_WARNING_POP + namespace morphio { namespace readers { From a6aedb2e93079d2d9b4b0ba65cf4538bd3e2089e Mon Sep 17 00:00:00 2001 From: Mike Gevaert Date: Thu, 27 Nov 2025 11:16:51 +0100 Subject: [PATCH 4/6] try --- 3rdparty/lexertl14 | 2 +- src/readers/NeurolucidaLexer.inc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3rdparty/lexertl14 b/3rdparty/lexertl14 index b9613402..d81c4b8a 160000 --- a/3rdparty/lexertl14 +++ b/3rdparty/lexertl14 @@ -1 +1 @@ -Subproject commit b96134025ece820bbbcb693434c5a14691a49c54 +Subproject commit d81c4b8aaa148e721b0bb5eb02ad87d26a3eca6c diff --git a/src/readers/NeurolucidaLexer.inc b/src/readers/NeurolucidaLexer.inc index 0e0c36a4..5ef30c29 100644 --- a/src/readers/NeurolucidaLexer.inc +++ b/src/readers/NeurolucidaLexer.inc @@ -10,16 +10,16 @@ #include -DISABLE_WARNING_PUSH -DISABLE_WARNING(-Wnull-dereference) +// DISABLE_WARNING_PUSH +// DISABLE_WARNING(-Wnull-dereference) #include #include #include #include -DISABLE_WARNING_POP - +// DISABLE_WARNING_POP + namespace morphio { namespace readers { From ae0d9a7d9e6324bd95b4e76b4f2da70d9e53917a Mon Sep 17 00:00:00 2001 From: Mike Gevaert Date: Fri, 28 Nov 2025 09:51:49 +0100 Subject: [PATCH 5/6] disable warning on lexertl14 --- src/disable_error.h | 3 +-- src/readers/NeurolucidaLexer.inc | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/disable_error.h b/src/disable_error.h index 47f5914a..20c98608 100644 --- a/src/disable_error.h +++ b/src/disable_error.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2023, EPFL/Blue Brain Project - * 2025, Open Brain Institute +/* Copyright (c) 2025, Open Brain Institute * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/readers/NeurolucidaLexer.inc b/src/readers/NeurolucidaLexer.inc index 5ef30c29..52b3f8d5 100644 --- a/src/readers/NeurolucidaLexer.inc +++ b/src/readers/NeurolucidaLexer.inc @@ -10,15 +10,15 @@ #include -// DISABLE_WARNING_PUSH -// DISABLE_WARNING(-Wnull-dereference) +//DISABLE_WARNING_PUSH +//DISABLE_WARNING(-Wnull-dereference) #include #include #include #include -// DISABLE_WARNING_POP +//DISABLE_WARNING_POP namespace morphio { From 2c2e9eca906288dfd313ed886d32a5d08f623fcc Mon Sep 17 00:00:00 2001 From: Mike Gevaert Date: Mon, 1 Dec 2025 09:12:12 +0100 Subject: [PATCH 6/6] upstream lexertl allowed fix for error --- 3rdparty/lexertl14 | 2 +- src/disable_error.h | 25 ------------------------- src/readers/NeurolucidaLexer.inc | 10 +--------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 src/disable_error.h diff --git a/3rdparty/lexertl14 b/3rdparty/lexertl14 index d81c4b8a..6fb9936f 160000 --- a/3rdparty/lexertl14 +++ b/3rdparty/lexertl14 @@ -1 +1 @@ -Subproject commit d81c4b8aaa148e721b0bb5eb02ad87d26a3eca6c +Subproject commit 6fb9936f0fd7e259a2df3d548da9c6953fdf4ead diff --git a/src/disable_error.h b/src/disable_error.h deleted file mode 100644 index 20c98608..00000000 --- a/src/disable_error.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (c) 2025, Open Brain Institute - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#define PRAGMA(x) _Pragma(#x) - -#if defined(__clang__) - #define DISABLE_WARNING_PUSH PRAGMA(clang diagnostic push) - #define DISABLE_WARNING_POP PRAGMA(clang diagnostic pop) - #define DISABLE_WARNING(warningName) PRAGMA(clang diagnostic ignored #warningName) -#elif defined(__GNUC__) - #define DISABLE_WARNING_PUSH PRAGMA(GCC diagnostic push) - #define DISABLE_WARNING_POP PRAGMA(GCC diagnostic pop) - #define DISABLE_WARNING(warningName) PRAGMA(GCC diagnostic ignored #warningName) -#elif defined(_MSC_VER) - #define DISABLE_WARNING_PUSH __pragma(warning(push)) - #define DISABLE_WARNING_POP __pragma(warning(pop)) - #define DISABLE_WARNING(warningNumber) __pragma(warning(disable: warningNumber)) -#else - #define DISABLE_WARNING_PUSH - #define DISABLE_WARNING_POP - #define DISABLE_WARNING(warningName) -#endif - diff --git a/src/readers/NeurolucidaLexer.inc b/src/readers/NeurolucidaLexer.inc index 52b3f8d5..b6d3ed35 100644 --- a/src/readers/NeurolucidaLexer.inc +++ b/src/readers/NeurolucidaLexer.inc @@ -3,23 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "../disable_error.h" -#include "../error_message_generation.h" - #include #include - -//DISABLE_WARNING_PUSH -//DISABLE_WARNING(-Wnull-dereference) - #include #include #include #include -//DISABLE_WARNING_POP - +#include "../error_message_generation.h" namespace morphio { namespace readers {