From 8ba38acec7c460a0a2688f09220ee70be37b39af Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Tue, 12 Mar 2024 08:54:17 +0000 Subject: [PATCH] Adapted parser to the new truncated dictionary word bit provided by I6 --- README.md | 2 +- build.txt | 4 +- docs/Architecture16Kit/S-io.html | 38 +++++++----- docs/Architecture32Kit/S-io.html | 42 +++++++++----- docs/CommandParserKit/S-prs.html | 58 +++++++++---------- docs/WorldModelKit/S-tst.html | 4 +- docs/final-module/4-fi6.html | 1 + inform6/Inform6/ReleaseNotes.html | 8 ++- inform6/Inform6/header.h | 6 +- inform6/Inform6/memory.c | 27 +++++++-- inform6/Inform6/text.c | 58 ++++++++++++++++--- inform6/Inform6/verbs.c | 5 +- inform7/Figures/memory-diagnostics.txt | 24 ++++---- inform7/Figures/timings-diagnostics.txt | 24 ++++---- .../Sections/Input Output.i6t | 14 ++++- .../Inter/Architecture16Kit/kit_metadata.json | 2 +- .../Sections/Input Output.i6t | 14 ++++- .../Inter/Architecture32Kit/kit_metadata.json | 2 +- .../Inter/BasicInformKit/kit_metadata.json | 2 +- .../CommandParserKit/Sections/Parser.i6t | 58 +++++++++---------- .../Inter/CommandParserKit/kit_metadata.json | 2 +- .../EnglishLanguageKit/kit_metadata.json | 2 +- .../Inter/WorldModelKit/Sections/Tests.i6t | 4 +- .../Inter/WorldModelKit/kit_metadata.json | 2 +- inter/final-module/Chapter 4/Final Inform 6.w | 1 + .../Examples/TheFactsWereThese--I.txt | 2 +- .../Examples/TheFactsWereThese.txt | 4 +- 27 files changed, 263 insertions(+), 147 deletions(-) diff --git a/README.md b/README.md index 927668233..c4265079e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -[Version](notes/versioning.md): 10.2.0-beta+6X36 'Krypton' (26 February 2024) +[Version](notes/versioning.md): 10.2.0-beta+6X37 'Krypton' (12 March 2024) ## About Inform diff --git a/build.txt b/build.txt index 24d2a7afd..c410f9cc6 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 26 February 2024 -Build Number: 6X36 +Build Date: 12 March 2024 +Build Number: 6X37 diff --git a/docs/Architecture16Kit/S-io.html b/docs/Architecture16Kit/S-io.html index 2222bea09..876bb1bd5 100644 --- a/docs/Architecture16Kit/S-io.html +++ b/docs/Architecture16Kit/S-io.html @@ -64,7 +64,7 @@ MathJax = {

Access to the keyboard and to textual windows.

-
+

§1. Transcript support. This is a mode in which the transcript of text in the main window is being written out to an external file. @@ -92,12 +92,24 @@ only if scripting is on. rtrue; ]; -

§2. Variables and Arrays.

+

§2. Dictionary Parameters. 

 Constant #dict_par1 = 6;
 Constant #dict_par2 = 7;
 
+Constant DICTPAR1_VERB = 1;
+Constant DICTPAR1_META = 2;
+Constant DICTPAR1_PLURAL = 4;
+Constant DICTPAR1_PREP = 8;
+Constant DICTPAR1_SING = 16;
+Constant DICTPAR1_BIT6 = 32;
+Constant DICTPAR1_TRUNC = 64;
+Constant DICTPAR1_NOUN = 128;
+
+

§3. Variables and Arrays.

+ +
 Global xcommsdir; true if command recording is on
 
 Constant INPUT_BUFFER_LEN = 120; Length of buffer array
@@ -112,7 +124,7 @@ only if scripting is on.
 Global dict_entry_size;
 Global dict_end;
-

§3. Dictionary words. This tests whether an address is probably that of a dictionary word. It's used +

§4. Dictionary words. This tests whether an address is probably that of a dictionary word. It's used only for debugging output, so the false positives here (where an address is in the dictionary table, but mid-word) really do not matter.

@@ -124,7 +136,7 @@ the dictionary table, but mid-word) really do not matter. rfalse; ]; -

§4. Keyboard Input. The VM must provide three routines for keyboard input: +

§5. Keyboard Input. The VM must provide three routines for keyboard input: