From ac602d5542af09c54c0bb9d073606f00964c7965 Mon Sep 17 00:00:00 2001
From: yhirose <yuji.hirose.bug@gmail.com>
Date: Mon, 18 Jan 2021 17:50:45 -0500
Subject: [PATCH] Fixed more infinite loop grammar problems

---
 docs/native.wasm | Bin 360710 -> 360573 bytes
 peglib.h         |  17 ++++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/docs/native.wasm b/docs/native.wasm
index da74b80af2c37e024754c6abfc9586b0e9334b7a..6d89c3c25b16d7555068a88b95575ba97f3d79db 100644
GIT binary patch
delta 2197
zcmb_d?TZyv7(eHk**kOR<=$Ca*PAc&%;@H9?xup=HCOYVa96`#Obi5zHY%`Lh?4s1
zT@>=G2ziPkgo+k~D3CTNO6ZgSfI>uteF%-!&0Td{ceUS{xmSgRDEe?Y=iE8xInVFq
zdCuF1x);W}KR+7K_csq83yvHM<ixRn-u>~BGY?UvDG#m`YD$hKrBy<4)SU#6i2<@X
z9|8{4$5%z21SVr+WAj#>mUEzAx<LJvpibXNF5yd%B^CYQ1==Pn`qvAzM^+{_UZn5n
zY0qv@gFTi{+6^V+GRxQtq>sTdORK>cvxHc((=UYbh7)U9EZO36hTW7n>}?N)?{f#2
z+0(<5#5@0wa3vK1D(NpKsVgBRHi>{qo!^oQQ5P<zKWyn0VnB%2#lKC`S%CZY5-pLw
zK6{B?@O;&ku@@=!_14QYX#2xSs1IJITGLCM*kvoF0LYx3cB75c1r=?a&axPb0;da{
zWN<RYuFoa)i^$a1AzRUI@LMcDnGsP>0!C7D>$DF4Q!j}DD`hf*2`~wrT;$tPW?ZC~
zPSKWE{enFc<TQwm>NJ9BnsJ4rB5-t6k`bwtQkq!(Vz1rc4y4{M+z?+33{L);a(#M=
zmOOKpU@Z_cf-Mkr7m)KUAP9VKAXXcQQ9S*FHZ{W#o)I}rxCcoEDP;49LIDho(KyU8
zDf>WNg{@rBT~gz-pd;m~Ipr3E+1)bnW)6!F`G61Xt0|GyX)mUgI_<f$br(bN*Qcrb
z_!U}lM_btDKWPg(TsXc?HCzFmIb_1DmPKF6+-%Tp6h&bK88H@v7;dKxZ-6kNKe$3&
zYkbTS-}uE<@{J)V)*^@ef*J?Z7#6sqf4)MSlAJHA;A?Z1^99<fxOZI^F9K)29-OAN
zvZ_a?Y2_}$P9<VgUCRifDBh%S_P++Mf10Khy>0LAzwO<Tzj?Q?Zs{5g=zTL(mZ5%S
zhI*R7+J*=xl=$90&OMB*3$$S6wmCLraTR<RFUJo4M!ol8_-a1)NXb}XBj*DO%h+!R
zE(z<jtr%oO-<qMCZ={QsE`?yBe&8zI-w7EF%aCdZB*QWN+BDT{u;u9&uhM;0mZoIU
z4X|ZhQr4eM6R-C&l)kC?a$fW0qULLvnnSfzTcv_!Q7I0N-9%Kc+^!2x^9&7oh33%7
z(`T;HgUj8N>^eHP85x<u)dds>>H61cbsDz1L7&*Fnok&lQrZwL_SqW>Dfd@mnQp7+
zXK4`aZhVeb$v~gHPVYa8rpScIIZj-H9vJ{}ew_<a@dw%u=rG<xV?&>^6IV5hJ^I!~
zTCCrjrRVj{S$Z6?{Tr0%>`!`Uk&o78LOsXu^+;@?p?1#E@#6j-eQ1t)^xPap#i0#V
z?61?yX7m1-u=%MQw67WDc6ZUsqb$KIH3IN?o3k)MnW4=U_OOun@+?NC$Q6J%!8_A0
zRznU))!tOKw-Qf@9n0_**-g~f?-k`mQ*tPjt!>cG9K(ZzMA$3NH1i|QcI<N1M^)wE
zh&f@JDhMelb8VU_p^mOm<7?RIv_$@)NYgQ{viihHS?B_zo{&ZuWZ!G016Y|UJXEJ~
zX<pEF<c=cpS`+%jq)_9NAiov7qp&ob&UmZS)>Y^o?C5jzv}!$g>@q?j6=MeO`V?mg
z_QxY+x^{5_#2Me8>xeDgw?MUr(MSxdpcfhSMbDa!jC^bWLKw{41RfMj!-fKVV1bm3
Rj+|N`{H%#n3-<2Ae*x%nfqno0

delta 2295
zcma)8U1(fI6rMS=*?afy-OWw9O=7Jucbb}8lGs4YrfD0yBTX9otA+{{ga#C;w{K!!
zM7zO)#V2bYI)Wet6$6Usizz7DM<4p&4^$8zBqGvEnzT*Qw5HT==5DtM_Ms19=I+cn
zbIy0Z^PSw9?0EaFjxSG!bpH17Q{jnIA)h`K()+&;{oG6CIzP6F>3M!c<-3`dQHLr%
z#s(=T-4e>8{&<m9iD5H2Ik_ULv{4q#ix;WCT&&W!T;_2SrmAE<yhwX_$^3bd4)D_S
zj!X1CC6udCO_JnK<!YM81<7Lyc@c|eKSfPqO_ea`=BYCh%9FIO#EM1PA`6nt=qyQf
zpVsZGtn)fTBEoz%OBE$F+sQ&H^vrO=Se5zM{x-aYu|dWf@BBSW7ZCb)m#LG7=E7w<
z6ok5x${^A*G<)V~S1ue?Wpiwfx<XQ33?B)FDlqRXk~~;Qk(rO+0~@>yV!tT!`VW@s
zZ%R@`<G?8U{A7Veo0X@6g#0QE;CF8eu|bhY&w|cmpn<jTqVkddhItx(CCm`9KF$HF
z)+$Y4o20TNTQk4WNlq5$d_sxx``N)<O|~Gue&&~OBK_q4VSIKCj4p=-CVil>DvueL
zhfuj@9-@(l$nwbD&4WyGg?84<C6t}HQxE__6%*7Z94Rs6P&*QrT~0dpY8-(XKA4f$
zQ_Dajv1y$JZ)9Yx{cN#T4L<Ic<?O&MIFO;9XK9rVVoOyzV6PT3?mmNZ&Rn5wcZ*nQ
z6mjUDMFds+RC!hEf)jut%hJQHD~-P9%__Zql^)552{9F#FRoI@I+vP<)NB@6_~w_Z
zv{ShQk>$KQbvYyT2p$L0xE*<iX6rTD$|G~=8f}sRZfX{X&0?~whg3$vjD6$x3>+a^
z@~vwW4PSq);ojjU_a^?&J+rb%yUhLtD)6#-et|aELzJmmyk<f2@-7)^6&W27(Ia`(
zMeIO!DC3w#0)<vkkiFRn_-|XY56jt=tkM#vz$~HjRw263#3X^f@fWG=w?-Q_Kud&)
z7wLhQacK<Nk$Fa$9nC-IFmTNQ?O|wvHV#7cvp%OocY1<lZw%b8w5;t3V0jZQk=NVr
zv;=-x+YuJstRp7mJvu`2(@QiAS!m>)g)`=Ok<eb{SuWv)gldXIL#vQuyGnp$A9iqB
z9s*82>SzX&T+Gb7OVs%ggA(zEX!Nl?y8d_xGM&)&Xnn|yUZRILLV%oCyV@RUdKJ<$
z$Cs$5Q>=FIBm^aMV18Pn-H^)ib?W9tv+X*4@MwUdSgCi_$Vq%+AlR6#%*9Ye`+|=o
zZA+kkY^*BK_3VzheTmkanKya28Cj+wJcDKz=8a`~f(!G*GEKMpm=f0G3s%V{Vj+F=
z-VHk42*b-v==4qMX|p6taP>~VlJ%g>{_E6UftxD5WPKclnn1#<bl431DEiIZ4Qexm
zf2pfpbS>*+Xhf+(*b~klq}I|30syJCNF;FpY1jzecfyNdAQc?;vmRg%;=ZQ4jw;e@
z>_Huj0=$C$r>ui$o{yju_O_iM?siN?go3%}jOs_7jkgci3i_i~?ZGB9NfeEg@><~C
zB-Kox?A24flG+4w2U(nCTO{aXpK)EcMMDM7@Mt||lFV-r$soS$HlcwkO>sMk5sdTP
z;ye#H*Joy#o|<J%=Pj;Z35_Z-^OMF?ASp)F(<{_n2T&DD0fb_iA}gQ5mOxVs!oUtv
z*OEXEY8w680`w6=#nQmbm<0sd7)B>j6xn55=!>4Sg8~ua-Uu#Y=PQ(tNik|cfj9R*
Xgt@XpL%j7w?=8ZgnC`um8$bRZR6Udp

diff --git a/peglib.h b/peglib.h
index 9a4ce33..77b9bbb 100644
--- a/peglib.h
+++ b/peglib.h
@@ -3518,7 +3518,7 @@ private:
     for (auto &x : grammar) {
       auto &rule = x.second;
 
-      ReferenceChecker vis(*data.grammar, rule.params);
+      ReferenceChecker vis(grammar, rule.params);
       rule.accept(vis);
       for (const auto &y : vis.error_s) {
         const auto &name = y.first;
@@ -3536,7 +3536,7 @@ private:
     // Link references
     for (auto &x : grammar) {
       auto &rule = x.second;
-      LinkReferences vis(*data.grammar, rule.params);
+      LinkReferences vis(grammar, rule.params);
       rule.accept(vis);
     }
 
@@ -3561,12 +3561,12 @@ private:
     if (!ret) { return nullptr; }
 
     // Set root definition
-    auto &start_rule = (*data.grammar)[data.start];
+    auto &start_rule = grammar[data.start];
 
     // Check infinite loop
-    {
-      DetectInfiniteLoop vis(data.start_pos, data.start);
-      start_rule.accept(vis);
+    for (auto &[name, rule] : grammar) {
+      DetectInfiniteLoop vis(rule.s_, name);
+      rule.accept(vis);
       if (vis.has_error) {
         if (log) {
           auto line = line_info(s, vis.error_s);
@@ -3586,13 +3586,12 @@ private:
       }
 
       start_rule.whitespaceOpe =
-          wsp((*data.grammar)[WHITESPACE_DEFINITION_NAME].get_core_operator());
+          wsp(grammar[WHITESPACE_DEFINITION_NAME].get_core_operator());
     }
 
     // Word expression
     if (grammar.count(WORD_DEFINITION_NAME)) {
-      start_rule.wordOpe =
-          (*data.grammar)[WORD_DEFINITION_NAME].get_core_operator();
+      start_rule.wordOpe = grammar[WORD_DEFINITION_NAME].get_core_operator();
     }
 
     // Apply instructions