1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-05-19 09:28:51 +03:00

Merge branch 'ganelson:master' into master

This commit is contained in:
David Kinder 2022-05-17 12:50:12 +01:00 committed by GitHub
commit 305c63adac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 28 additions and 28 deletions

View file

@ -1,6 +1,6 @@
# Inform 7
v10.1.0-beta+6V08 'Krypton' (16 May 2022)
v10.1.0-beta+6V09 'Krypton' (17 May 2022)
## About Inform 7

View file

@ -1,3 +1,3 @@
Prerelease: beta
Build Date: 16 May 2022
Build Number: 6V08
Build Date: 17 May 2022
Build Number: 6V09

View file

@ -167,7 +167,7 @@ void Solution::read_skein_line(text_stream *line, int pass) {
=
void Solution::find_node_ID_in_tag(OUTPUT_STREAM, text_stream *line, char *tag) {
TEMPORARY_TEXT(prototype)
WRITE_TO(prototype, "%c*?<%s nodeId=\"(%c*?)\"%c*", tag);
WRITE_TO(prototype, "%%c*?<%s nodeId=\"(%%c*?)\"%%c*", tag);
wchar_t prototype_Cs[128];
Str::copy_to_wide_string(prototype_Cs, prototype, 128);
match_results mr = Regexp::create_mr();
@ -182,7 +182,7 @@ void Solution::find_node_ID_in_tag(OUTPUT_STREAM, text_stream *line, char *tag)
=
int Solution::find_text_of_tag(OUTPUT_STREAM, text_stream *line, char *tag) {
TEMPORARY_TEXT(prototype)
WRITE_TO(prototype, "%c*?>(%c*?)</%s%c*", tag);
WRITE_TO(prototype, "%%c*?>(%%c*?)</%s%%c*", tag);
match_results mr = Regexp::create_mr();
wchar_t prototype_Cs[128];
Str::copy_to_wide_string(prototype_Cs, prototype, 128);

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -1160,7 +1160,7 @@ Like a scene in a play: a period of time which is usually tied to events in the
</td>
<td>
<span style='color:#808080'>didn't understand error</span>, <span style='color:#808080'>only understood as far as error</span>, <span style='color:#808080'>didn't understand that number error</span>, <span style='color:#808080'>can only do that to something animate error</span>, <span style='color:#808080'>can't see any such thing error</span>, <span style='color:#808080'>said too little error</span>, <span style='color:#808080'>aren't holding that error</span>, <span style='color:#808080'>can't use multiple objects error</span>, <span style='color:#808080'>can only use multiple objects error</span>, <span style='color:#808080'>not sure what it refers to error</span>, <span style='color:#808080'>excepted something not included error</span>, <span style='color:#808080'>not a verb I recognise error</span>, <span style='color:#808080'>not something you need to refer to error</span>, <span style='color:#808080'>can't see it at the moment error</span>, <span style='color:#808080'>didn't understand the way that finished error</span>, <span style='color:#808080'>not enough of those available error</span>, <span style='color:#808080'>nothing to do error</span>, <span style='color:#808080'>noun did not make sense in that context error</span>, <span style='color:#808080'>referred to a determination of scope error</span>, <span style='color:#808080'>I beg your pardon error</span>, <span style='color:#808080'>can't again the addressee error</span>, <span style='color:#808080'>comma can't begin error</span>, <span style='color:#808080'>can't see whom to talk to error</span>, <span style='color:#808080'>can't talk to inanimate things error</span>, <span style='color:#808080'>didn't understand addressee's last name error</span>
<span style='color:#808080'>didn't understand error</span>, <span style='color:#808080'>only understood as far as error</span>, <span style='color:#808080'>didn't understand that number error</span>, <span style='color:#808080'>can only do that to something animate error</span>, <span style='color:#808080'>can't see any such thing error</span>, <span style='color:#808080'>said too little error</span>, <span style='color:#808080'>aren't holding that error</span>, <span style='color:#808080'>can't use multiple objects error</span>, <span style='color:#808080'>can only use multiple objects error</span>, <span style='color:#808080'>not sure what it refers to error</span>, <span style='color:#808080'>excepted something not included error</span>, <span style='color:#808080'>not a verb I recognise error</span>, <span style='color:#808080'>not something you need to refer to error</span>, <span style='color:#808080'>can't see it at the moment error</span>, <span style='color:#808080'>didn't understand the way that finished error</span>, <span style='color:#808080'>not enough of those available error</span>, <span style='color:#808080'>nothing to do error</span>, <span style='color:#808080'>referred to a determination of scope error</span>, <span style='color:#808080'>noun did not make sense in that context error</span>, <span style='color:#808080'>I beg your pardon error</span>, <span style='color:#808080'>can't again the addressee error</span>, <span style='color:#808080'>comma can't begin error</span>, <span style='color:#808080'>can't see whom to talk to error</span>, <span style='color:#808080'>can't talk to inanimate things error</span>, <span style='color:#808080'>didn't understand addressee's last name error</span>
</td>
<td width="8">

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -1127,8 +1127,8 @@ A command parser error is a kind of value. The command parser errors are
didn't understand the way that finished error,
not enough of those available error,
nothing to do error,
noun did not make sense in that context error,
referred to a determination of scope error,
noun did not make sense in that context error,
I beg your pardon error,
can't again the addressee error,
comma can't begin error,

View file

@ -1274,7 +1274,7 @@ result would be the same without the optimisation.
EmitCode::inv(STORE_BIP);
EmitCode::down();
EmitCode::ref_iname(K_number, Hierarchy::find(SAY__N_HL));
CompileValues::to_code_val_of_kind(to_say, K);
CompileValues::to_code_val_of_kind(to_say, NULL);
EmitCode::up();
EmitCode::up();
return;
@ -1289,7 +1289,7 @@ language.
EmitCode::inv(STORE_BIP);
EmitCode::down();
EmitCode::ref_iname(K_number, Hierarchy::find(UNICODE_TEMP_HL));
CompileValues::to_code_val_of_kind(to_say, K);
CompileValues::to_code_val_of_kind(to_say, NULL);
EmitCode::up();
if (TargetVMs::is_16_bit(Task::vm())) {
Produce::inv_assembly(Emit::tree(), I"@print_unicode");

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//,
@ This section simply sets up the module in ways expected by //foundation//,
and contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module:

View file

@ -2,7 +2,7 @@
Setting up the use of this module.
@ This section simoly sets up the module in ways expected by //foundation//, and
@ This section simply sets up the module in ways expected by //foundation//, and
contains no code of interest. The following constant exists only in tools
which use this module: