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

Fix for bug in locale string-writing

Browse source
This commit is contained in:
Graham Nelson 2022-05-01 16:58:44 +01:00
parent 17aa1c34b7
commit 3532dcafa6
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,6 +1,6 @@
# Inweb 7.1.0
v7.1.0-beta+1A98 'Escape to Danger' (30 April 2022)
v7.1.0-beta+1A99 'Escape to Danger' (1 May 2022)
## About Inweb

4
Tangled/inweb.c
View file

@ -7123,9 +7123,9 @@ void Streams__write_as_locale_string(char *C_string, text_stream *stream, int bu
}
void Streams__write_locale_string(text_stream *stream, char *C_string) {
if (Locales__get(SHELL_LOCALE) == FILE_ENCODING_ISO_STRF)
if (Locales__get(SHELL_LOCALE) == FILE_ENCODING_UTF8_STRF)
Streams__write_UTF8_string(stream, C_string);
else if (Locales__get(SHELL_LOCALE) == FILE_ENCODING_UTF8_STRF)
else if (Locales__get(SHELL_LOCALE) == FILE_ENCODING_ISO_STRF)
Streams__write_ISO_string(stream, C_string);
else Errors__fatal("unknown command line locale");
}

4
build.txt
View file

@ -1,3 +1,3 @@
Prerelease: beta
Build Date: 30 April 2022
Build Number: 1A98
Build Date: 1 May 2022
Build Number: 1A99

4
docs/foundation-module/2-str.html
View file

@ -700,9 +700,9 @@ ISO string:
<span class="plain-syntax">}</span>
<span class="reserved-syntax">void</span><span class="plain-syntax"> </span><span class="function-syntax">Streams::write_locale_string</span><button class="popup" onclick="togglePopup('usagePopup24')"><span class="comment-syntax">?</span><span class="popuptext" id="usagePopup24">Usage of <span class="code-font"><span class="function-syntax">Streams::write_locale_string</span></span>:<br/>Command Line Arguments - <a href="3-cla.html#SP8">&#167;8</a><br/>Directories - <a href="3-drc.html#SP2">&#167;2</a></span></button><span class="plain-syntax">(</span><span class="reserved-syntax">text_stream</span><span class="plain-syntax"> *</span><span class="identifier-syntax">stream</span><span class="plain-syntax">, </span><span class="reserved-syntax">char</span><span class="plain-syntax"> *</span><span class="identifier-syntax">C_string</span><span class="plain-syntax">) {</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><a href="2-lcl.html#SP2" class="function-link"><span class="function-syntax">Locales::get</span></a><span class="plain-syntax">(</span><span class="constant-syntax">SHELL_LOCALE</span><span class="plain-syntax">) == </span><span class="constant-syntax">FILE_ENCODING_ISO_STRF</span><span class="plain-syntax">)</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><a href="2-lcl.html#SP2" class="function-link"><span class="function-syntax">Locales::get</span></a><span class="plain-syntax">(</span><span class="constant-syntax">SHELL_LOCALE</span><span class="plain-syntax">) == </span><span class="constant-syntax">FILE_ENCODING_UTF8_STRF</span><span class="plain-syntax">)</span>
<span class="plain-syntax"> </span><a href="2-str.html#SP28_2" class="function-link"><span class="function-syntax">Streams::write_UTF8_string</span></a><span class="plain-syntax">(</span><span class="identifier-syntax">stream</span><span class="plain-syntax">, </span><span class="identifier-syntax">C_string</span><span class="plain-syntax">);</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">else</span><span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><a href="2-lcl.html#SP2" class="function-link"><span class="function-syntax">Locales::get</span></a><span class="plain-syntax">(</span><span class="constant-syntax">SHELL_LOCALE</span><span class="plain-syntax">) == </span><span class="constant-syntax">FILE_ENCODING_UTF8_STRF</span><span class="plain-syntax">)</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">else</span><span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><a href="2-lcl.html#SP2" class="function-link"><span class="function-syntax">Locales::get</span></a><span class="plain-syntax">(</span><span class="constant-syntax">SHELL_LOCALE</span><span class="plain-syntax">) == </span><span class="constant-syntax">FILE_ENCODING_ISO_STRF</span><span class="plain-syntax">)</span>
<span class="plain-syntax"> </span><a href="2-str.html#SP28_1" class="function-link"><span class="function-syntax">Streams::write_ISO_string</span></a><span class="plain-syntax">(</span><span class="identifier-syntax">stream</span><span class="plain-syntax">, </span><span class="identifier-syntax">C_string</span><span class="plain-syntax">);</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">else</span><span class="plain-syntax"> </span><a href="3-em.html#SP2" class="function-link"><span class="function-syntax">Errors::fatal</span></a><span class="plain-syntax">(</span><span class="string-syntax">"unknown command line locale"</span><span class="plain-syntax">);</span>
<span class="plain-syntax">}</span>

BIN
docs/goldbach/goldbach.pdf
View file

Binary file not shown.

4
foundation-module/Chapter 2/Streams.w
View file

@ -614,9 +614,9 @@ void Streams::write_as_locale_string(char *C_string, text_stream *stream, int bu
}
void Streams::write_locale_string(text_stream *stream, char *C_string) {
if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_ISO_STRF)
if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_UTF8_STRF)
Streams::write_UTF8_string(stream, C_string);
else if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_UTF8_STRF)
else if (Locales::get(SHELL_LOCALE) == FILE_ENCODING_ISO_STRF)
Streams::write_ISO_string(stream, C_string);
else Errors::fatal("unknown command line locale");
}