diff --git a/README.md b/README.md index a1b2c5b1b..87f583b8e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -v10.1.0-beta+6U93 'Krypton' (28 April 2022) +v10.1.0-beta+6U94 'Krypton' (30 April 2022) ## About Inform 7 @@ -23,12 +23,6 @@ Writing and presenting Inform as a literate program was beyond the capabilities of existing LP software, so a new system for LP called Inweb has been spun off from Inform, and that has [its own repository](https://github.com/ganelson/inweb). -__Disclaimer__. Because this is a private repository (until the next public -release of Inform, when it will open), its GitHub pages server cannot be -enabled yet. As a result links marked ★ lead only to raw HTML -source, not to served web pages. They can in the mean time be browsed offline -as static HTML files stored in "docs". - ## Licence and copyright Except as noted, copyright in material in this repository (the "Package") is @@ -136,8 +130,7 @@ trees and hedges."** (Michael Frayn) Inform is not a single program, but an assemblage of programs and resources. Some, including the inform7 compiler itself, are "literate programs", also called "webs". The notation ★ marks these, and links are provided to -their human-readable forms. (This will be enabled when the repository -becomes public: GitHub Pages does not work on private repositories.) +their human-readable forms. ### Source for command-line tools diff --git a/build.txt b/build.txt index d829dee73..3be971aef 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 28 April 2022 -Build Number: 6U93 +Build Date: 30 April 2022 +Build Number: 6U94 diff --git a/inform7/Figures/timings-diagnostics.txt b/inform7/Figures/timings-diagnostics.txt index 7bbcbe4a1..9a94e5653 100644 --- a/inform7/Figures/timings-diagnostics.txt +++ b/inform7/Figures/timings-diagnostics.txt @@ -1,11 +1,11 @@ 100.0% in inform7 run - 71.4% in compilation to Inter - 51.0% in //Sequence::undertake_queued_tasks// - 4.3% in //MajorNodes::pre_pass// - 3.5% in //MajorNodes::pass_1// - 1.8% in //ImperativeDefinitions::assess_all// - 1.8% in //RTPhrasebook::compile_entries// - 1.4% in //RTKindConstructors::compile// + 71.1% in compilation to Inter + 51.4% in //Sequence::undertake_queued_tasks// + 4.2% in //MajorNodes::pre_pass// + 3.2% in //MajorNodes::pass_1// + 1.9% in //ImperativeDefinitions::assess_all// + 1.7% in //RTPhrasebook::compile_entries// + 1.5% in //RTKindConstructors::compile// 1.0% in //Sequence::lint_inter// 0.6% in //MajorNodes::pass_2// 0.6% in //World::stage_V// @@ -13,20 +13,25 @@ 0.4% in //Sequence::undertake_queued_tasks// 0.4% in //Sequence::undertake_queued_tasks// 0.2% in //CompletionModule::compile// - 0.2% in //InferenceSubjects::emit_all// 0.2% in //RTKindConstructors::compile_permissions// - 0.2% in //Task::make_built_in_kind_constructors// - 2.9% not specifically accounted for - 25.8% in running Inter pipeline - 10.2% in step 14/15: generate inform6 -> auto.inf - 5.8% in step 5/15: load-binary-kits - 5.4% in step 6/15: make-synoptic-module - 1.4% in step 9/15: make-identifiers-unique + 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.2% not specifically accounted for + 26.1% in running Inter pipeline + 9.9% in step 14/15: generate inform6 -> auto.inf + 5.8% in step 6/15: make-synoptic-module + 5.7% in step 5/15: load-binary-kits + 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 0.4% in step 7/15: shorten-wiring + 0.3% in step 8/15: detect-indirect-calls 0.2% in step 11/15: eliminate-redundant-labels - 0.2% in step 8/15: detect-indirect-calls - 1.3% not specifically accounted for - 2.2% in supervisor - 0.5% not specifically accounted for + 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.6% not specifically accounted for + 2.3% in supervisor + 0.4% not specifically accounted for diff --git a/inform7/extensions/standard_rules/Sections/Physical World Model.w b/inform7/extensions/standard_rules/Sections/Physical World Model.w index bde873928..20801979c 100644 --- a/inform7/extensions/standard_rules/Sections/Physical World Model.w +++ b/inform7/extensions/standard_rules/Sections/Physical World Model.w @@ -238,7 +238,7 @@ varieties, which is rather a lot, but although some combinations are very rare (edible lit pushable between rooms scenery is not met with often) this flexibility is helpful in mitigating the rigidity of the kinds structure, given that we have single inheritance of kinds. Note that, -except for "lit", these are all really to do whether and how people +except for "lit", these are all really to do with whether and how people can move things around -- even edibility, which is the ability to be removed from the world model entirely. @@ -659,7 +659,7 @@ than HER or IT). There has to be some convention here, and in a case where we don't know our linguistic ground, opting for the least surprising behaviour seems wisest. -The Inform compiler automatically applies the either-or prpperty |animate| +The Inform compiler automatically applies the either-or property |animate| and the valued property |before| to a person, giving that value as just |NULL|. This allows any person to become the protagonist during play (using I6's |ChangePlayer| routine). diff --git a/inform7/extensions/standard_rules/Sections/Variables and Rulebooks.w b/inform7/extensions/standard_rules/Sections/Variables and Rulebooks.w index 15a270de9..9ad518f4d 100644 --- a/inform7/extensions/standard_rules/Sections/Variables and Rulebooks.w +++ b/inform7/extensions/standard_rules/Sections/Variables and Rulebooks.w @@ -639,7 +639,7 @@ conditions like "the black door has been open" by continuously measuring the present to see if the black door is open now, and making a note for future reference if it is. But of course it's impossible for any computer to continuously do anything, and besides, Inform has other calls on it. -What in fact happens is the Inform performs these measurements at "chronology +What in fact happens is that Inform performs these measurements at "chronology points", which are strategic moments during play, and this is one of them. =