Skip to content

Merge develop to master #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Oct 9, 2017
Merged

Merge develop to master #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f89c75f
Silence MSVC 14.1 warnings of narrowing conversion
Lastique Mar 25, 2017
791c447
Escape back slashes
danieljames Apr 9, 2017
b9cad50
Conditionally replace deprecated/removed C++98 std::bind1st by std::b…
DanielaE May 14, 2017
47635d0
Update icu.cpp
VemundH May 22, 2017
35fa162
Add CI testing.
jzmaddock May 30, 2017
180c0e7
CI: Manually fix up missing dependency to program_options.
jzmaddock May 30, 2017
2c98baf
CI: Fix program_options dependency spelling.
jzmaddock May 30, 2017
1dad925
CI: Manually specify dependencies, and streamline number of Appveyor …
jzmaddock May 30, 2017
cc09911
CI: Add missing dependency
jzmaddock May 31, 2017
7fa0ddd
CI: Add one more missing dependency.
jzmaddock May 31, 2017
dba63e4
CI: Add one more missing dependency.
jzmaddock May 31, 2017
af55bf7
CI: Add more dependencies to appveyor file.
jzmaddock May 31, 2017
0f5d7dd
Merge pull request #28 from Lastique/patch-1
jzmaddock Jun 2, 2017
65fdfa5
Merge pull request #29 from danieljames/feature/fix-escape
jzmaddock Jun 2, 2017
df563a8
Merge pull request #31 from VemundH/patch-1
jzmaddock Jun 2, 2017
18e38c2
Merge pull request #30 from DanielaE/feature/replace-deprecated-c++98…
jzmaddock Jun 2, 2017
4ac4a45
CI: Fix bjam arguments on appveyor.
jzmaddock Jun 4, 2017
a59890f
Merge branch 'develop' of https://github.com/boostorg/regex into develop
jzmaddock Jun 4, 2017
ab399c9
Documentation fix for backreferences example. Fixes issue #33.
jzmaddock Jul 30, 2017
d97bcfb
Fix integer types and signedness:
jzmaddock Jul 31, 2017
bc9b25b
Fix potential overflow in max_state_count calculation.
jzmaddock Jul 31, 2017
9cfc6a4
Change performance doc generator to shorten path names.
jzmaddock Aug 1, 2017
d96012b
Update linux performance results
jzmaddock Aug 1, 2017
4828a7f
Regenerate documentation with shorter path names.
jzmaddock Aug 1, 2017
9d4a4b7
Merge pull request #38 from boostorg/issue13001
jzmaddock Aug 1, 2017
5c543a8
Copy named sub-expression info when adapting ICU via iterators.
jzmaddock Aug 1, 2017
a32e0cc
Fix pattern escaping in regex used for \R so it works when the x-modi…
jzmaddock Aug 3, 2017
09894a5
Fix escapes in test case.
jzmaddock Aug 4, 2017
289ce86
Regex: move boost headers to top of list to work around clang issue w…
jzmaddock Sep 21, 2017
881a157
Regex: Fix integer overflow in expression parsing.
jzmaddock Oct 7, 2017
f592693
Regex: Fix potential negation of INT_MIN,
jzmaddock Oct 7, 2017
dc74e14
Try and fix travis CI configuration issue.
jzmaddock Oct 7, 2017
f343cab
Regex: Fix handling of repeats when mod_x is in effect.
jzmaddock Oct 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
495 changes: 495 additions & 0 deletions .travis.yml
View file
Open in desktop

Large diffs are not rendered by default.

103 changes: 103 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
# Copyright 2016 Peter Dimov
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)

version: 1.0.{build}-{branch}

shallow_clone: true

branches:
only:
- master
- develop

platform:
- x64

environment:
matrix:
- ARGS: --toolset=msvc-9.0 address-model=32
- ARGS: --toolset=msvc-10.0 address-model=32
- ARGS: --toolset=msvc-11.0 address-model=32
- ARGS: --toolset=msvc-12.0 address-model=32
- ARGS: --toolset=msvc-14.0 address-model=32
- ARGS: --toolset=msvc-12.0 address-model=64
- ARGS: --toolset=msvc-14.0 address-model=64
- ARGS: --toolset=msvc-14.0 address-model=64 cxxflags=-std:c++latest
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=32
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-std:c++latest
- ARGS: --toolset=gcc address-model=64
PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
- ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z
PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
- ARGS: --toolset=gcc address-model=32
PATH: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH%
- ARGS: --toolset=gcc address-model=32 linkflags=-Wl,-allow-multiple-definition
PATH: C:\MinGW\bin;%PATH%


install:
- cd ..
- git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root
- git submodule update --init tools/build
- git submodule update --init libs/config
- git submodule update --init libs/core
- git submodule update --init libs/detail
- git submodule update --init libs/smart_ptr
- git submodule update --init libs/predef
- git submodule update --init libs/assert
- git submodule update --init libs/throw_exception
- git submodule update --init libs/mpl
- git submodule update --init libs/type_traits
- git submodule update --init libs/static_assert
- git submodule update --init libs/integer
- git submodule update --init libs/preprocessor
- git submodule update --init libs/functional
- git submodule update --init libs/program_options
- git submodule update --init libs/chrono
- git submodule update --init libs/system
- git submodule update --init libs/thread
- git submodule update --init libs/winapi
- git submodule update --init libs/move
- git submodule update --init libs/date_time
- git submodule update --init libs/ratio
- git submodule update --init libs/iterator
- git submodule update --init libs/range
- git submodule update --init libs/any
- git submodule update --init libs/concept_check
- git submodule update --init libs/array
- git submodule update --init libs/timer
- git submodule update --init libs/bind
- git submodule update --init libs/utility
- git submodule update --init libs/io
- git submodule update --init libs/intrusive
- git submodule update --init libs/container
- git submodule update --init libs/tuple
- git submodule update --init libs/exception
- git submodule update --init libs/function
- git submodule update --init libs/type_index
- git submodule update --init libs/lexical_cast
- git submodule update --init libs/numeric
- git submodule update --init libs/math
- git submodule update --init libs/tokenizer
- git submodule update --init libs/optional
- git submodule update --init libs/atomic
- git submodule update --init libs/rational
- git submodule update --init libs/algorithm
- xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\regex
- bootstrap
- b2 headers

build: off

