Paper: made example about parse trees consistent with its description.

diff --git a/re2c/doc/tdfa_v2/img/mark_enum.tex b/re2c/doc/tdfa_v2/img/mark_enum.tex
index a42f93f7c1e61f34d0e3aaf30f0303dee3cbefe9..90564cd1fee7e0f7e98317ca67a92e052b3fdd5f 100644 (file)
--- a/re2c/doc/tdfa_v2/img/mark_enum.tex
+++ b/re2c/doc/tdfa_v2/img/mark_enum.tex
@@ -25,8 +25,8 @@
 \begin{scope}[xshift=0.5in, yshift=0in]
     \node (a) {\small{
     $\begin{aligned}
-        & mark (((\epsilon|a^{0,\infty})(\epsilon|a)^{0,\infty} ))) = \big[ \\
-        & \quad mark ( (\epsilon|a^{0,\infty})(\epsilon|a)^{0,\infty} ) ) = \big[ \\
+        & mark (((\epsilon|a^{0,\infty})(a|\epsilon)^{0,3} ))) = \big[ \\
+        & \quad mark ( (\epsilon|a^{0,\infty})(a|\epsilon)^{0,3} ) ) = \big[ \\
         %
         & \quad\quad mark ( (\epsilon|a^{0,\infty}) ) = \big[ \\
         & \quad\quad mark ( \epsilon|a^{0,\infty} ) = \big[ \\
@@ -37,22 +37,22 @@
         & \quad\quad\quad \big] = (0,0,(0,0,\epsilon) \mid (0,0,(0,0,a)^{0,\infty})) \\
         & \quad\quad \big] = (1,1,(0,0,\epsilon)|(0,0,(0,0,a)^{0,\infty})) \\
         %
-        & \quad\quad mark ( (\epsilon|a)^{0,\infty} ) = \big[ \\
-        & \quad\quad\quad mark ( (\epsilon|a) ) = \big[ \\
-        & \quad\quad\quad\quad mark ( \epsilon|a ) = \big [ \\
-        & \quad\quad\quad\quad\quad mark ( \epsilon ) = (0,0,\epsilon) \\
+        & \quad\quad mark ( (a|\epsilon)^{0,3} ) = \big[ \\
+        & \quad\quad\quad mark ( (a|\epsilon) ) = \big[ \\
+        & \quad\quad\quad\quad mark ( a|\epsilon ) = \big [ \\
         & \quad\quad\quad\quad\quad mark ( a ) = (0,0,a) \\
-        & \quad\quad\quad\quad \big] = (0,0,(0,0,\epsilon)|(0,0,a)) \\
-        & \quad\quad\quad \big] = (1,1,(0,0,\epsilon) \mid (0,0,a)) \\
-        & \quad\quad \big] = (1,0,(1,1,(0,0,\epsilon) \mid (0,0,a))^{0,\infty}) \\
+        & \quad\quad\quad\quad\quad mark ( \epsilon ) = (0,0,\epsilon) \\
+        & \quad\quad\quad\quad \big] = (0,0,(0,0,a) \mid (0,0,\epsilon)) \\
+        & \quad\quad\quad \big] = (1,1,(0,0,a) \mid (0,0,\epsilon)) \\
+        & \quad\quad \big] = (1,0,(1,1,(0,0,a) \mid (0,0,\epsilon))^{0,3}) \\
         %
         & \quad\big] = (1,0,
            (1,1,(0,0,\epsilon) \mid (0,0,(0,0,a)^{0,\infty})) \\
-           & \quad\quad\quad\quad \cdot (1,0,(1,1,(0,0,\epsilon) \mid (0,0,a))^{0,\infty})
+           & \quad\quad\quad\quad \cdot (1,0,(1,1,(0,0,a) \mid (0,0,\epsilon))^{0,3})
            ) \\
         & \big] = (1,1,
            (1,1,(0,0,\epsilon) \mid (0,0,(0,0,a)^{0,\infty})) \\
-           & \quad\quad\quad \cdot (1,0,(1,1,(0,0,\epsilon) \mid (0,0,a))^{0,\infty})
+           & \quad\quad\quad \cdot (1,0,(1,1,(0,0,a) \mid (0,0,\epsilon))^{0,3})
            )
     \end{aligned}$
     }};
