Skip to content

Commit

Permalink
Fixes for Jira bugs I7-2319, I7-2316 and I7-2315
Browse files Browse the repository at this point in the history
  • Loading branch information
ganelson committed Apr 21, 2023
1 parent df8bf08 commit e4eaf4a
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 22 deletions.
3 changes: 1 addition & 2 deletions docs/if-module/3-prs.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ <h1><a href="../index.html">
<!--Weave of 'Persons' generated by Inweb-->
<div class="breadcrumbs">
<ul class="crumbs"><li><a href="../index.html">Home</a></li><li><a href="../inform7n.html">Inform7</a></li><li><a href="index.html">if</a></li><li><a href="index.html#3">Chapter 3: Space and Time</a></li><li><b>Persons</b></li></ul></div>
<p class="purpose">A feature giving minimal support for switchable devices.</p>
<p class="purpose">A feature marking instances of person as being "animate".</p>

<p class="commentary firstcommentary"><a id="SP1" class="paragraph-anchor"></a><b>&#167;1. </b>This feature does just one thing: it applies an indicator property to things
of the kind "animate", and a blank "before" property. This used to be
Expand All @@ -74,7 +74,6 @@ <h1><a href="../index.html">
<span class="reserved-syntax">int</span><span class="plain-syntax"> </span><span class="function-syntax">PL::Persons::IF_complete_model</span><span class="plain-syntax">(</span><span class="reserved-syntax">int</span><span class="plain-syntax"> </span><span class="identifier-syntax">stage</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">stage</span><span class="plain-syntax"> == </span><span class="identifier-syntax">WORLD_STAGE_III</span><span class="plain-syntax">) &amp;&amp; (</span><span class="identifier-syntax">K_person</span><span class="plain-syntax">)) {</span>
<span class="plain-syntax"> </span><span class="identifier-syntax">property</span><span class="plain-syntax"> *</span><span class="identifier-syntax">P_animate</span><span class="plain-syntax"> = </span><span class="identifier-syntax">EitherOrProperties::new_nameless</span><span class="plain-syntax">(</span><span class="identifier-syntax">I</span><span class="string-syntax">"animate"</span><span class="plain-syntax">);</span>
<span class="comment-syntax"> RTProperties::recommend_storing_as_attribute(P_animate, TRUE);</span>
<span class="plain-syntax"> </span><span class="identifier-syntax">property</span><span class="plain-syntax"> *</span><span class="identifier-syntax">P_before</span><span class="plain-syntax"> = </span><span class="identifier-syntax">ValueProperties::new_nameless</span><span class="plain-syntax">(</span><span class="identifier-syntax">I</span><span class="string-syntax">"before"</span><span class="plain-syntax">, </span><span class="identifier-syntax">K_value</span><span class="plain-syntax">);</span>
<span class="plain-syntax"> </span><span class="identifier-syntax">instance</span><span class="plain-syntax"> *</span><span class="identifier-syntax">I</span><span class="plain-syntax">;</span>
<span class="plain-syntax"> </span><span class="identifier-syntax">LOOP_OVER_INSTANCES</span><span class="plain-syntax">(</span><span class="identifier-syntax">I</span><span class="plain-syntax">, </span><span class="identifier-syntax">K_object</span><span class="plain-syntax">)</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/if-module/4-apc.html
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ <h1><a href="../index.html">
it can be used.
</p>

<p class="commentary">First, the following is for action patterns like "an actor taking the medallion".
<p class="commentary">First, the following is for action patterns like "someone taking the medallion".
Here the requirement on the actor is not \({\it person}(c_a)\) but instead forces
\(c_a\) not to be the player. The principled thing might be to set the <span class="extract"><span class="extract-syntax">clause_spec</span></span>
to the proposition \({\it person}(c_a)\land c_a\neq {\it player}\), but that would
Expand Down
2 changes: 0 additions & 2 deletions docs/if-module/4-pc.html
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,6 @@ <h1><a href="../index.html">
<ul class="endnotetexts"><li>This code is used in <a href="4-pc.html#SP1_1">&#167;1.1</a>.</li></ul>
<p class="commentary firstcommentary"><a id="SP1_1_2" class="paragraph-anchor"></a><b>&#167;1.1.2. </b>The "operands" of an action pattern are the nouns to which it applies: for
example, in "Kevin taking or dropping something", the operand is "something".
We treat words like "something" specially to avoid them being read as
"some thing" and thus forcing the kind of the operand to be "thing".
</p>

<pre class="Preform-displayed-code all-displayed-code code-font">
Expand Down
2 changes: 1 addition & 1 deletion docs/if-module/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h1><a href="../index.html">
<li>
<p class="sectionentry"><a href="3-prs.html">
<spon class="sectiontitle">Persons</span></a> -
<span class="sectionpurpose">A feature giving minimal support for switchable devices.</span></p>
<span class="sectionpurpose">A feature marking instances of person as being "animate".</span></p>
</li>
<li>
<p class="sectionentry"><a href="3-tp.html">
Expand Down
20 changes: 10 additions & 10 deletions inform7/Figures/timings-diagnostics.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
100.0% in inform7 run
69.8% in compilation to Inter
49.4% in //Sequence::undertake_queued_tasks//
4.7% in //MajorNodes::pre_pass//
3.2% in //MajorNodes::pass_1//
70.4% in compilation to Inter
49.7% in //Sequence::undertake_queued_tasks//
4.9% in //MajorNodes::pre_pass//
3.5% in //MajorNodes::pass_1//
1.8% in //ImperativeDefinitions::assess_all//
1.6% in //RTPhrasebook::compile_entries//
1.4% in //RTKindConstructors::compile//
1.4% in //RTPhrasebook::compile_entries//
1.0% in //Sequence::lint_inter//
0.6% in //MajorNodes::pass_2//
0.6% 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.4% in //World::stage_V//
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//
3.3% not specifically accounted for
26.5% in running Inter pipeline
10.3% in step 14/15: generate inform6 -> auto.inf
3.1% not specifically accounted for
26.0% in running Inter pipeline
9.9% in step 14/15: generate inform6 -> auto.inf
5.7% in step 5/15: load-binary-kits
5.3% in step 6/15: make-synoptic-module
1.8% in step 9/15: make-identifiers-unique
Expand All @@ -27,6 +27,6 @@
0.4% in step 7/15: shorten-wiring
0.2% in step 11/15: eliminate-redundant-labels
0.2% in step 8/15: detect-indirect-calls
1.6% not specifically accounted for
1.5% not specifically accounted for
3.0% in supervisor
0.5% not specifically accounted for
3 changes: 1 addition & 2 deletions inform7/if-module/Chapter 3/Persons.w
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[PL::Persons::] Persons.

A feature giving minimal support for switchable devices.
A feature marking instances of person as being "animate".

@ This feature does just one thing: it applies an indicator property to things
of the kind "animate", and a blank "before" property. This used to be
Expand All @@ -16,7 +16,6 @@ void PL::Persons::start(void) {
int PL::Persons::IF_complete_model(int stage) {
if ((stage == WORLD_STAGE_III) && (K_person)) {
property *P_animate = EitherOrProperties::new_nameless(I"animate");
// RTProperties::recommend_storing_as_attribute(P_animate, TRUE);
property *P_before = ValueProperties::new_nameless(I"before", K_value);
instance *I;
LOOP_OVER_INSTANCES(I, K_object)
Expand Down
2 changes: 1 addition & 1 deletion inform7/if-module/Chapter 4/Action Pattern Clauses.w
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ void APClauses::write(OUTPUT_STREAM, action_pattern *ap) {
Two options are used with the actor clause (only), reflecting the unusual ways
it can be used.

First, the following is for action patterns like "an actor taking the medallion".
First, the following is for action patterns like "someone taking the medallion".
Here the requirement on the actor is not ${\it person}(c_a)$ but instead forces
$c_a$ not to be the player. The principled thing might be to set the |clause_spec|
to the proposition ${\it person}(c_a)\land c_a\neq {\it player}$, but that would
Expand Down
2 changes: 0 additions & 2 deletions inform7/if-module/Chapter 4/Parse Clauses.w
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ we are allowed to write a text literal instead, and it is automatically converte

@ The "operands" of an action pattern are the nouns to which it applies: for
example, in "Kevin taking or dropping something", the operand is "something".
We treat words like "something" specially to avoid them being read as
"some thing" and thus forcing the kind of the operand to be "thing".

=
<action-operand> ::=
Expand Down
2 changes: 1 addition & 1 deletion notes/release/pending.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ These will be added to release notes when the release is made.
- Fix for a "very old quirk of I7 where it generates a `story.gblorb.js` file for
the interpreter website, but the filename is a lie. It's the base64-encoding
of the `story.ulx` file, not the `story.gblorb`." (Andrew Plotkin, not from Jira)
- Cosmetic fixes not worth linking to (I7-2270, I7-2268, I7-2221)
- Cosmetic fixes not worth linking to (I7-2319, I7-2316, I7-2315, I7-2270, I7-2268, I7-2221)

## Note about intest

Expand Down

0 comments on commit e4eaf4a

Please sign in to comment.