Fixed minor bug in makefile and in very first rule code

README.md

@@ -1,6 +1,6 @@
 # Inform 7
 
-[Version](notes/versioning.md): 10.2.0-beta+6X81 'Krypton' (14 November 2024)
+[Version](notes/versioning.md): 10.2.0-beta+6X82 'Krypton' (17 November 2024)
 
 ## About Inform
 

build.txt

@@ -1,3 +1,3 @@
 Prerelease: beta
-Build Date: 14 November 2024
-Build Number: 6X81
+Build Date: 17 November 2024
+Build Number: 6X82

docs/Architecture32Kit/S-io.html

@@ -76,8 +76,10 @@ <h1><a href="../index.html">
 <span class="reserved-syntax">Constant</span><span class="plain-syntax"> </span><span class="identifier-syntax">GG_QUOTEWIN_ROCK</span><span class="plain-syntax">       </span><span class="constant-syntax">203</span><span class="plain-syntax">;</span>
 <span class="reserved-syntax">Constant</span><span class="plain-syntax"> </span><span class="identifier-syntax">GG_SAVESTR_ROCK</span><span class="plain-syntax">        </span><span class="constant-syntax">301</span><span class="plain-syntax">;</span>
 <span class="reserved-syntax">Constant</span><span class="plain-syntax"> </span><span class="identifier-syntax">GG_SCRIPTSTR_ROCK</span><span class="plain-syntax">      </span><span class="constant-syntax">302</span><span class="plain-syntax">;</span>
+<span class="plain-syntax">#</span><span class="identifier-syntax">Ifdef</span><span class="plain-syntax"> </span><span class="identifier-syntax">COMMAND_STREAM</span><span class="plain-syntax">;</span>
 <span class="reserved-syntax">Constant</span><span class="plain-syntax"> </span><span class="identifier-syntax">GG_COMMANDWSTR_ROCK</span><span class="plain-syntax">    </span><span class="constant-syntax">303</span><span class="plain-syntax">;</span>
 <span class="reserved-syntax">Constant</span><span class="plain-syntax"> </span><span class="identifier-syntax">GG_COMMANDRSTR_ROCK</span><span class="plain-syntax">    </span><span class="constant-syntax">304</span><span class="plain-syntax">;</span>
+<span class="plain-syntax">#</span><span class="identifier-syntax">Endif</span><span class="plain-syntax">;</span>
 <span class="reserved-syntax">Constant</span><span class="plain-syntax"> </span><span class="identifier-syntax">GG_SCRIPTFREF_ROCK</span><span class="plain-syntax">     </span><span class="constant-syntax">401</span><span class="plain-syntax">;</span>
 <span class="reserved-syntax">Constant</span><span class="plain-syntax"> </span><span class="identifier-syntax">GG_FOREGROUNDCHAN_ROCK</span><span class="plain-syntax"> </span><span class="constant-syntax">410</span><span class="plain-syntax">;</span>
 <span class="reserved-syntax">Constant</span><span class="plain-syntax"> </span><span class="identifier-syntax">GG_BACKGROUNDCHAN_ROCK</span><span class="plain-syntax"> </span><span class="constant-syntax">411</span><span class="plain-syntax">;</span>
@@ -204,8 +206,10 @@ <h1><a href="../index.html">
 <span class="identifier-syntax">Global</span><span class="plain-syntax"> </span><span class="identifier-syntax">gg_statuswin</span><span class="plain-syntax"> = </span><span class="constant-syntax">0</span><span class="plain-syntax">;</span>
 <span class="identifier-syntax">Global</span><span class="plain-syntax"> </span><span class="identifier-syntax">gg_quotewin</span><span class="plain-syntax"> = </span><span class="constant-syntax">0</span><span class="plain-syntax">;</span>
 <span class="identifier-syntax">Global</span><span class="plain-syntax"> </span><span class="identifier-syntax">gg_savestr</span><span class="plain-syntax"> = </span><span class="constant-syntax">0</span><span class="plain-syntax">;</span>
