From 4a6c65d0117815d1611ba5ffb2c736d719f8d6dc Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Sun, 10 Apr 2022 09:55:29 +0100 Subject: [PATCH] Fix for Mantis bug 1999 --- inform7/Figures/memory-diagnostics.txt | 2 +- inform7/Figures/timings-diagnostics.txt | 17 ++++++++--------- .../Inter/WorldModelKit/Sections/WorldModel.i6t | 6 ++++-- inform7/Tests/Test Makes/Eg4-C/textual.txt | 6 +++--- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/inform7/Figures/memory-diagnostics.txt b/inform7/Figures/memory-diagnostics.txt index 8b856c6280..88834ad421 100644 --- a/inform7/Figures/memory-diagnostics.txt +++ b/inform7/Figures/memory-diagnostics.txt @@ -237,7 +237,7 @@ Total memory consumption was 126307K = 123 MB 100.0% was used for memory not allocated for objects: - 59.2% text stream storage 76625636 bytes in 452193 claims + 59.2% text stream storage 76625748 bytes in 452194 claims 3.5% dictionary storage 4544512 bytes in 6619 claims ---- sorting 744 bytes in 3 claims 5.5% source text 7200000 bytes in 3 claims diff --git a/inform7/Figures/timings-diagnostics.txt b/inform7/Figures/timings-diagnostics.txt index bb965b6026..d91f0e2cb1 100644 --- a/inform7/Figures/timings-diagnostics.txt +++ b/inform7/Figures/timings-diagnostics.txt @@ -1,6 +1,6 @@ 100.0% in inform7 run 68.1% in compilation to Inter - 47.7% in //Sequence::undertake_queued_tasks// + 47.8% in //Sequence::undertake_queued_tasks// 4.5% in //MajorNodes::pre_pass// 3.2% in //MajorNodes::pass_1// 2.3% in //RTPhrasebook::compile_entries// @@ -8,21 +8,20 @@ 1.5% in //RTKindConstructors::compile// 1.0% in //Sequence::lint_inter// 0.5% in //MajorNodes::pass_2// + 0.5% in //Sequence::undertake_queued_tasks// 0.5% in //World::stage_V// 0.4% in //ImperativeDefinitions::compile_first_block// 0.4% in //Sequence::undertake_queued_tasks// - 0.4% in //Sequence::undertake_queued_tasks// 0.2% in //CompletionModule::compile// 0.2% in //RTKindConstructors::compile_permissions// 0.1% in //InferenceSubjects::emit_all// 0.1% in //Task::make_built_in_kind_constructors// - 0.1% in //Understand::traverse// 0.1% in //World::stages_II_and_III// 2.1% not specifically accounted for - 29.2% in running Inter pipeline - 10.2% in step 14/15: generate inform6 -> auto.inf - 7.6% in step 5/15: load-binary-kits - 6.8% in step 6/15: make-synoptic-module + 29.3% in running Inter pipeline + 10.0% in step 14/15: generate inform6 -> auto.inf + 8.3% in step 5/15: load-binary-kits + 6.5% in step 6/15: make-synoptic-module 1.5% in step 9/15: make-identifiers-unique 0.4% in step 12/15: eliminate-redundant-operations 0.4% in step 4/15: compile-splats @@ -32,6 +31,6 @@ 0.1% in step 10/15: reconcile-verbs 0.1% in step 2/15: parse-insertions 0.1% in step 3/15: resolve-conditional-compilation - 0.7% not specifically accounted for + 0.5% not specifically accounted for 2.2% in supervisor - 0.4% not specifically accounted for + 0.3% not specifically accounted for diff --git a/inform7/Internal/Inter/WorldModelKit/Sections/WorldModel.i6t b/inform7/Internal/Inter/WorldModelKit/Sections/WorldModel.i6t index 25a308f697..c5bc39cf78 100644 --- a/inform7/Internal/Inter/WorldModelKit/Sections/WorldModel.i6t +++ b/inform7/Internal/Inter/WorldModelKit/Sections/WorldModel.i6t @@ -770,8 +770,10 @@ which cannot be asserted true or false. = [ TestConcealment A B; if (A ofclass K2_thing && B ofclass K2_thing) { - particular_possession = B; - if (CarryOutActivity(DECIDING_CONCEALED_POSSESS_ACT, A)) rtrue; + if (IndirectlyContains(A, B)) { + particular_possession = B; + if (CarryOutActivity(DECIDING_CONCEALED_POSSESS_ACT, A)) rtrue; + } } rfalse; ]; diff --git a/inform7/Tests/Test Makes/Eg4-C/textual.txt b/inform7/Tests/Test Makes/Eg4-C/textual.txt index e06268d6a1..2063d06bd4 100644 --- a/inform7/Tests/Test Makes/Eg4-C/textual.txt +++ b/inform7/Tests/Test Makes/Eg4-C/textual.txt @@ -27753,7 +27753,7 @@ package main _plain constant (int32) KIT_CONFIGURATION_BITMAP = 0 constant (int32) KIT_CONFIGURATION_LOOKMODE = 2 constant (text) I7_VERSION_NUMBER = "10.1.0" - constant (text) I7_FULL_VERSION_NUMBER = "10.1.0-alpha.1+6U78" + constant (text) I7_FULL_VERSION_NUMBER = "10.1.0-alpha.1+6U79" constant (text) ^virtual_machine = "C/32d/v1/no-main" constant (text) ^virtual_machine_icon = "vm_glulx.png" constant (text) ^language_elements_used = "core, naming, instance counting, glulx external files" @@ -79177,7 +79177,7 @@ package main _plain val rv inv !return inv /main/BasicInformKit/functions/RunTimeProblem_fn/RunTimeProblem - val /main/BasicInformKit/constants/RTP_CANTABANDON_con/RTP_CANTABANDON + val /main/BasicInformKit/constants/RTP_CANTEND_con/RTP_CANTEND package AbandonActivity_fn _function package AbandonActivity _code local A @@ -79206,7 +79206,7 @@ package main _plain val 1 inv !return inv /main/BasicInformKit/functions/RunTimeProblem_fn/RunTimeProblem - val /main/BasicInformKit/constants/RTP_CANTEND_con/RTP_CANTEND + val /main/BasicInformKit/constants/RTP_CANTABANDON_con/RTP_CANTABANDON package arrays _submodule package StorageForShortName_arr _plain constant (list of unchecked) StorageForShortName = bounded list of 250 bytes __assimilated