AwesomeAdam54321/inweb-bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made icon notation less trigger-happy

Browse source
This commit is contained in:
Graham Nelson 2020-04-14 22:56:16 +01:00
parent 582aa95d57
commit 5670710fac
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Chapter 3/The Indexer.w
View file

@ -648,10 +648,10 @@ navigation purposes.
@<Look for icon text@> = @<Look for icon text@> =
match_results mr = Regexp::create_mr(); match_results mr = Regexp::create_mr();
if (Regexp::match(&mr, item_name, L"<(%c+)> *(%c*)")) { if (Regexp::match(&mr, item_name, L"<(%i+.%i+)> *(%c*)")) {
icon_text = Str::duplicate(mr.exp[0]); icon_text = Str::duplicate(mr.exp[0]);
item_name = Str::duplicate(mr.exp[1]); item_name = Str::duplicate(mr.exp[1]);
} else if (Regexp::match(&mr, item_name, L"(%c*?) *<(%c+)>")) { } else if (Regexp::match(&mr, item_name, L"(%c*?) *<(%i+.%i+)>")) {
icon_text = Str::duplicate(mr.exp[1]); icon_text = Str::duplicate(mr.exp[1]);
item_name = Str::duplicate(mr.exp[0]); item_name = Str::duplicate(mr.exp[0]);
} }

8
Tangled/inweb.c
View file

