From dd1714d5dc759e52227da32ef1e2e2042cf5286c Mon Sep 17 00:00:00 2001 From: Zed Lopez Date: Thu, 13 Nov 2025 17:34:28 -0800 Subject: [PATCH] initial commit of patch removing seven unused globals --- .../Materials/Inter/CommandParserKit/Sections/Parser.i6t | 9 ++------- .../Inter/WorldModelKit/Sections/Miscellany.i6t | 5 ----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/inform7/Internal/Extensions/Graham Nelson/Standard Rules.i7xd/Materials/Inter/CommandParserKit/Sections/Parser.i6t b/inform7/Internal/Extensions/Graham Nelson/Standard Rules.i7xd/Materials/Inter/CommandParserKit/Sections/Parser.i6t index f3472e4c1..b70114ea7 100644 --- a/inform7/Internal/Extensions/Graham Nelson/Standard Rules.i7xd/Materials/Inter/CommandParserKit/Sections/Parser.i6t +++ b/inform7/Internal/Extensions/Graham Nelson/Standard Rules.i7xd/Materials/Inter/CommandParserKit/Sections/Parser.i6t @@ -133,11 +133,8 @@ Global found_ttype; ! Used to break up tokens into type Global found_tdata; ! and data (by AnalyseToken) Global token_filter; ! For noun filtering by user routines -Global length_of_noun; ! Set by NounDomain to no of words in noun - Global lookahead; ! The token after the one now being matched -Global multi_mode; ! Multiple mode Global multi_wanted; ! Number of things needed in multitude Global multi_had; ! Number of things actually found Global multi_context; ! What token the multi-obj was accepted for @@ -2258,10 +2255,8 @@ looking -- and a context (i.e. token type), and returns: rewrote the player's input, so that the whole parser should start again on the rewritten input. -In case (c), |NounDomain| also sets the variable |length_of_noun| to the -number of words in the input text matched to the noun. In case (b), -the multiple objects are added to |multiple_object| by hand (not by |MultiAdd|, -because we want to allow duplicates). +In case (b), the multiple objects are added to |multiple_object| by hand (not by +|MultiAdd|, because we want to allow duplicates). = [ NounDomain domain1 domain2 context dont_ask diff --git a/inform7/Internal/Extensions/Graham Nelson/Standard Rules.i7xd/Materials/Inter/WorldModelKit/Sections/Miscellany.i6t b/inform7/Internal/Extensions/Graham Nelson/Standard Rules.i7xd/Materials/Inter/WorldModelKit/Sections/Miscellany.i6t index 40c5424f7..01670b43c 100644 --- a/inform7/Internal/Extensions/Graham Nelson/Standard Rules.i7xd/Materials/Inter/WorldModelKit/Sections/Miscellany.i6t +++ b/inform7/Internal/Extensions/Graham Nelson/Standard Rules.i7xd/Materials/Inter/WorldModelKit/Sections/Miscellany.i6t @@ -189,17 +189,12 @@ Global scope_token; ! for "scope=Routine" grammar tokens Global scope_error; Global scope_stage; ! 1, 2 then 3 Global advance_warning; ! what a later-named thing will be -Global reason_code = NULL; ! for the I6 veneer Global ats_flag = 0; ! for AddToScope routines Global ats_hls; ! (11) Global move_pushing; -Global move_from; -Global move_to; -Global move_by; -Global move_through; ! (12) Global lookmode = WorldModelKit`ROOM_DESC_DETAIL_CFGV; ! 1 = BRIEF, 2 = VERBOSE, 3 = SUPERBRIEF