@@ -63,7 +63,7 @@
     $\begin{aligned}
         & enum (1,1,(1,1,
             (1,1,(0,0,\epsilon) \mid (0,0,(0,0,a)^{0,\infty})) \\
-            & \quad\quad\quad\quad\quad \cdot (1,0,(1,1,(0,0,\epsilon) \mid (0,0,a))^{0,\infty}))) = \big[ \\
+            & \quad\quad\quad\quad\quad \cdot (1,0,(1,1,(0,0,a) \mid (0,0,\epsilon))^{0,3}))) = \big[ \\
         & \quad enum (2,2,(1,1,(0,0,\epsilon) \mid (0,0,(0,0,a)^{0,\infty}))) = \big[ \\
         & \quad\quad enum (3,3,(0,0,\epsilon)) = (3,3,(0,0,\epsilon)) \\
         & \quad\quad enum (3,3,(0,0,(0,0,a)^{0,\infty})) = \big[ \\
@@ -71,41 +71,28 @@
         & \quad\quad \big] = (3,3,(0,0,(0,0,a)^{0,\infty})) \\
         & \quad \big] = (3,3,(2,2,(0,0,\epsilon) \mid (0,0,(0,0,a)^{0,\infty}))) \\
         %
-        & \quad enum (3,3, (1,0,(1,1,(0,0,\epsilon) \mid (0,0,a))^{0,\infty}) ) = \big[ \\
-        & \quad\quad enum (4,3, (1,1,(0,0,\epsilon) \mid (0,0,a)) ) = \big[ \\
-        & \quad\quad\quad enum (5,4, (0,0,\epsilon) ) = (0,0,\epsilon) \\
+        & \quad enum (3,3, (1,0,(1,1,(0,0,a) \mid (0,0,\epsilon))^{0,3}) ) = \big[ \\
+        & \quad\quad enum (4,3, (1,1,(0,0,a) \mid (0,0,\epsilon)) ) = \big[ \\
         & \quad\quad\quad enum (5,4, (0,0,a) ) = (0,0,a) \\
-        & \quad\quad \big] = (5,4,(4,3,(0,0,\epsilon) \mid (0,0,a))) \\
-        & \quad \big] = (5,4,(3,0,(4,3,(0,0,\epsilon) \mid (0,0,a))^{0,\infty})) \\
+        & \quad\quad\quad enum (5,4, (0,0,\epsilon) ) = (0,0,\epsilon) \\
+        & \quad\quad \big] = (5,4,(4,3,(0,0,a) \mid (0,0,\epsilon))) \\
+        & \quad \big] = (5,4,(3,0,(4,3,(0,0,a) \mid (0,0,\epsilon))^{0,3})) \\
         %
         & \big] = (5,4,(1,1,
             (2,2,(0,0,\epsilon) \mid (0,0,(0,0,a)^{0,\infty})) \\
-            & \quad\quad\quad\quad\quad \cdot (3,0,(4,3,(0,0,\epsilon) \mid (0,0,a))^{0,\infty})
+            & \quad\quad\quad\quad\quad \cdot (3,0,(4,3,(0,0,a) \mid (0,0,\epsilon))^{0,3})
             )) \\
         \\
         \\
-        & \IRE ((\epsilon|a^{0,\infty})(\epsilon|a)^{0,\infty} )) = \\
+        & \IRE ((\epsilon|a^{0,\infty})(a|\epsilon)^{0,3} )) = \\
         & \quad\quad\quad = (1,1, (2,2,(0,0,\epsilon) \mid (0,0,(0,0,a)^{0,\infty})) \\
-            & \quad\quad\quad\quad\quad\quad \cdot (3,0,(4,3,(0,0,\epsilon) \mid (0,0,a))^{0,\infty}))
+            & \quad\quad\quad\quad\quad\quad \cdot (3,0,(4,3,(0,0,a) \mid (0,0,\epsilon))^{0,3}))
         \\
         \\
         \end{aligned}$
     }};
 \end{scope}
 
-\iffalse
-\begin{scope}[xshift=4in, yshift=-2in]
-    \node[draw=none]
-    {\small{
-    $\begin{aligned}
-    & \IRE ((\epsilon|a^{0,\infty})(\epsilon|a)^{0,\infty} )) = \\
-    & \quad\quad\quad = (1,1, (2,2,(0,0,\epsilon) \mid (0,0,(0,0,a)^{0,\infty})) \\
-        & \quad\quad\quad\quad\quad\quad \cdot (3,0,(4,3,(0,0,\epsilon) \mid (0,0,a))^{0,\infty}))
-    \end{aligned}$
-    }};
-\end{scope}
-\fi
-
 \begin{scope}[xshift=2.5in, yshift=-2.4in]
     \graph [tree layout, grow=down, fresh nodes] {
         "${(1, 1, \cdot)}_{\Lambda}$" -- {
@@ -115,7 +102,7 @@
                     "${(0, 0, a)}_{1.2.1}$"[draw=none]
                 }
             },
-            "${(3, 0, \{0,\infty\})}_{2}$" -- {
+            "${(3, 0, \{0,3\})}_{2}$" -- {
                 "${(4, 3, |)}_{2.1}$" -- {
                     "${(0, 0, a)}_{2.1.1}$"[draw=none],
                     "${(0, 0, \epsilon)}_{2.1.2}$"[draw=none]

diff --git a/re2c/doc/tdfa_v2/part_1_tnfa.tex b/re2c/doc/tdfa_v2/part_1_tnfa.tex
index 0267272f7f64b9e7bca90d48cb4b20568959b43c..9bb9f5587faed3a86a6df0e627449b27a168ea7a 100644 (file)
--- a/re2c/doc/tdfa_v2/part_1_tnfa.tex
+++ b/re2c/doc/tdfa_v2/part_1_tnfa.tex
@@ -475,7 +475,7 @@ Therefore RE and IRE are equivalent representations.
 \begin{figure}\label{fig_mark_enum}
 \includegraphics[width=\linewidth]{img/mark_enum.pdf}
 \caption{
-An example of constructing IRE for RE $(\epsilon|a^{0,\infty})(\epsilon|a)^{0,\infty} )$ using $mark$ and $enum$\\
+An example of constructing IRE for RE $(\epsilon|a^{0,\infty})(a|\epsilon)^{0,3} )$ using $mark$ and $enum$\\
 and some examples of IPT for the resulting IRE.
 }
 \end{figure}