+<span class="plain-syntax">#</span><span class="identifier-syntax">Ifdef</span><span class="plain-syntax"> </span><span class="identifier-syntax">COMMAND_STREAM</span><span class="plain-syntax">;</span>
 <span class="identifier-syntax">Global</span><span class="plain-syntax"> </span><span class="identifier-syntax">gg_commandstr</span><span class="plain-syntax"> = </span><span class="constant-syntax">0</span><span class="plain-syntax">;</span>
 <span class="identifier-syntax">Global</span><span class="plain-syntax"> </span><span class="identifier-syntax">gg_command_reading</span><span class="plain-syntax"> = </span><span class="constant-syntax">0</span><span class="plain-syntax">;      </span><span class="comment-syntax">true if gg_commandstr is being replayed</span>
+<span class="plain-syntax">#</span><span class="identifier-syntax">Endif</span><span class="plain-syntax">;</span>
 <span class="identifier-syntax">Global</span><span class="plain-syntax"> </span><span class="identifier-syntax">gg_foregroundchan</span><span class="plain-syntax"> = </span><span class="constant-syntax">0</span><span class="plain-syntax">;</span>
 <span class="identifier-syntax">Global</span><span class="plain-syntax"> </span><span class="identifier-syntax">gg_backgroundchan</span><span class="plain-syntax"> = </span><span class="constant-syntax">0</span><span class="plain-syntax">;</span>
 
@@ -248,6 +252,7 @@ <h1><a href="../index.html">
 <span class="plain-syntax">[ </span><span class="identifier-syntax">VM_KeyChar</span><span class="plain-syntax"> </span><span class="identifier-syntax">win</span><span class="plain-syntax"> </span><span class="identifier-syntax">done</span><span class="plain-syntax"> </span><span class="identifier-syntax">res</span><span class="plain-syntax"> </span><span class="identifier-syntax">ix</span><span class="plain-syntax"> </span><span class="identifier-syntax">jx</span><span class="plain-syntax"> </span><span class="identifier-syntax">ch</span><span class="plain-syntax">;</span>
 <span class="plain-syntax">    </span><span class="identifier-syntax">jx</span><span class="plain-syntax"> = </span><span class="identifier-syntax">ch</span><span class="plain-syntax">; </span><span class="comment-syntax">squash compiler warnings</span>
 <span class="plain-syntax">    </span><span class="reserved-syntax">if</span><span class="plain-syntax"> (</span><span class="identifier-syntax">win</span><span class="plain-syntax"> == </span><span class="constant-syntax">0</span><span class="plain-syntax">) </span><span class="identifier-syntax">win</span><span class="plain-syntax"> = </span><span class="identifier-syntax">gg_mainwin</span><span class="plain-syntax">;</span>
+<span class="plain-syntax">#</span><span class="identifier-syntax">Ifdef</span><span class="plain-syntax"> </span><span class="identifier-syntax">COMMAND_STREAM</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">gg_commandstr</span><span class="plain-syntax"> ~= </span><span class="constant-syntax">0</span><span class="plain-syntax"> &amp;&amp; </span><span class="identifier-syntax">gg_command_reading</span><span class="plain-syntax"> ~= </span><span class="reserved-syntax">false</span><span class="plain-syntax">) {</span>
 <span class="plain-syntax">        </span><span class="identifier-syntax">done</span><span class="plain-syntax"> = </span><span class="identifier-syntax">glk_get_line_stream</span><span class="plain-syntax">(</span><span class="identifier-syntax">gg_commandstr</span><span class="plain-syntax">, </span><span class="identifier-syntax">gg_arguments</span><span class="plain-syntax">, </span><span class="constant-syntax">31</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">done</span><span class="plain-syntax"> == </span><span class="constant-syntax">0</span><span class="plain-syntax">) {</span>
@@ -278,6 +283,7 @@ <h1><a href="../index.html">
 <span class="character-syntax">            jump KCPContinue;</span>
 <span class="character-syntax">        }</span>
 <span class="character-syntax">    }</span>