@ -17476,10 +17476,10 @@ void Indexer__run_engine(text_stream *OUT, index_engine_state *ies) {
{ {
#line 650 "inweb/Chapter 3/The Indexer.w" #line 650 "inweb/Chapter 3/The Indexer.w"
match_results mr = Regexp__create_mr(); match_results mr = Regexp__create_mr();
if (Regexp__match(&mr, item_name, L"<(%c+)> *(%c*)")) { if (Regexp__match(&mr, item_name, L"<(%i+.%i+)> *(%c*)")) {
icon_text = Str__duplicate(mr.exp[0]); icon_text = Str__duplicate(mr.exp[0]);
item_name = Str__duplicate(mr.exp[1]); item_name = Str__duplicate(mr.exp[1]);
} else if (Regexp__match(&mr, item_name, L"(%c*?) *<(%c+)>")) { } else if (Regexp__match(&mr, item_name, L"(%c*?) *<(%i+.%i+)>")) {
icon_text = Str__duplicate(mr.exp[1]); icon_text = Str__duplicate(mr.exp[1]);
item_name = Str__duplicate(mr.exp[0]); item_name = Str__duplicate(mr.exp[0]);
} }
@ -17575,10 +17575,10 @@ void Indexer__run_engine(text_stream *OUT, index_engine_state *ies) {
{ {
#line 650 "inweb/Chapter 3/The Indexer.w" #line 650 "inweb/Chapter 3/The Indexer.w"
match_results mr = Regexp__create_mr(); match_results mr = Regexp__create_mr();
if (Regexp__match(&mr, item_name, L"<(%c+)> *(%c*)")) { if (Regexp__match(&mr, item_name, L"<(%i+.%i+)> *(%c*)")) {
icon_text = Str__duplicate(mr.exp[0]); icon_text = Str__duplicate(mr.exp[0]);
item_name = Str__duplicate(mr.exp[1]); item_name = Str__duplicate(mr.exp[1]);
} else if (Regexp__match(&mr, item_name, L"(%c*?) *<(%c+)>")) { } else if (Regexp__match(&mr, item_name, L"(%c*?) *<(%i+.%i+)>")) {
icon_text = Str__duplicate(mr.exp[1]); icon_text = Str__duplicate(mr.exp[1]);
item_name = Str__duplicate(mr.exp[0]); item_name = Str__duplicate(mr.exp[0]);
} }

4
docs/inweb/3-ti.html
View file

@ -1042,10 +1042,10 @@ navigation purposes.
<pre class="displaydefn"> <pre class="displaydefn">
<span class="reserved">match_results</span><span class="plain"> </span><span class="identifier">mr</span><span class="plain"> = </span><span class="functiontext"><a href="4-pm.html#SP9">Regexp::create_mr</a></span><span class="plain">();</span> <span class="reserved">match_results</span><span class="plain"> </span><span class="identifier">mr</span><span class="plain"> = </span><span class="functiontext"><a href="4-pm.html#SP9">Regexp::create_mr</a></span><span class="plain">();</span>
<span class="reserved">if</span><span class="plain"> (</span><span class="functiontext"><a href="4-pm.html#SP10">Regexp::match</a></span><span class="plain">(&amp;</span><span class="identifier">mr</span><span class="plain">, </span><span class="identifier">item_name</span><span class="plain">, </span><span class="identifier">L</span><span class="string">"&lt;(%c+)&gt; *(%c*)"</span><span class="plain">)) {</span> <span class="reserved">if</span><span class="plain"> (</span><span class="functiontext"><a href="4-pm.html#SP10">Regexp::match</a></span><span class="plain">(&amp;</span><span class="identifier">mr</span><span class="plain">, </span><span class="identifier">item_name</span><span class="plain">, </span><span class="identifier">L</span><span class="string">"&lt;(%i+.%i+)&gt; *(%c*)"</span><span class="plain">)) {</span>
<span class="identifier">icon_text</span><span class="plain"> = </span><span class="functiontext"><a href="4-sm.html#SP3">Str::duplicate</a></span><span class="plain">(</span><span class="identifier">mr</span><span class="plain">.</span><span class="element">exp</span><span class="plain">[0]);</span> <span class="identifier">icon_text</span><span class="plain"> = </span><span class="functiontext"><a href="4-sm.html#SP3">Str::duplicate</a></span><span class="plain">(</span><span class="identifier">mr</span><span class="plain">.</span><span class="element">exp</span><span class="plain">[0]);</span>
<span class="identifier">item_name</span><span class="plain"> = </span><span class="functiontext"><a href="4-sm.html#SP3">Str::duplicate</a></span><span class="plain">(</span><span class="identifier">mr</span><span class="plain">.</span><span class="element">exp</span><span class="plain">[1]);</span> <span class="identifier">item_name</span><span class="plain"> = </span><span class="functiontext"><a href="4-sm.html#SP3">Str::duplicate</a></span><span class="plain">(</span><span class="identifier">mr</span><span class="plain">.</span><span class="element">exp</span><span class="plain">[1]);</span>
<span class="plain">} </span><span class="reserved">else</span><span class="plain"> </span><span class="reserved">if</span><span class="plain"> (</span><span class="functiontext"><a href="4-pm.html#SP10">Regexp::match</a></span><span class="plain">(&amp;</span><span class="identifier">mr</span><span class="plain">, </span><span class="identifier">item_name</span><span class="plain">, </span><span class="identifier">L</span><span class="string">"(%c*?) *&lt;(%c+)&gt;"</span><span class="plain">)) {</span> <span class="plain">} </span><span class="reserved">else</span><span class="plain"> </span><span class="reserved">if</span><span class="plain"> (</span><span class="functiontext"><a href="4-pm.html#SP10">Regexp::match</a></span><span class="plain">(&amp;</span><span class="identifier">mr</span><span class="plain">, </span><span class="identifier">item_name</span><span class="plain">, </span><span class="identifier">L</span><span class="string">"(%c*?) *&lt;(%i+.%i+)&gt;"</span><span class="plain">)) {</span>
<span class="identifier">icon_text</span><span class="plain"> = </span><span class="functiontext"><a href="4-sm.html#SP3">Str::duplicate</a></span><span class="plain">(</span><span class="identifier">mr</span><span class="plain">.</span><span class="element">exp</span><span class="plain">[1]);</span> <span class="identifier">icon_text</span><span class="plain"> = </span><span class="functiontext"><a href="4-sm.html#SP3">Str::duplicate</a></span><span class="plain">(</span><span class="identifier">mr</span><span class="plain">.</span><span class="element">exp</span><span class="plain">[1]);</span>
<span class="identifier">item_name</span><span class="plain"> = </span><span class="functiontext"><a href="4-sm.html#SP3">Str::duplicate</a></span><span class="plain">(</span><span class="identifier">mr</span><span class="plain">.</span><span class="element">exp</span><span class="plain">[0]);</span> <span class="identifier">item_name</span><span class="plain"> = </span><span class="functiontext"><a href="4-sm.html#SP3">Str::duplicate</a></span><span class="plain">(</span><span class="identifier">mr</span><span class="plain">.</span><span class="element">exp</span><span class="plain">[0]);</span>
<span class="plain">}</span> <span class="plain">}</span>