test_script:
- cd libs\config\test
- ..\..\..\b2 config_info_travis_install %ARGS%
- config_info_travis
- cd ..\..\regex\test
- ..\..\..\b2 -j3 %ARGS% define=CI_SUPPRESS_KNOWN_ISSUES
80 changes: 80 additions & 0 deletions doc/html/boost_regex/background.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Background Information</title>
<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../index.html" title="Boost.Regex 5.1.3">
<link rel="up" href="../index.html" title="Boost.Regex 5.1.3">
<link rel="prev" href="ref/internals/uni_iter.html" title="Unicode Iterators">
<link rel="next" href="background/headers.html" title="Headers">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
<td align="center"><a href="../../../../../index.html">Home</a></td>
<td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
<td align="center"><a href="http://www.boost.org/users/people.html">People</a></td>
<td align="center"><a href="http://www.boost.org/users/faq.html">FAQ</a></td>
<td align="center"><a href="../../../../../more/index.htm">More</a></td>
</tr></table>
<hr>
<div class="spirit-nav">
<a accesskey="p" href="ref/internals/uni_iter.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="background/headers.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
</div>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
<a name="boost_regex.background"></a><a class="link" href="background.html" title="Background Information">Background Information</a>
</h2></div></div></div>
<div class="toc"><dl>
<dt><span class="section"><a href="background/headers.html">Headers</a></span></dt>
<dt><span class="section"><a href="background/locale.html">Localization</a></span></dt>
<dt><span class="section"><a href="background/thread_safety.html">Thread Safety</a></span></dt>
<dt><span class="section"><a href="background/examples.html">Test and Example Programs</a></span></dt>
<dt><span class="section"><a href="background/futher.html">References and Further
Information</a></span></dt>
<dt><span class="section"><a href="background/faq.html">FAQ</a></span></dt>
<dt><span class="section"><a href="background/performance.html">Performance</a></span></dt>
<dd><dl>
<dt><span class="section"><a href="background/performance/section_id1378460593.html">Testing
simple leftmost-longest matches (platform = linux, compiler = GNU C++ version
6.3.0)</a></span></dt>
<dt><span class="section"><a href="background/performance/section_id1675827111.html">Testing
Perl searches (platform = linux, compiler = GNU C++ version 6.3.0)</a></span></dt>
<dt><span class="section"><a href="background/performance/section_id3141719723.html">Testing
simple leftmost-longest matches (platform = Windows x64, compiler = Microsoft
Visual C++ version 14.1)</a></span></dt>
<dt><span class="section"><a href="background/performance/section_id3258595385.html">Testing
leftmost-longest searches (platform = Windows x64, compiler = Microsoft Visual
C++ version 14.1)</a></span></dt>
<dt><span class="section"><a href="background/performance/section_id3261825021.html">Testing
simple Perl matches (platform = linux, compiler = GNU C++ version 6.3.0)</a></span></dt>
<dt><span class="section"><a href="background/performance/section_id3752650613.html">Testing
Perl searches (platform = Windows x64, compiler = Microsoft Visual C++ version
14.1)</a></span></dt>
<dt><span class="section"><a href="background/performance/section_id4128344975.html">Testing
simple Perl matches (platform = Windows x64, compiler = Microsoft Visual
C++ version 14.1)</a></span></dt>
<dt><span class="section"><a href="background/performance/section_id4148872883.html">Testing
leftmost-longest searches (platform = linux, compiler = GNU C++ version 6.3.0)</a></span></dt>
</dl></dd>
<dt><span class="section"><a href="background/standards.html">Standards Conformance</a></span></dt>
<dt><span class="section"><a href="background/redist.html">Redistributables</a></span></dt>
<dt><span class="section"><a href="background/acknowledgements.html">Acknowledgements</a></span></dt>
<dt><span class="section"><a href="background/history.html">History</a></span></dt>
</dl></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
<td align="right"><div class="copyright-footer">Copyright &#169; 1998-2013 John Maddock<p>
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
</p>
</div></td>
</tr></table>
<hr>
<div class="spirit-nav">
<a accesskey="p" href="ref/internals/uni_iter.html"><img src="../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="background/headers.html"><img src="../../../../../doc/src/images/next.png" alt="Next"></a>
</div>
</body>
</html>
8 changes: 4 additions & 4 deletions ...kground_information/acknowledgements.html → ...st_regex/background/acknowledgements.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../../index.html" title="Boost.Regex 5.1.3">
<link rel="up" href="../background_information.html" title="Background Information">
<link rel="up" href="../background.html" title="Background Information">
<link rel="prev" href="redist.html" title="Redistributables">
<link rel="next" href="history.html" title="History">
</head>
Expand All @@ -20,11 +20,11 @@
</tr></table>
<hr>
<div class="spirit-nav">
<a accesskey="p" href="redist.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="history.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
<a accesskey="p" href="redist.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="history.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
<a name="boost_regex.background_information.acknowledgements"></a><a class="link" href="acknowledgements.html" title="Acknowledgements">Acknowledgements</a>
<a name="boost_regex.background.acknowledgements"></a><a class="link" href="acknowledgements.html" title="Acknowledgements">Acknowledgements</a>
</h3></div></div></div>
<p>
The author can be contacted at john - at - johnmaddock.co.uk; the home page
Expand Down Expand Up @@ -81,7 +81,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
<a accesskey="p" href="redist.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="history.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
<a accesskey="p" href="redist.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="history.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
</div>
</body>
</html>
21 changes: 10 additions & 11 deletions ...egex/background_information/examples.html → ...html/boost_regex/background/examples.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
<link rel="home" href="../../index.html" title="Boost.Regex 5.1.3">
<link rel="up" href="../background_information.html" title="Background Information">
<link rel="up" href="../background.html" title="Background Information">
<link rel="prev" href="thread_safety.html" title="Thread Safety">
<link rel="next" href="futher.html" title="References and Further Information">
</head>
Expand All @@ -20,16 +20,15 @@
</tr></table>
<hr>
<div class="spirit-nav">
<a accesskey="p" href="thread_safety.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="futher.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
<a accesskey="p" href="thread_safety.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="futher.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
<a name="boost_regex.background_information.examples"></a><a class="link" href="examples.html" title="Test and Example Programs">Test and
Example Programs</a>
<a name="boost_regex.background.examples"></a><a class="link" href="examples.html" title="Test and Example Programs">Test and Example Programs</a>
</h3></div></div></div>
<h5>
<a name="boost_regex.background_information.examples.h0"></a>
<span class="phrase"><a name="boost_regex.background_information.examples.test_programs"></a></span><a class="link" href="examples.html#boost_regex.background_information.examples.test_programs">Test
<a name="boost_regex.background.examples.h0"></a>
<span class="phrase"><a name="boost_regex.background.examples.test_programs"></a></span><a class="link" href="examples.html#boost_regex.background.examples.test_programs">Test
Programs</a>
</h5>
<p>
Expand Down Expand Up @@ -151,8 +150,8 @@ <h5>
Files: <a href="../../../../test/captures/captures_test.cpp" target="_top">captures_test.cpp</a>.
</p>
<h5>
<a name="boost_regex.background_information.examples.h1"></a>
<span class="phrase"><a name="boost_regex.background_information.examples.example_programs"></a></span><a class="link" href="examples.html#boost_regex.background_information.examples.example_programs">Example
<a name="boost_regex.background.examples.h1"></a>
<span class="phrase"><a name="boost_regex.background.examples.example_programs"></a></span><a class="link" href="examples.html#boost_regex.background.examples.example_programs">Example
programs</a>
</h5>
<p>
Expand All @@ -177,8 +176,8 @@ <h5>
Files: <a href="../../../../example/timer/regex_timer.cpp" target="_top">regex_timer.cpp</a>.
</p>
<h5>
<a name="boost_regex.background_information.examples.h2"></a>
<span class="phrase"><a name="boost_regex.background_information.examples.code_snippets"></a></span><a class="link" href="examples.html#boost_regex.background_information.examples.code_snippets">Code
<a name="boost_regex.background.examples.h2"></a>
<span class="phrase"><a name="boost_regex.background.examples.code_snippets"></a></span><a class="link" href="examples.html#boost_regex.background.examples.code_snippets">Code
snippets</a>
</h5>
<p>
Expand Down Expand Up @@ -269,7 +268,7 @@ <h5>
</tr></table>
<hr>
<div class="spirit-nav">
<a accesskey="p" href="thread_safety.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background_information.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="futher.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
<a accesskey="p" href="thread_safety.html"><img src="../../../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="../background.html"><img src="../../../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="futher.html"><img src="../../../../../../doc/src/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Loading