From af6dd8f65a5c039afc403248096052ea6cd64df6 Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:02:58 +0100 Subject: [PATCH 01/11] try out appveyor --- appveyor.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..1e0a33f --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,10 @@ +image: Visual Studio 2017 + +build_script: + - cmd: mkdir tmp + - cmd: cd tmp + - cmd: cmake -G "Visual Studio 2017" .. + +test_script: + - cmd: cd tmp + - ctest -VV -C "Release" From 0b00ee7137137ffe1b6b896aa1b21f3f6890ce73 Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:06:19 +0100 Subject: [PATCH 02/11] VS 15 is 2017 version... --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1e0a33f..2d265fc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ image: Visual Studio 2017 build_script: - cmd: mkdir tmp - cmd: cd tmp - - cmd: cmake -G "Visual Studio 2017" .. + - cmd: cmake -G "Visual Studio 15 Win64" .. test_script: - cmd: cd tmp From 81090b8ca7441465754d4c39c68b8b5c8768d995 Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:09:23 +0100 Subject: [PATCH 03/11] init submodules for appveyor --- .editorconfig | 2 +- appveyor.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 5c2baf6..9035bef 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,5 +8,5 @@ indent_style = space insert_final_newline = true trim_trailing_whitespace = true -[*.{h,hh,hpp,c,cc,cpp,cxx}] +[*.{h,hh,hpp,c,cc,cpp,cxx,yml}] indent_size = 2 diff --git a/appveyor.yml b/appveyor.yml index 2d265fc..4d5e94f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,8 @@ image: Visual Studio 2017 +init: + - cmd: git submodule update --init --recursive + build_script: - cmd: mkdir tmp - cmd: cd tmp From 77a74fef567cc8875a6617b5732def9e3e6f9b53 Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:10:38 +0100 Subject: [PATCH 04/11] appveyor on init the repo isn't cloned yet --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4d5e94f..86fb787 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ image: Visual Studio 2017 -init: +install: - cmd: git submodule update --init --recursive build_script: From 519c81eaab183e105872f39b89d24feb43dbef32 Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:12:54 +0100 Subject: [PATCH 05/11] appveyor in test_script it is already in tmp --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 86fb787..5830ca1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,5 +9,4 @@ build_script: - cmd: cmake -G "Visual Studio 15 Win64" .. test_script: - - cmd: cd tmp - - ctest -VV -C "Release" + - cmd: ctest -VV -C "Release" From 371dc41aff8304f05588ce378025c32184830ac8 Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:21:00 +0100 Subject: [PATCH 06/11] appveyor do cmake before build --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5830ca1..d1a89f1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ image: Visual Studio 2017 install: - cmd: git submodule update --init --recursive -build_script: +before_build: - cmd: mkdir tmp - cmd: cd tmp - cmd: cmake -G "Visual Studio 15 Win64" .. From b5a6628f44b3cac268ffac2f575a5942e35e258c Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:23:21 +0100 Subject: [PATCH 07/11] appveyor - try to specify sln --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index d1a89f1..4422f06 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,5 +8,8 @@ before_build: - cmd: cd tmp - cmd: cmake -G "Visual Studio 15 Win64" .. +build: + project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln + test_script: - cmd: ctest -VV -C "Release" From 92db2179662d3bcbf5bcc9fcb756fa37ed6454b3 Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:25:57 +0100 Subject: [PATCH 08/11] appveyor - guess where the sln might be --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4422f06..c45d392 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ before_build: - cmd: cmake -G "Visual Studio 15 Win64" .. build: - project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln + project: $(APPVEYOR_BUILD_FOLDER)\tmp\$(APPVEYOR_PROJECT_NAME).sln test_script: - cmd: ctest -VV -C "Release" From 0762f6cc5d04a9670004b9481010cfde1056144b Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:31:16 +0100 Subject: [PATCH 09/11] appveyor - build this now.... --- CMakeLists.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 634dfc4..7236ac9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,10 +25,17 @@ file(GLOB_RECURSE MADDY_TESTS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tests/maddy/*.cp # ------------------------------------------------------------------------------ -set( - CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} -g -std=c++${MADDY_CPP_VERSION} -Wall -Wpedantic -Wextra -Wno-ignored-qualifiers -fno-rtti -fno-exceptions -fsanitize=address -fno-omit-frame-pointer" -) +if (UNIX) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -g -std=c++${MADDY_CPP_VERSION} -Wall -Wpedantic -Wextra -Wno-ignored-qualifiers -fno-rtti -fno-exceptions -fsanitize=address -fno-omit-frame-pointer" + ) +else() + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -g -std=c++${MADDY_CPP_VERSION} -fno-rtti -fno-exceptions -fsanitize=address -fno-omit-frame-pointer" + ) +endif() # ------------------------------------------------------------------------------ From c5c37a76276f9eb061b21bc9317fc458204431a2 Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:34:39 +0100 Subject: [PATCH 10/11] appveyor - now? --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7236ac9..70f723f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ if (UNIX) else() set( CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} -g -std=c++${MADDY_CPP_VERSION} -fno-rtti -fno-exceptions -fsanitize=address -fno-omit-frame-pointer" + "${CMAKE_CXX_FLAGS} -std=c++${MADDY_CPP_VERSION}" ) endif() From 3484198ade25e8d5e212fa160961660c41c8cd97 Mon Sep 17 00:00:00 2001 From: "M. Petra Baranski" Date: Tue, 19 Feb 2019 02:43:09 +0100 Subject: [PATCH 11/11] appveyor - use debug --- appveyor.yml | 2 +- include/maddy/blockparser.h | 32 +++++++++++++++++--------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c45d392..e8842c3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,4 +12,4 @@ build: project: $(APPVEYOR_BUILD_FOLDER)\tmp\$(APPVEYOR_PROJECT_NAME).sln test_script: - - cmd: ctest -VV -C "Release" + - cmd: ctest -VV -C "Debug" diff --git a/include/maddy/blockparser.h b/include/maddy/blockparser.h index 5aeed5f..9df4fa6 100644 --- a/include/maddy/blockparser.h +++ b/include/maddy/blockparser.h @@ -157,24 +157,26 @@ protected: { bool hasMetNonSpace = false; - uint32_t indentation = std::count_if( - line.begin(), - line.end(), - [&hasMetNonSpace](unsigned char c) - { - if (hasMetNonSpace) + uint32_t indentation = static_cast( + std::count_if( + line.begin(), + line.end(), + [&hasMetNonSpace](unsigned char c) { + if (hasMetNonSpace) + { + return false; + } + + if (std::isspace(c)) + { + return true; + } + + hasMetNonSpace = true; return false; } - - if (std::isspace(c)) - { - return true; - } - - hasMetNonSpace = true; - return false; - } + ) ); return indentation;