ifhub/inform7
1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-06-26 04:00:43 +03:00
Code Issues Projects Releases Wiki Activity

Minor tidy-up

Browse source
This commit is contained in:
Graham Nelson 2024-04-04 21:53:22 +01:00
parent 6df6574fe0
commit 3860f9ed1c
13 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,6 +1,6 @@
# Inform 7
[Version](notes/versioning.md): 10.2.0-beta+6X39 'Krypton' (3 April 2024)
[Version](notes/versioning.md): 10.2.0-beta+6X40 'Krypton' (4 April 2024)
## About Inform

4
build.txt
View file

@ -1,3 +1,3 @@
Prerelease: beta
Build Date: 3 April 2024
Build Number: 6X39
Build Date: 4 April 2024
Build Number: 6X40

5
docs/WorldModelKit/S-tst.html
View file

@ -75,6 +75,7 @@ moves an object to a new position in the object tree.
<pre class="displayed-code all-displayed-code code-font">
<span class="plain-syntax">[ </span><span class="identifier-syntax">XAbstractSub</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><span class="identifier-syntax">XTestMove</span><span class="plain-syntax">(</span><span class="identifier-syntax">noun</span><span class="plain-syntax">, </span><span class="identifier-syntax">second</span><span class="plain-syntax">)) </span><span class="reserved-syntax">return</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><span class="identifier-syntax">noun</span><span class="plain-syntax"> </span><span class="reserved-syntax">has</span><span class="plain-syntax"> </span><span class="identifier-syntax">worn</span><span class="plain-syntax">) </span><span class="reserved-syntax">give</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax"> ~</span><span class="identifier-syntax">worn</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">move</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax"> </span><span class="reserved-syntax">to</span><span class="plain-syntax"> </span><span class="identifier-syntax">second</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="identifier-syntax">say__p</span><span class="plain-syntax"> = </span><span class="constant-syntax">1</span><span class="plain-syntax">; </span><span class="string-syntax">"[Abstracted.]"</span><span class="plain-syntax">;</span>
<span class="plain-syntax">];</span>
@ -102,6 +103,7 @@ moves an object to a new position in the object tree.
<pre class="displayed-code all-displayed-code code-font">
<span class="plain-syntax">[ </span><span class="identifier-syntax">XBanishSub</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><span class="identifier-syntax">XTestMove</span><span class="plain-syntax">(</span><span class="identifier-syntax">noun</span><span class="plain-syntax">, </span><span class="reserved-syntax">nothing</span><span class="plain-syntax">)) </span><span class="reserved-syntax">return</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">give</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax"> ~</span><span class="identifier-syntax">worn</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">remove</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="identifier-syntax">say__p</span><span class="plain-syntax"> = </span><span class="constant-syntax">1</span><span class="plain-syntax">; </span><span class="string-syntax">"[Banished.]"</span><span class="plain-syntax">;</span>
<span class="plain-syntax">];</span>
@ -120,7 +122,8 @@ moves an object to a new position in the object tree.
<pre class="displayed-code all-displayed-code code-font">
<span class="plain-syntax">[ </span><span class="identifier-syntax">XPurloinSub</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><span class="identifier-syntax">XTestMove</span><span class="plain-syntax">(</span><span class="identifier-syntax">noun</span><span class="plain-syntax">, </span><span class="identifier-syntax">player</span><span class="plain-syntax">)) </span><span class="reserved-syntax">return</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">move</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax"> </span><span class="reserved-syntax">to</span><span class="plain-syntax"> </span><span class="identifier-syntax">player</span><span class="plain-syntax">; </span><span class="reserved-syntax">give</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax"> </span><span class="identifier-syntax">moved</span><span class="plain-syntax">; </span><span class="reserved-syntax">give</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax"> ~</span><span class="identifier-syntax">concealed</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">move</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax"> </span><span class="reserved-syntax">to</span><span class="plain-syntax"> </span><span class="identifier-syntax">player</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="reserved-syntax">give</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax"> </span><span class="identifier-syntax">moved</span><span class="plain-syntax">; </span><span class="reserved-syntax">give</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax"> ~</span><span class="identifier-syntax">concealed</span><span class="plain-syntax">; </span><span class="reserved-syntax">give</span><span class="plain-syntax"> </span><span class="identifier-syntax">noun</span><span class="plain-syntax"> ~</span><span class="identifier-syntax">worn</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="identifier-syntax">say__p</span><span class="plain-syntax"> = </span><span class="constant-syntax">1</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="string-syntax">"[Purloined.]"</span><span class="plain-syntax">;</span>
<span class="plain-syntax">];</span>

