Release 1.1.

diff --git a/src/conf.py b/src/conf.py
index cc69496444b524ad39922beedc6d4971bb25b0bf..d48a4588b8e4923a6a5aad8e516d0091482d0e6c 100644 (file)
--- a/src/conf.py
+++ b/src/conf.py
@@ -50,7 +50,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u're2c'
-copyright = u'2016, re2c devs'
+copyright = u'2018, re2c devs'
 author = u're2c devs'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -58,9 +58,9 @@ author = u're2c devs'
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.3'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.3'
+release = '1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/src/examples/09_etc_passwd.i--tags.re b/src/examples/09_etc_passwd.i--tags.re
index 6564110e7fd19ce62ae0b8cdcc2a71feadc7a29c..7210f4e87d237725b46963f13323387bfceabbd4 100644 (file)
--- a/src/examples/09_etc_passwd.i--tags.re
+++ b/src/examples/09_etc_passwd.i--tags.re
@@ -5,7 +5,7 @@
 
 static int lex(const char *YYCURSOR)
 {
-    const char *YYMARKER, *n, *p, *u, *g, *i, *h, *c;
+    const char *YYMARKER, *n, *p, *u, *g, *f, *h, *c;
     /*!stags:re2c format = 'const char *@@;'; */
 loop:
     /*!re2c
@@ -31,14 +31,14 @@ loop:
         @p pass sep
         @u uid  sep
         @g gid  sep
-        @i info sep
+        @f info sep
         @h home sep
         @c cmd  eol {
             printf("user:     %.*s\n", (int)(p - n) - 1, n);
             printf("password: %.*s\n", (int)(u - p) - 1, p);
             printf("UID:      %.*s\n", (int)(g - u) - 1, u);
-            printf("GID:      %.*s\n", (int)(i - g) - 1, g);
-            printf("info:     %.*s\n", (int)(h - i) - 1, i);
+            printf("GID:      %.*s\n", (int)(f - g) - 1, g);
+            printf("info:     %.*s\n", (int)(h - f) - 1, f);
             printf("home:     %.*s\n", (int)(c - h) - 1, h);
             printf("command:  %.*s\n", (int)(YYCURSOR - c - 1), c);
             printf("\n");

diff --git a/src/feed/feed/atom.xml b/src/feed/feed/atom.xml
index 3ce3d1d4d1c05663ea426e0a1c735644f27de46a..a8d11f7172ad0c7a533c87608436fc807a579fcd 100644 (file)
--- a/src/feed/feed/atom.xml
+++ b/src/feed/feed/atom.xml
@@ -153,4 +153,21 @@
         </author>
     </entry>
 
+
+    <entry>
+        <title>Release 1.1</title>
+        <link href="http://re2c.org/news/release_notes/1_1.html"/>
+        <id>http://re2c.org/news/release_notes/1_1.html</id>
+        <updated>2018-08-27T23:00:00Z</updated>
+        <summary type="xhtml">
+            <div xmlns="http://www.w3.org/1999/xhtml">
+                Release re2c-1.1 (<a href="http://re2c.org/news/release_notes/1_1.html">release notes</a>).
+            </div>
+        </summary>
+        <author>
+            <name>Ulya Trofimovich</name>
+            <email>skvadrik@gmail.com</email>
+        </author>
+    </entry>
+
 </feed>

diff --git a/src/index.rst b/src/index.rst
index 2363ab3d3496b2ba8e7633cf08c71b7fb281eec5..930598d108f5414078077804c34b03e13eea98f9 100644 (file)
--- a/src/index.rst
+++ b/src/index.rst
@@ -48,6 +48,7 @@ Features
 News & updates
 --------------
 
+* `Release 1.1 <news/release_notes/1_1.html>`_
 * `Release 1.0.3 <news/release_notes/1_0_3.html>`_
 * `Release 1.0.2 <news/release_notes/1_0_2.html>`_
 * `Release 1.0.1 <news/release_notes/1_0_1.html>`_

diff --git a/src/install/install.rst b/src/install/install.rst
index 2ae6fab3431ee8b8603de2a255339075978539f9..0c500036f3638587fde19d5eca6af14d4ec84e90 100644 (file)
--- a/src/install/install.rst
+++ b/src/install/install.rst
@@ -13,6 +13,7 @@ You can find other releases `here <https://sourceforge.net/projects/re2c/files/o
 (but be aware that they are hidden for a good reason:
 most of them contain bugs that have been fixed in the next minor release).
 
+* `re2c-1.1.tar.gz <https://github.com/skvadrik/re2c/releases/download/1.1/re2c-1.1.tar.gz>`_
 * `re2c-1.0.3.tar.gz <https://github.com/skvadrik/re2c/releases/download/1.0.3/re2c-1.0.3.tar.gz>`_
 * `re2c-0.16.tar.gz <https://github.com/skvadrik/re2c/releases/download/0.16/re2c-0.16.tar.gz>`_
 * `re2c-0.15.3.tar.gz <https://github.com/skvadrik/re2c/releases/download/0.15.3/re2c-0.15.3.tar.gz>`_

diff --git a/src/news/changelog/1_0.rst b/src/news/changelog/1_0.rst
index a04183f502ff10c511b99918abb0c6d346fd440d..0beedb244fd294b12b69259d09f3f785ebf43f34 100644 (file)
--- a/src/news/changelog/1_0.rst
+++ b/src/news/changelog/1_0.rst
@@ -2,9 +2,16 @@
 1.0x
 ----
 
+1.1 (2018-08-27)
+~~~~~~~~~~~~~~~~~~
+
+.. include:: 1_1_list.rst
+
 1.0.3 (2017-11-08)
 ~~~~~~~~~~~~~~~~~~
 
+.. include:: 1_0_3_list.rst
+
 1.0.2 (2017-08-26)
 ~~~~~~~~~~~~~~~~~~
 

diff --git a/src/news/changelog/1_1_list.rst b/src/news/changelog/1_1_list.rst
new file mode 100644 (file)
index 0000000..43cec26
--- /dev/null
+++ b/src/news/changelog/1_1_list.rst
@@ -0,0 +1,5 @@
+- Replaced Kuklewicz POSIX disambiguation algorithm with Okui algorithm.
+- Optimized GOR1 algorithm (computation of tagged epsilon-closure).
+- Added option ``--conditions`` (an alias for ``-c --start-conditions``).
+- Fixed bug #201 Bugs with option: ``re2c:flags:no-debug-info``.
+- Reworked first part of TDFA paper.

diff --git a/src/news/news.rst b/src/news/news.rst
index 0e46c29b7720c717940906c826d59dafc15d3fc7..eb86655fa1922fc0820eb72cdc40f1b4ae4babd6 100644 (file)
--- a/src/news/news.rst
+++ b/src/news/news.rst
@@ -5,6 +5,7 @@ News
 .. toctree::
     :maxdepth: 1
 
+    Release 1.1 <release_notes/1_1>
     Release 1.0.3 <release_notes/1_0_3>
     Release 1.0.2 <release_notes/1_0_2>
     Release 1.0.1 <release_notes/1_0_1>

diff --git a/src/news/release_notes/1_1.rst b/src/news/release_notes/1_1.rst
new file mode 100644 (file)
index 0000000..0ab8eab
--- /dev/null
+++ b/src/news/release_notes/1_1.rst
@@ -0,0 +1,22 @@
+=============
+Release 1.1
+=============
+
+*by Ulya Trofimovich*
+
+This release doesn't bring in any serious user-visible changes;
+most of the work concentrated on the internal POSIX disambiguation algorithm
+used for submatch extraction with ``--posix-captures`` option.
+The old algorithm, introduced in `release 1.0 <./1_0.html>`_, was based on the work of Chris Kuklewicz
+(outlined on this `haskell wiki page <https://wiki.haskell.org/index.php?title=Regular_expressions/Bounded_space_proposal&oldid=11475>`_
+and formalized in the paper `Tagged Deterministic Finite Automata with Lookahead
+<http://re2c.org/2017_trofimovich_tagged_deterministic_finite_automata_with_lookahead.pdf>`_).
+Kuklewicz algorithm was replaced with a totally different algorithm
+based on the work of Satoshi Okui and Taro Suzuki (described in the paper
+"Disambiguation in Regular Expression Matching via Position Automata with Augmented Transitions", year 2013).
+The main effort in this release was in developing proper theoretical foundations for the new algorithm.
+
+As usual, there has been a couple of bug fixes. The list of changes:
+
+.. include:: ../changelog/1_1_list.rst
+