+<span class="character-syntax">#Endif;</span>
 <span class="character-syntax">    done = false;</span>
 <span class="character-syntax">    glk_request_char_event(win);</span>
 <span class="character-syntax">    while (~~done) {</span>
@@ -290,6 +296,7 @@ <h1><a href="../index.html">
 <span class="character-syntax">            }</span>
 <span class="character-syntax">        }</span>
 <span class="character-syntax">    }</span>
+<span class="character-syntax">#Ifdef COMMAND_STREAM;</span>
 <span class="character-syntax">    if (gg_commandstr ~= 0 &amp;&amp; gg_command_reading == false) {</span>
 <span class="character-syntax">        if (res &lt; 32 || res &gt;= 256 || (res == '</span><span class="plain-syntax">\</span><span class="character-syntax">' or '</span><span class="plain-syntax"> </span><span class="character-syntax">')) {</span>
 <span class="character-syntax">            glk_put_char_stream(gg_commandstr, '</span><span class="plain-syntax">\</span><span class="character-syntax">');</span>
@@ -312,6 +319,7 @@ <h1><a href="../index.html">
 <span class="character-syntax">        glk_put_char_stream(gg_commandstr, 10); </span><span class="comment-syntax">newline</span>
 <span class="character-syntax">    }</span>
 <span class="character-syntax">  .KCPContinue;</span>
+<span class="character-syntax">#Endif;</span>
 <span class="character-syntax">    return MapGlkKeyCodeToUnicode(res);</span>
 <span class="character-syntax">];</span>
 
@@ -334,6 +342,7 @@ <h1><a href="../index.html">
 <span class="character-syntax">Constant UnicodeWhitespaceLen = 8;</span>
 
 <span class="character-syntax">[ VM_ReadKeyboard  a_buffer a_table done ix chr;</span>
+<span class="character-syntax">#Ifdef COMMAND_STREAM;</span>
 <span class="character-syntax">    if (gg_commandstr ~= 0 &amp;&amp; gg_command_reading ~= false) {</span>
 <span class="character-syntax">        done = glk_get_line_stream_uni(gg_commandstr, a_buffer+WORDSIZE,</span>
 <span class="character-syntax">            (INPUT_BUFFER_LEN-1)-1);</span>
@@ -352,6 +361,7 @@ <h1><a href="../index.html">
 <span class="character-syntax">            jump KPContinue;</span>
 <span class="character-syntax">        }</span>
 <span class="character-syntax">    }</span>
+<span class="character-syntax">#Endif;</span>
 <span class="character-syntax">    done = false;</span>
 <span class="character-syntax">    glk_request_line_event_uni(gg_mainwin, a_buffer+WORDSIZE, INPUT_BUFFER_LEN-1, 0);</span>
 <span class="character-syntax">    while (~~done) {</span>
@@ -371,11 +381,13 @@ <h1><a href="../index.html">
 <span class="character-syntax">        glk_set_style(style_Normal);</span>
 <span class="character-syntax">        glk_put_char(10); </span><span class="comment-syntax">newline</span>
 <span class="character-syntax">    }</span>
+<span class="character-syntax">#Ifdef COMMAND_STREAM;</span>
 <span class="character-syntax">    if (gg_commandstr ~= 0 &amp;&amp; gg_command_reading == false) {</span>
 <span class="character-syntax">        glk_put_buffer_stream(gg_commandstr, a_buffer+WORDSIZE, a_buffer--&gt;0);</span>
 <span class="character-syntax">        glk_put_char_stream(gg_commandstr, 10); </span><span class="comment-syntax">newline</span>
 <span class="character-syntax">    }</span>
 <span class="character-syntax">  .KPContinue;</span>
+<span class="character-syntax">#Endif;</span>
 
 <span class="character-syntax">    for ( ix = 1 : ix &lt;= (a_buffer--&gt;0) : ix++ ) {</span>
 <span class="character-syntax">      chr = a_buffer--&gt;ix;</span>

docs/assertions-module/6-bl.html

@@ -392,12 +392,14 @@ <h1><a href="../index.html">
 
 <span class="plain-syntax">    </span><span class="comment-syntax"> move forward to final valid first rule (if any exist)</span>
 <span class="plain-syntax">    </span><span class="reserved-syntax">while</span><span class="plain-syntax"> ((</span><span class="identifier-syntax">insert_after</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">next_booking</span><span class="plain-syntax"> != </span><span class="identifier-syntax">end_rule</span><span class="plain-syntax">)</span>
-<span class="plain-syntax">        &amp;&amp; (</span><span class="identifier-syntax">insert_after</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">next_booking</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">placement</span><span class="plain-syntax"> == </span><span class="constant-syntax">FIRST_PLACEMENT</span><span class="plain-syntax">))</span>
+<span class="plain-syntax">        &amp;&amp; ((</span><span class="identifier-syntax">insert_after</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">next_booking</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">placement</span><span class="plain-syntax"> == </span><span class="constant-syntax">VERY_FIRST_PLACEMENT</span><span class="plain-syntax">) ||</span>
+<span class="plain-syntax">            (</span><span class="identifier-syntax">insert_after</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">next_booking</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">placement</span><span class="plain-syntax"> == </span><span class="constant-syntax">FIRST_PLACEMENT</span><span class="plain-syntax">)))</span>
 <span class="plain-syntax">        </span><span class="identifier-syntax">insert_after</span><span class="plain-syntax"> = </span><span class="identifier-syntax">insert_after</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">next_booking</span><span class="plain-syntax">;</span>
 
 <span class="plain-syntax">    </span><span class="comment-syntax"> move forward past other middle rules if they are not less specific</span>
 <span class="plain-syntax">    </span><span class="reserved-syntax">while</span><span class="plain-syntax"> ((</span><span class="identifier-syntax">insert_after</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">next_booking</span><span class="plain-syntax"> != </span><span class="identifier-syntax">end_rule</span><span class="plain-syntax">) </span><span class="comment-syntax"> stop before </span>\(p\)<span class="comment-syntax"> leaves valid range</span>
 <span class="plain-syntax">        &amp;&amp; (</span><span class="identifier-syntax">insert_after</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">next_booking</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">placement</span><span class="plain-syntax"> != </span><span class="constant-syntax">LAST_PLACEMENT</span><span class="plain-syntax">) </span><span class="comment-syntax"> or reaches a last rule</span>
+<span class="plain-syntax">        &amp;&amp; (</span><span class="identifier-syntax">insert_after</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">next_booking</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">placement</span><span class="plain-syntax"> != </span><span class="constant-syntax">VERY_LAST_PLACEMENT</span><span class="plain-syntax">) </span><span class="comment-syntax"> or a very last rule</span>
 <span class="plain-syntax">        &amp;&amp; (</span><a href="6-rb.html#SP7" class="function-link"><span class="function-syntax">RuleBookings::cmp</span></a><span class="plain-syntax">(</span><span class="identifier-syntax">insert_after</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">next_booking</span><span class="plain-syntax">, </span><span class="identifier-syntax">new_br</span><span class="plain-syntax">,</span>
 <span class="plain-syntax">            </span><span class="identifier-syntax">log</span><span class="plain-syntax">) &gt;= </span><span class="constant-syntax">0</span><span class="plain-syntax">)) </span><span class="comment-syntax"> or a rule less specific than the new one</span>
 <span class="plain-syntax">        </span><span class="identifier-syntax">insert_after</span><span class="plain-syntax"> = </span><span class="identifier-syntax">insert_after</span><span class="plain-syntax">-&gt;</span><span class="element-syntax">next_booking</span><span class="plain-syntax">;</span>