From dae4b5bb35cdee1924fe1d36a2c3273ddb1282bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Thu, 25 Oct 2018 11:47:38 -0300 Subject: [PATCH 1/4] travis: Move to gcc-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- .travis.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a7b229..1950626 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,22 @@ -dist: trusty sudo: false language: cpp -compiler: g++ -install: export CXX="g++-6" -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 +matrix: + include: + - os: linux + dist: xenial + sudo: require + addons: + apt: + sources: + - sourceline: 'ppa:ubuntu-toolchain-r/test' + packages: + - g++-7 + env: + - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + +before_install: + # This is necessary to solve https://github.com/travis-ci/travis-ci/issues/9649 + - eval "${MATRIX_EVAL}" script: - mkdir tmp From 3c54e901c3a9bad3816ba67c9e9c27553e907578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Thu, 25 Oct 2018 11:47:55 -0300 Subject: [PATCH 2/4] travis: Add macox/clang test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1950626..b6bbb76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,12 @@ matrix: env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + - os: osx + osx_image: xcode10 + compiler: clang + env: + - MATRIX_EVAL="CC=clang && CXX=clang++" + before_install: # This is necessary to solve https://github.com/travis-ci/travis-ci/issues/9649 - eval "${MATRIX_EVAL}" From 7c26aa04317664b28f4fde2ebd09c44ed7e4f081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Thu, 25 Oct 2018 14:47:16 -0300 Subject: [PATCH 3/4] strongparser: Underscore does not need backslash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- include/maddy/strongparser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/maddy/strongparser.h b/include/maddy/strongparser.h index c2dc441..589dacc 100644 --- a/include/maddy/strongparser.h +++ b/include/maddy/strongparser.h @@ -44,7 +44,7 @@ public: static std::vector res { std::regex{"(?!.*`.*|.*.*)\\*\\*(?!.*`.*|.*<\\/code>.*)([^\\*\\*]*)\\*\\*(?!.*`.*|.*<\\/code>.*)"}, - std::regex{"(?!.*`.*|.*.*)\\_\\_(?!.*`.*|.*<\\/code>.*)([^\\_\\_]*)\\_\\_(?!.*`.*|.*<\\/code>.*)"} + std::regex{"(?!.*`.*|.*.*)__(?!.*`.*|.*<\\/code>.*)([^__]*)__(?!.*`.*|.*<\\/code>.*)"} }; static std::string replacement = "$1"; for (const auto& re : res) From a84da9de61d1428073cc6e721433d3ee8aa7e976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Thu, 25 Oct 2018 14:47:52 -0300 Subject: [PATCH 4/4] emphasizedparser: Underscore does not need backslash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- include/maddy/emphasizedparser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/maddy/emphasizedparser.h b/include/maddy/emphasizedparser.h index 56d43dc..6838d83 100644 --- a/include/maddy/emphasizedparser.h +++ b/include/maddy/emphasizedparser.h @@ -41,7 +41,7 @@ public: void Parse(std::string& line) override { - static std::regex re("(?!.*`.*|.*.*)\\_(?!.*`.*|.*<\\/code>.*)([^\\_]*)\\_(?!.*`.*|.*<\\/code>.*)"); + static std::regex re("(?!.*`.*|.*.*)_(?!.*`.*|.*<\\/code>.*)([^_]*)_(?!.*`.*|.*<\\/code>.*)"); static std::string replacement = "$1"; line = std::regex_replace(line, re, replacement);