6
docs/indoc/M-vai.html
View file

@ -50,7 +50,7 @@
<ul class="crumbs"><li><a href="../index.html">Home</a></li><li><a href="index.html">indoc</a></li><li><a href="index.html#M">Manual</a></li><li><b>Volumes and Instructions</b></li></ul></div>
<p class="purpose">Dual- versus single-volume mode, and how to write instructions files.</p>
<ul class="toc"><li><a href="M-vai.html#SP1">&#167;1. Model</a></li><li><a href="M-vai.html#SP2">&#167;2. Project instructions</a></li><li><a href="M-vai.html#SP3">&#167;3. Durham Core metadata</a></li><li><a href="M-vai.html#SP4">&#167;4. Targets</a></li><li><a href="M-vai.html#SP5">&#167;5. Symbols</a></li><li><a href="M-vai.html#SP6">&#167;6. Other instructions</a></li><li><a href="M-vai.html#SP7">&#167;7. Miscellaneous settings</a></li></ul><hr class="tocbar">
<ul class="toc"><li><a href="M-vai.html#SP1">&#167;1. Model</a></li><li><a href="M-vai.html#SP2">&#167;2. Project instructions</a></li><li><a href="M-vai.html#SP3">&#167;3. Dublin Core metadata</a></li><li><a href="M-vai.html#SP4">&#167;4. Targets</a></li><li><a href="M-vai.html#SP5">&#167;5. Symbols</a></li><li><a href="M-vai.html#SP6">&#167;6. Other instructions</a></li><li><a href="M-vai.html#SP7">&#167;7. Miscellaneous settings</a></li></ul><hr class="tocbar">
<p class="commentary firstcommentary"><a id="SP1" class="paragraph-anchor"></a><b>&#167;1. Model. </b>Conceptually, an Indoc project has either one or two volumes. The source for
each volume is a single UTF-8 encoded plain text file. In the core Inform
@ -149,8 +149,8 @@ such as:
mentioned above.
</p>
<p class="commentary firstcommentary"><a id="SP3" class="paragraph-anchor"></a><b>&#167;3. Durham Core metadata. </b>If the project needs to generate Epub books, then these will need to have
some basic DC ("Durham Core") metadata supplied. For example:
<p class="commentary firstcommentary"><a id="SP3" class="paragraph-anchor"></a><b>&#167;3. Dublin Core metadata. </b>If the project needs to generate Epub books, then these will need to have
some basic DC ("Dublin Core") metadata supplied. For example:
</p>
<pre class="displayed-code all-displayed-code code-font">

14
inform7/Figures/memory-diagnostics.txt
View file

@ -1,6 +1,6 @@
Total memory consumption was 139901K = 137 MB
Total memory consumption was 139903K = 137 MB
---- was used for 2133447 objects, in 375604 frames in 0 x 800K = 0K = 0 MB:
---- was used for 2133449 objects, in 375606 frames in 0 x 800K = 0K = 0 MB:
30.1% inter_tree_node_array 60 x 8192 = 491520 objects, 43255680 bytes
19.4% text_stream_array 4948 x 100 = 494800 objects, 27867136 bytes
@ -36,7 +36,7 @@ Total memory consumption was 139901K = 137 MB
0.3% local_variable_array 49 x 100 = 4900 objects, 471968 bytes
0.2% verb_usage 1148 objects, 394912 bytes
0.2% rule 478 objects, 374752 bytes
0.2% dictionary 7771 objects, 373008 bytes
0.2% dictionary 7773 objects, 373104 bytes
0.2% verb_form 388 objects, 350752 bytes
0.2% noun 2395 objects, 287400 bytes
0.1% compilation_subtask 3390 objects, 271200 bytes
@ -263,10 +263,10 @@ Total memory consumption was 139901K = 137 MB
---- loop_over_scope 1 object, 40 bytes
---- by_function_bp_data 1 object, 40 bytes
99.9% was used for memory not allocated for objects:
100.0% was used for memory not allocated for objects:
62.4% text stream storage 89495152 bytes in 514929 claims
3.8% dictionary storage 5500480 bytes in 7771 claims
62.4% text stream storage 89496608 bytes in 514946 claims
3.8% dictionary storage 5501504 bytes in 7773 claims
---- sorting 2624 bytes in 531 claims
5.0% source text 7200000 bytes in 3 claims
7.5% source text details 10800000 bytes in 2 claims
@ -283,5 +283,5 @@ Total memory consumption was 139901K = 137 MB
---- code generation workspace for objects 3528 bytes in 19 claims
0.2% emitter array storage 289120 bytes in 2069 claims
-136.-7% was overhead - -195890824 bytes = -191299K = -186 MB
-136.-7% was overhead - -195890920 bytes = -191299K = -186 MB

16
inform7/Figures/timings-diagnostics.txt
View file

@ -1,8 +1,8 @@
100.0% in inform7 run
67.8% in compilation to Inter
46.3% in //Sequence::undertake_queued_tasks//
68.0% in compilation to Inter
46.6% in //Sequence::undertake_queued_tasks//
4.2% in //MajorNodes::pre_pass//
3.4% in //MajorNodes::pass_1//
3.5% in //MajorNodes::pass_1//
1.9% in //ImperativeDefinitions::assess_all//
1.5% in //RTKindConstructors::compile//
1.5% in //RTPhrasebook::compile_entries//
@ -13,16 +13,16 @@
0.3% in //Sequence::undertake_queued_tasks//
0.3% in //Sequence::undertake_queued_tasks//
0.3% in //World::stage_V//
5.4% not specifically accounted for
5.0% not specifically accounted for
27.2% in running Inter pipeline
8.8% in step 14/15: generate inform6 -> auto.inf
6.8% in step 5/15: load-binary-kits
6.1% in step 6/15: make-synoptic-module
8.9% in step 14/15: generate inform6 -> auto.inf
7.0% in step 5/15: load-binary-kits
5.8% in step 6/15: make-synoptic-module
1.9% in step 9/15: make-identifiers-unique
0.3% in step 12/15: eliminate-redundant-operations
0.3% in step 4/15: compile-splats
0.3% in step 7/15: shorten-wiring
0.3% in step 8/15: detect-indirect-calls
2.0% not specifically accounted for
4.2% in supervisor
3.8% in supervisor
0.8% not specifically accounted for

2
inform7/Internal/Inter/Architecture16Kit/kit_metadata.json
View file

@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "Architecture16Kit",
"version": "10.2.0-beta+6X39"
"version": "10.2.0-beta+6X40"
},
"compatibility": "16-bit",
"kit-details": {

2
inform7/Internal/Inter/Architecture32Kit/kit_metadata.json
View file

@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "Architecture32Kit",
"version": "10.2.0-beta+6X39"
"version": "10.2.0-beta+6X40"
},
"compatibility": "32-bit",
"kit-details": {

2
inform7/Internal/Inter/BasicInformKit/kit_metadata.json
View file

@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "BasicInformKit",
"version": "10.2.0-beta+6X39"
"version": "10.2.0-beta+6X40"
},
"needs": [ {
"need": {

2
inform7/Internal/Inter/CommandParserKit/kit_metadata.json
View file

@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "CommandParserKit",
"version": "10.2.0-beta+6X39"
"version": "10.2.0-beta+6X40"
},
"needs": [ {
"need": {

2
inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json
View file

@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "EnglishLanguageKit",
"version": "10.2.0-beta+6X39"
"version": "10.2.0-beta+6X40"
},
"needs": [ {
"need": {

6
inform7/Internal/Inter/WorldModelKit/Sections/Tests.i6t
View file

@ -52,7 +52,7 @@ Like ABSTRACT, except that it removes something from play.
=
[ XBanishSub;
if (XTestMove(noun, nothing)) return;
if (noun has worn) give noun ~worn;
give noun ~worn;
remove noun;
say__p = 1; "[Banished.]";
];
@ -71,8 +71,8 @@ To PURLOIN is to acquire something without reference to any rules on accessibili
=
[ XPurloinSub;
if (XTestMove(noun, player)) return;
move noun to player; give noun moved; give noun ~concealed;
if (noun has worn) give noun ~worn;
move noun to player;
give noun moved; give noun ~concealed; give noun ~worn;
say__p = 1;
"[Purloined.]";
];

2
inform7/Internal/Inter/WorldModelKit/kit_metadata.json
View file

@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "WorldModelKit",
"version": "10.2.0-beta+6X39"
"version": "10.2.0-beta+6X40"
},
"needs": [ {
"need": {