inform6lib 0.1.2 → 0.1.3

data/lib/inform/parserm.h.rb

@@ -60,7 +60,6 @@
 # which supports the referencing of Special Global Variables like
 # $LAST_MATCH_INFO by their screaming snake case names.
 require 'English'
-require 'set'
 
 require_relative 'linklpa.h'
 
@@ -249,7 +248,7 @@ module Parser
   if !defined?(MAX_TIMERS)
   MAX_TIMERS = 32                  # Max number timers/daemons active at once
   end # if !defined?(MAX_TIMERS)
-  @the_timers = [MAX_TIMERS]
+  @the_timers = []
   @active_timers                   # Number of timers/daemons actives
 
   @score                           # The current score
@@ -540,22 +539,22 @@ module Parser
     @selfobj ||= SelfObj
   end
 
-  def selfobj=(o)
-    @selfobj = o
+  def selfobj=(obj)
+    @selfobj = obj
   end
 
   InitalState = Struct.new(:memo).new
 
   def self.initial_state
-    InitalState.memo ||= Inform::Parser.instance_variables.each_with_object({}) do |variable, memo|
-      memo[variable] = Inform::Parser.instance_variable_get(variable)
+    InitalState.memo ||= Inform::Parser.instance_variables.to_h do |variable|
+      [variable, Inform::Parser.instance_variable_get(variable)]
     end
   end
 
   def initialize_state
     DidScopeAction.clear # TODO: Remove
-    Inform::Parser.initial_state.each_pair do |k, v|
-      self.instance_variable_set(k, v)
+    Inform::Parser.initial_state.each_pair do |key, value|
+      self.instance_variable_set(key, value)
     end
   end
 
@@ -816,7 +815,9 @@ module Parser
 #   Note that there are three different places where a return can happen.
 # ----------------------------------------------------------------------------
 
-  ConversationStarterPattern = %r{\w+, }.freeze
+  QuotesSayCommandPattern = %r{^['"]}
+  ConversationStarterPattern = %r{\w+, }
+  WordOrCommaSplitPattern = %r{\s+|(?=,)|(?<=,)}
 
   def Parser__parse
     @meta = false
@@ -843,23 +844,28 @@ module Parser
 
     if @held_back_mode
       @held_back_mode = false
-      throw :ReParse
+      return ReParse()
     end
 
     # Handle the apostrophe shorthand for the Say command
-    @input = "say '#{@input[1..]}'" if @input =~ /^['"]/
+    @input = "say '#{@input[1..]}'" if QuotesSayCommandPattern.match?(@input)
 
     # Get the words from the player's input
-    @words = @input.split
+    # @words = @input.split
+    @words = @input.split(WordOrCommaSplitPattern)
 
-    # :ReParse
+    ReParse()
+  end
+  # def Parser__parse
 
+  def ReParse
     @parser_inflection = :name
 
     # Initially assume the command is aimed at the player, and the verb
     # is the first word
 
     # num_words = WordCount()
+    @num_words = @words.length
     @wn = 0 # Our words "buffer" is indexed from 0, unlike Inform
 
     if defined? LanguageToInformese
@@ -912,14 +918,19 @@ module Parser
     @location ||= @actors_location # TODO: Necessary?
     @usual_grammar_after = nil
 
-    # :AlmostReParse
+    AlmostReParse()
+  end
+  # def ReParse
 
+  def AlmostReParse
     @scope_token = nil
     @action_to_be = nil
 
-    # Begin from what we currently think is the verb word
+    BeginCommand()
+  end
 
-    # :BeginCommand
+  def BeginCommand()
+    # Begin from what we currently think is the verb word
 
     @wn = @verb_wordnum
     # @verb_word = NextWordStopped() # TODO: FIXME?
@@ -938,7 +949,7 @@ module Parser
 
     @verb_word = AGAIN1__WD if @verb_word == AGAIN2__WD || @verb_word == AGAIN3__WD
     if @verb_word == AGAIN1__WD
-      raise RepeatedOrder if @actor != @player
+      raise RepeatedCommand if @actor != @player
       raise NothingToRepeat if history.empty?
       @input = history.last
       @words = @input.split
@@ -956,8 +967,6 @@ module Parser
       # return DoOops()
     end
 
-    initialize_state
-
     if @match_list then @match_list.clear else @match_list = [] end
     if @multiple_object then @multiple_object.clear else @multiple_object = [] end
     if @pattern then @pattern.clear else @pattern = [] end
@@ -1005,7 +1014,7 @@ module Parser
       end # DEBUG
       @wn = @verb_wordnum; @indef_mode = false; @token_filter = nil
       l = NounDomain(Compass)
-      # throw :ReParse if l == REPARSE_CODE
+      # return ReParse() if l == REPARSE_CODE
 
       if l
         # If it is a direction, send back the results:
@@ -1031,41 +1040,23 @@ module Parser
       # tell the wizard that she is an idiot.)
 
       if @actor == @player
-        if ConversationStarterPattern.match?(@words.join(' '))
-          # TODO: Implement conversation and imperative commands
-          log.debug "jump Conversation"
-          # jump Conversation
-        else
-          @verb = UnknownVerb(@verb)
-          if @verb.nil?
-            @best_etype = VerbUnrecognized
-            raise @best_etype
-          else
-            log.debug "jump VerbAccepted"
-            # jump VerbAccepted
-          end
+        j = 2
+        while j <= @num_words
+          i = NextWord(); j += 1
+          return Conversation() if i == @comma_word
         end
-      else
-        @best_etype = VerbUnrecognized
-        raise @best_etype
+        @verb = UnknownVerb(@verb)
+        return VerbAccepted() unless @verb.nil?
       end
-
-      # Conversation()
-
-      @actor = l
-      @actors_location = ScopeCeiling(l)
-      if defined?(DEBUG)
-      if @parser_trace >= 1
-        println "[Actor is " + the(@actor) + " in " + @actors_location + "]"
-      end
-      end # DEBUG
-      return true
+      @best_etype = VerbUnrecognized
+      return GiveError()
+      # raise @best_etype
     end
-    # of first-word-not-a-verb
+    # end of first-word-not-a-verb
 
     VerbAccepted()
   end
-  # def Parser__parse
+  # def BeginCommand
 
     ############################################################################
     #
@@ -1143,46 +1134,41 @@ module Parser
 
     return true
   end
-  # def Parser__parse
+  # def VerbAccepted
 
   # NextWord nudges the word number wn on by one each time, so we've now
   # advanced past a comma.  (A comma is a word all on its own in the table.)
 
   def Conversation
-    j = @wn - 1
-    if j == 1
-      raise UnexpectedComma
-    end
+    j = @wn
+    raise UnexpectedComma if j == 1
 
     # Use NounDomain (in the context of "animate creature") to see if the
     # words make sense as the name of someone held or nearby
 
-    @wn = 1; @lookahead = HELD_TOKEN
+    @wn = 0; @lookahead = :held
     @scope_reason = TALKING_REASON
     l = NounDomain(@player,@actors_location,6)
     @scope_reason = PARSING_REASON
     throw :ReParse if l == REPARSE_CODE
-    raise MissingAddressee if l == 0
+    raise MissingAddressee if l == false
 
-    Conversation2()
+    Conversation2(l, j)
   end
 
-  def Conversation2
+  def Conversation2(l, j)
 
     # The object addressed must at least be "talkable" if not actually "animate"
     # (the distinction allows, for instance, a microphone to be spoken to,
     # without the parser thinking that the microphone is human).
 
-    if l.hasnt? :animate, :talkable
-      raise InanimateAddressee
-    end
+    raise InanimateAddressee if l.hasnt? :animate, :talkable
 
     # Check that there aren't any mystery words between the end of the person's
     # name and the comma (eg, throw out "dwarf sdfgsdgs, go north").
 
-    if @wn != j
-      raise SpeechImpediment
-    end
+    @wn += 1
+    raise SpeechImpediment if @wn != j
 
     # The player has now successfully named someone.  Adjust "him", "her", "it":
 
@@ -1191,15 +1177,14 @@ module Parser
     # Set the global variable "actor", adjust the number of the first word,
     # and begin parsing again from there.
 
-    @verb_wordnum = j + 1
+    @verb_wordnum = j
 
     # Stop things like "me, again":
 
     if l == @player
       @wn = @verb_wordnum
       if [AGAIN1__WD, AGAIN2__WD, AGAIN3__WD].include?(NextWordStopped())
-        L__M(:Miscellany, 20)
-        jump ReType
+        raise RepeatedCommand
       end
     end
 
@@ -1316,7 +1301,8 @@ module Parser
               prepositions = @line_token[@pcount].split(/\//).map { |s| s[1..-2] }
               @pcount += 1 while @line_ttype[@pcount] == :preposition
 
-              if ElementaryTokens.include?(@line_ttype[@pcount]) && @line_tdata[@pcount] == :noun
+              if ElementaryTokens.include?(@line_ttype[@pcount]) &&
+                @line_tdata[@pcount] == :noun
 
                 # Advance past the last preposition
 
@@ -1402,6 +1388,7 @@ module Parser
           @scope_reason = PARSING_REASON
           AnalyseToken(token)
 
+          # TODO: FIXME
           # if @action_to_be == :AskTo && ElementaryTokens.include?(@found_ttype) &&
           #     @found_tdata == :topic
           #   l = @results[2]
@@ -1414,7 +1401,8 @@ module Parser
 
           if defined?(DEBUG) && @parser_trace >= 10
             new_line
-            println "Parsing the current word '#{current_word}' as a #{@found_ttype} in this grammar:"
+            println "Parsing the current word '#{current_word}' " +
+              "as a #{@found_ttype} in this grammar:"
             println grammar.to_s
             println ">>Before invoking ParseToken(#{@found_ttype})..."
             println ">>...The found token data is #{@found_tdata}"
@@ -1603,7 +1591,8 @@ module Parser
       # We continue the outer "for" loop, trying the next line in the grammar.
 
       @best_etype = @etype if @etype > @best_etype
-      @nextbest_etype = @etype if @etype != AskScope && !@etype.nil? && @etype > @nextbest_etype
+      @nextbest_etype = @etype if @etype != AskScope &&
+        !@etype.nil? && @etype > @nextbest_etype
 
       # ...unless the line was something like "take all" which failed because
       # nothing matched the "all", in which case we stop and give an error now.
@@ -1615,14 +1604,17 @@ module Parser
 
     # The grammar is exhausted: every line has failed to match.
 
+    GiveError()
+  end
+  # def BestGrammar
+
     ############################################################################
     #
     # H: Cheaply parse otherwise unrecognised conversation and return
     #
     ############################################################################
 
-    # label :GiveError do
-
+  def GiveError
     if defined?(DEBUG) && @parser_trace >= 10
       println ">>@etype is #{@etype}"
       println ">>@best_etype is #{@best_etype}"
@@ -1633,26 +1625,25 @@ module Parser
     # If the command was addressed to somebody else (eg, "dwarf, sfgh") then
     # it is taken as conversation which the parser has no business in disallowing.
 
-    # TODO: Implement conversations
-    # if @actor != @player
-    #   if @usual_grammar_after
-    #     @verb_wordnum = @usual_grammar_after
-    #     throw :AlmostReParse
-    #   end
-    #   @wn = @verb_wordnum
-    #   @special_word = NextWord()
-    #   if @special_word == @comma_word
-    #     @special_word = NextWord()
-    #     @verb_wordnum++
-    #   end
-    #   @special_number = TryNumber(@verb_wordnum)
-    #   @results[0] = :NotUnderstood
-    #   @results[1] = 2
-    #   @results[2] = 1; @special_number1 = @special_word
-    #   @results[3] = @actor
-    #   @consult_from = @verb_wordnum; @consult_words = @num_words-@consult_from+1
-    #   return true
-    # end
+    if @actor != @player
+      unless @usual_grammar_after.nil?
+        @verb_wordnum = @usual_grammar_after
+        return AlmostReParse()
+      end
+      @wn = @verb_wordnum
+      @special_word = NextWord()
+      if @special_word == @comma_word
+        @special_word = NextWord()
+        @verb_wordnum += 1
+      end
+      @special_number = TryNumber(@verb_wordnum)
+      @results[0] = :NotUnderstood
+      @results[1] = 2
+      @results[2] = 1; @special_number1 = @special_word
+      @results[3] = @actor
+      @consult_from = @verb_wordnum; @consult_words = @num_words-@consult_from+1
+      return true
+    end
 
     ############################################################################
     #
@@ -1679,7 +1670,7 @@ module Parser
     # ...being careful not to go all the way back, to avoid infinite repetition
     # of a deferred command causing an error.
   end
-  # def BestGrammar
+  # def GiveError
 
     ############################################################################
     #
@@ -1896,7 +1887,7 @@ module Parser
 #  (F)            Return the conclusion of parsing an object list
 # ----------------------------------------------------------------------------
 
-  CommaWordPattern = %r{,$}.freeze
+  CommaWordPattern = %r{,$}
 
   # rubocop: disable Layout/EmptyLinesAroundBlockBody
   def ParseToken(given_ttype, given_tdata, token_n, token)
@@ -2041,7 +2032,10 @@ module Parser
 
     end
 
-    token = given_ttype
+    # TODO: Remove (2026-08-21)
+    # token = given_ttype
+    # TODO: Test
+    token = given_tdata
     prev_indef_wanted = 0
 
     ############################################################################
@@ -2116,7 +2110,9 @@ module Parser
       end
     end
 
-    if [ME1__WD, ME2__WD, ME3__WD].include?(o) then @pronoun_word = o; @pronoun_obj = selfobj; end
+    if [ME1__WD, ME2__WD, ME3__WD].include?(o)
+      @pronoun_word = o; @pronoun_obj = selfobj
+    end
 
     @allow_plurals = true; desc_wn = @wn;
 
@@ -2197,7 +2193,8 @@ module Parser
           @wn = desc_wn
           throw :TryAgain2
         end
-        @etype = CannotUnderstandSentence if @multiflag && [UnexpectedMultiple, TooFew].include?(@etype)
+        @etype = CannotUnderstandSentence if @multiflag &&
+          [UnexpectedMultiple, TooFew].include?(@etype)
         @etype = CantSee()
         return FailToken(desc_wn, prev_indef_wanted)
       end # Choose best error
@@ -2749,7 +2746,8 @@ module Parser
         next unless @pattern[j]
 
         if defined?(DEBUG)
-          println "[Gluing in inference with pattern code " + @pattern[j] + "]" if @parser_trace >= 5
+          println "[Gluing in inference with pattern code " +
+            @pattern[j] + "]" if @parser_trace >= 5
         end # DEBUG
 
         # Conveniently, parse2[1] is the first word in both ZCODE and GLULX.
@@ -2975,7 +2973,8 @@ module Parser
       end
       @multi_context = context
       if defined?(DEBUG)
-        println "   Made multiple object of size #{@multiple_object.length}]" if @parser_trace >= 4
+        println "   Made multiple object of size " +
+          "#{@multiple_object.length}]" if @parser_trace >= 4
       end # DEBUG
       return 1
     end
@@ -3007,7 +3006,8 @@ module Parser
       println "   Grouped into #{n} possibilities by name:"
       for i in (0...@number_matched)
         if @match_classes[i] > 0
-          print "   " + The(@match_list[i]) + " (#{@match_list[i].object_id})  ---  group #{@match_classes[i]}\n"
+          print "   " + The(@match_list[i]) +
+            " (#{@match_list[i].object_id})  ---  group #{@match_classes[i]}\n"
         end
       end
     end
@@ -3097,7 +3097,8 @@ module Parser
 #  entries which fail the basic requirements of the descriptors.
 # ----------------------------------------------------------------------------
 
-  def ScoreMatchL(context, match_list = [], match_scores = [], number_matched = 0, threshold = 0)
+  def ScoreMatchL(context, match_list = [], match_scores = [],
+      number_matched = 0, threshold = 0)
     threshold += 1 if (@indef_type & OTHER_BIT) != 0
     threshold += 1 if (@indef_type & MY_BIT) != 0
     threshold += 1 if (@indef_type & THAT_BIT) != 0
@@ -3129,7 +3130,8 @@ module Parser
     for i in (0...number_matched)
       obj = match_list[i]; its_owner = parent(obj); its_score = 0; met = 0
 
-      # met+=1 if (@indef_type & OTHER_BIT) != 0 && obj != @itobj && obj != @himobj && obj != @herobj
+      # met+=1 if (@indef_type & OTHER_BIT) != 0 &&
+      #   obj != @itobj && obj != @himobj && obj != @herobj
       met += 1 if (@indef_type & MY_BIT) != 0 && (its_owner == @actor)
       met += 1 if (@indef_type & THAT_BIT) != 0 && (its_owner == @actors_location)
       met += 1 if (@indef_type & LIT_BIT) != 0 && obj.has?(:light)
@@ -3209,7 +3211,9 @@ module Parser
     if defined?(DEBUG)
     if @parser_trace >= 4
       if best < 0 then println "   Best guess ran out of choices"
-      else println "   Best guess " + the(@match_list[earliest]) + " (#{@match_list[earliest]})"
+      else
+        println "   Best guess " + the(@match_list[earliest]) +
+          " (#{@match_list[earliest]})"
       end
     end
     end # DEBUG
@@ -3301,7 +3305,8 @@ module Parser
 
   # def PrintInferredCommand(from = 0)
   #   singleton_noun = false
-  #   if from != 0 && from == (@pcount-1) && @pattern[from].object? # > 1 && @pattern[from] < REPARSE_CODE
+  #   if from != 0 && from == (@pcount-1) &&
+  #     @pattern[from].object? # > 1 && @pattern[from] < REPARSE_CODE
   #     singleton_noun = true
   #   end
 
@@ -3310,7 +3315,8 @@ module Parser
 
   # def PrintInferredCommand(from = nil)
   #   singleton_noun = false
-  #   if from != 0 && from == @pcount-1 && @pattern[from].object? # && @pattern[from] < REPARSE_CODE
+  #   if from != 0 && from == @pcount-1 &&
+  #     @pattern[from].object? # && @pattern[from] < REPARSE_CODE
   #     singleton_noun = true
   #   end
   #   if singleton_noun == true
@@ -3593,10 +3599,7 @@ module Parser
     if @parser_trace >= 6
       println "[DSA on " + the(thing) + " with reason = " + scope_reason.to_s +
               " p1 = #{@parser_one} p2 = #{@parser_two}]"
-      # TODO: Remove
-      if name(thing) == 'Nels'
-        caller.each { |t| println t }
-      elsif DidScopeAction[thing][scope_reason] > 1
+      if DidScopeAction[thing][scope_reason] > 1
         println "Did DoScopeAction(#{thing}) with reason = #{scope_reason} more than once!"
         caller.each { |t| println t }
       end
@@ -3604,13 +3607,13 @@ module Parser
     end # DEBUG
     case scope_reason
     when REACT_BEFORE_REASON
-      return unless thing.react_before?(action)
+      return unless thing.react_before?(@action)
       if defined?(DEBUG)
       println "[Considering react_before for " + the(thing) + "]" if @parser_trace >= 2
       end
       @parser_one ||= RunRoutines(thing, :react_before)
     when REACT_AFTER_REASON
-      return unless thing.react_after?(action)
+      return unless thing.react_after?(@action)
       if defined?(DEBUG)
       println "[Considering react_after for " + the(thing) + "]" if @parser_trace >= 2
       end # DEBUG
@@ -3790,7 +3793,8 @@ module Parser
         println ">>...Matches are [#{matches_}] ([#{object_ids_}])"
       end
       println ">>...No matches yet" if @match_list.empty?
-      println ">>...Matched by #{@match_length} word" + (!@match_length.nil? && @match_length == 1 ? 's' : '')
+      println ">>...Matched by #{@match_length} word" +
+        (!@match_length.nil? && @match_length == 1 ? 's' : '')
       println ">>...Match is #{obj} (#{obj.object_id})"
       already_in_list = @match_list.include?(obj) ? 'Yes' : 'No'
       println ">>...Is object id #{obj.object_id} already in the match list? #{already_in_list}"
@@ -3866,7 +3870,8 @@ module Parser
 
   def TryGivenObject(obj)
     if defined?(DEBUG)
-      println "    Trying " + the(obj) + " (#{obj.object_id}) at word #{@wn + 1}" if @parser_trace >= 5
+      println "    Trying " + the(obj) +
+        " (#{obj.object_id}) at word #{@wn + 1}" if @parser_trace >= 5
     end # DEBUG
 
     @dict_flags_of_noun = 0
@@ -4060,7 +4065,7 @@ module Parser
     return NextWord()
   end
 
-  def WordAddress(wordnum); @words[wordnum]; end
+  def WordAddress(wordnum); @buffer[wordnum]; end
 
   def WordLength(wordnum); @words[wordnum] ? @words[wordnum].length : 0; end
 
@@ -4196,20 +4201,20 @@ module Parser
     i = @lightflag
     @lightflag = OffersLight(parent(@player))
 
-    if (i.nil? || i == false) && @lightflag
+    if i == false && @lightflag == true
       @location = @real_location
       log.debug "Looking after light adjustment for #{@player}" # TODO: Remove
-      return _invoke :Look unless flag
+      return _invoke :Look if flag == false
     end
 
-    if !i.nil? && !@lightflag
+    if i == true && @lightflag == false
       @real_location = @location; @location = thedark
-      unless flag
+      if flag == false
         NoteArrival()
         return L__M(:Miscellany, 9)
       end
     end
-    @location = thedark if !i.nil? && !@lightflag
+    @location = thedark if i == false && @lightflag == false
   end
 
   def OffersLight(i)
@@ -4219,8 +4224,10 @@ module Parser
     if i.has?(:container)
       return OffersLight(parent(i)) if i.has?(:open) || i.has?(:transparent)
     else
-      return OffersLight(parent(i)) if i.has?(:enterable) || i.has?(:transparent) || i.has?(:supporter)
+      return OffersLight(parent(i)) if i.has?(:enterable) ||
+        i.has?(:transparent) || i.has?(:supporter)
     end
+
     false
   end
 
@@ -4271,7 +4278,7 @@ module Parser
     i = @player; i = parent(i) until parent(i).nil?
     @location = i; @real_location = @location
     return RunTimeError(10) unless parent(@player)
-    # MoveFloatingObjects()
+    MoveFloatingObjects()
     @lightflag = OffersLight(parent(@player))
     @location = thedark unless @lightflag
     @print_player_flag = flag
@@ -4358,7 +4365,7 @@ module Parser
   alias ShowverbSub ShowVerbSub
 
   KnownNumberProperties = %i[number capacity time_left].freeze
-  MethodWriterPattern = %r{=$}.freeze
+  MethodWriterPattern = %r{=$}
 
   def ShowobjSub
     f = 0
@@ -4765,7 +4772,9 @@ module Parser
     if defined? LanguagePrintShortName
     return true if LanguagePrintShortName(o)
     end # LanguagePrintShortName
-    return true if @indef_mode && o.respond_to?(:short_name_indef) && PrintOrRun(o, :short_name_indef, 1) != false
+    return true if @indef_mode &&
+      o.respond_to?(:short_name_indef) &&
+      PrintOrRun(o, :short_name_indef, 1) != false
     return true if !o.&(:short_name).nil? && PrintOrRun(o, :short_name, 1) != false
     print o
   end
@@ -4951,7 +4960,7 @@ module Parser
 
   class NothingToRepeat < StandardError; end
 
-  class RepeatedOrder < StandardError; end
+  class RepeatedCommand < StandardError; end
 
   class SpeechImpediment < StandardError; end
 
@@ -5010,48 +5019,45 @@ class InformLibrary < Inform::Ephemeral::Object
   def play
     @real_location = thedark
     @player = selfobj; @actor = @player
-    selfobj.capacity = MAX_CARRIED # ### change?
+    log.debug "Setting capacity of #{selfobj.identity} to #{MAX_CARRIED}"
+    selfobj.&(:capacity, MAX_CARRIED) # ### change?
+    log.debug "  selfobj.&(:capacity): #{selfobj.&(:capacity)}"
 
     new_line
     LibraryExtensions.RunAll(:ext_initialise)
     j = Initialise()
+    # Ruby doesn't automatically print implicitly returned strings :(
     println j if j.is_a?(String)
+    @last_score = @score
     move @player, @location
-    light_adjusted @player
 
     @location = @location.parent until @location.parent.nil?
     @real_location = @location
     @actor = @player # resync, because player may have been changed in initialise()
     Banner() if j != 2
+    MoveFloatingObjects()
     @lightflag = OffersLight(@player.parent)
     if @lightflag == false
       @real_location = @location
       @location = @thedark
     end
-    OBIT_HEAD() if deadflag
-    @player.mute if deadflag
+    OBIT_HEAD() if deadflag != 0
     invoke :Look
-    deadflag ? :death : :playing
+    deadflag != 0 ? :death : :playing
   end
 
   def playing
-    @player.unmute if @player.respond_to?(:unmute) && !deadflag
+    @player.unmute if @player.respond_to?(:unmute) && deadflag != 0
     enqueue(command: @buffer.dup)
 
-    unless deadflag
-      return session.state if respond_to?(:session) && !session.nil?
-      return __method__
+    if deadflag != 0
+      log.debug "#{@player} is entering the death state" # TODO: Remove
+      :death
     end
 
-    AfterLife() if deadflag != 2
-    return very__late__error if deadflag == 0
+    return session.state if respond_to?(:session) && !session.nil?
 
-    OBIT_HEAD()
-    ScoreSub()
-    DisplayStatus()
-    AfterGameOver()
-    log.debug "#{@player} is entering the death state" # TODO: Remove
-    :death
+    __method__
   end
 
   def stop
@@ -5092,18 +5098,48 @@ class InformLibrary < Inform::Ephemeral::Object
 
     @results = [nil, 0, nil, nil]; @meta = false
 
-    2.times do # NotHeld
-    catch :ReParse do
+    # i = 0
+    # catch(:continue) do
+    # rubocop: disable Lint/UnreachableLoop
+      while @deadflag == 0    # everything happens in this loop
+        return very__late__error()
+      end
+    # rubocop: enable Lint/UnreachableLoop
+    # end
+    AfterLife() if deadflag != 2
+    return very__late__error if deadflag == 0
+
+    OBIT_HEAD()
+    ScoreSub()
+    DisplayStatus()
+    AfterGameOver()
+  end
+
+  def very__late__error
+    if @score != @last_score
+      NotifyTheScore() if @notify_mode == true
+      @last_score = @score
+    end
+    late__error()
+  rescue NoVerbRoutine, NotImplemented
+    "Sorry, that action is not yet implemented."
+  rescue NoMethodError => e
+    parser_error e, "Sorry, there was a program error involving a missing method."
+  rescue TypeError => e
+    parser_error e, "Sorry, there was a program error involving the wrong type of object."
+  rescue StandardError => e
+    parser_error e, "Sorry, there was an unhandled program error."
+  end
+
+  def late__error
+
     # The Parser writes its results into @results and @meta,
     # a flag indicating a "meta-verb".  This can only be set for
     # commands by the player, not for orders to others.
 
-    parse_input # inputobjs is now just results
-
-    return if deadflag && !@meta
-    end
-    # ReParse
+    parse_input
 
+    # (Port note: inputobjs is now just results.)
     @action = @results[0]
 
     # --------------------------------------------------------------
@@ -5135,119 +5171,18 @@ class InformLibrary < Inform::Ephemeral::Object
     @multiflag = false; @onotheld_mode = @notheld_mode; @notheld_mode = false
     # For implicit taking and multiple object detection
 
-    # label :begin__action do
-    @inp1 = nil; @inp2 = nil; i = @results[1]
-    @inp1 = @results[2] if i >= 1
-    @inp2 = @results[3] if i >= 2
-
-    # inp1 and inp2 hold: object numbers, or 0 for "multiple object",
-    # or 1 for "a number or dictionary address"
-
-    if @inp1 == 1 then @noun = @special_number1 else @noun = @inp1 end
-    if @inp2 == 1
-      if @inp1 == 1 then @second = @special_number2
-      else               @second = @special_number1
-      end
-    else @second = @inp2
-    end
-
-    #  --------------------------------------------------------------
-
-    # TODO: FIXME
-    # act_requester = nil
-    #
-    # if @actor != @player
-    #
-    # # The player's "orders" property can refuse to allow conversation
-    # # here, by returning true.  If not, the order is sent to the
-    # # other person's "orders" property.  If that also returns false,
-    # # then: if it was a misunderstood command anyway, it is converted
-    # # to an Answer action (thus "floyd, grrr" ends up as
-    # # "say grrr to floyd").  If it was a good command, it is finally
-    # # offered to the Order: part of the other person's "life"
-    # # property, the old-fashioned way of dealing with conversation.
-    #
-    #   j = RunRoutines(@player, :orders)
-    #   unless j
-    #     j = RunRoutines(@actor, :orders)
-    #     unless j
-    #       if action == :NotUnderstood
-    #         @results[3] = @actor; @actor = @player; @action = :Answer
-    #         #jump begin__action
-    #       end
-    #       if RunLife(@actor, :Order) == 0; L__M(:Order, 1, @actor); end
-    #     end
-    #   end
-    #   return # jump turn__end
-    # end
-
-    # --------------------------------------------------------------
-    # Generate the action...
-
-    if (i == 0) ||
-       (i == 1 && @inp1 != 0) ||
-       (i == 2 && @inp1 != 0 && @inp2 != 0) ||
-       (i == @parameters && @inp1 != 0 && @inp2 != 0)
-      result = self.begin_action(@action, @noun, @second, 0)
-      # jump turn__end
-    else
-
-    # ...unless a multiple object must be substituted.  First:
-    # (a) check the multiple list isn't empty;
-    # (b) warn the player if it has been cut short because too long;
-    # (c) generate a sequence of actions from the list
-    #     (stopping in the event of death or movement away).
-
-    @multiflag = true
-    if @multiple_object.empty?
-      return L__M(:Miscellany, 2)
-      # jump late__error
-    end
-    if @toomany_flag
-      @toomany_flag = false
-      print L__M(:Miscellany, 1)
-    end
-    i = @location
-    for l in @multiple_object
-      return if deadflag
-      return L__M(:Miscellany, 51) if @location != i
-      PronounNotice(l)
-      @second = @results[3]
-      print "#{l}: "
-      if @inp1 == 0
-        @inp1 = l; zmsnp self.begin_action(@action, l, @second, 0); @inp1 = 0
-      else
-        @inp2 = l; zmsnp self.begin_action(@action, @noun, l, 0); @inp2 = 0
-      end
-    end
-    end
-
-    # --------------------------------------------------------------
-
-    # label :turn__end do
+    begin__action()
 
-    # No time passes if either (i) the verb was meta, or
-    # (ii) we've only had the implicit take before the "real"
-    # action to follow.
-    if @notheld_mode
-      NoteObjectAcquisitions()
-      println(result, should_prompt: false)
-      return true if result == false
-      next
-    end
-    return result if @meta
-    if defined? SINGLE_PLAYER
-    self.end_turn_sequence() unless deadflag
-    end
-    println(result) if result.is_a?(String)
-    # return result if defined? result
-    return true
-    end
-    # 2.times do # NotHeld
-  rescue RepeatedOrder
-    return L__M(:Miscellany, REPEATED_ORDER)
+    return session.state if respond_to?(:session) && !session.nil?
+    true
+  rescue RepeatedCommand
+    return L__M(:Miscellany, REPEATED_COMMAND)
   rescue NothingToRepeat
     return L__M(:Miscellany, NOTHING_TO_REPEAT)
+  rescue UnexpectedComma
+    return L__M(:Miscellany, UNEXPECTED_COMMA)
+  rescue MissingAddressee
+    return L__M(:Miscellany, MISSING_ADDRESSEE)
   rescue InanimateAddressee
     return L__M(:Miscellany, CANT_TALK, noun)
   rescue SpeechImpediment
@@ -5325,46 +5260,125 @@ class InformLibrary < Inform::Ephemeral::Object
     return L__M(:Miscellany, NO_OBJECT)
   rescue CycleError
     return L__M(:Miscellany, TREE_ERROR)
-  rescue NoVerbRoutine, NotImplemented
-    return "Sorry, that action is not yet implemented."
-  rescue NoMethodError => e
-    log.error "Error parsing user command: #{e.class}: #{e}"
-    e.backtrace.each { |t| log.error t }
-    log.error "Parser was #{self.identity}"
-    log.error "Input was: #{@input}"
-    log.error "Actor was: #{@actor}"
-    log.error "Action was: #{@action}"
-    return "Sorry, something went wrong."
-  rescue TypeError => e
-    log.error "Error parsing user command: #{e.class}: #{e}"
-    e.backtrace.each { |t| log.error t }
-    log.error "Parser was #{self.identity}"
-    log.error "Input was: #{@input}"
-    log.error "Actor was: #{@actor}"
-    log.error "Action was: #{@action}"
-    return "Sorry, something went wrong."
-  rescue StandardError => e
-    log.error "Error parsing user command: #{e.class}: #{e}"
-    e.backtrace.each { |t| log.error t }
-    log.error "Parser was #{self.identity}"
-    log.error "Input was: #{@input}"
-    log.error "Actor was: #{@actor}"
-    log.error "Action was: #{@action}"
-    return "Sorry, something went seriously wrong."
   end
-  # def parse
+  # def late__error
+
+  def begin__action()
+    @inp1 = nil; @inp2 = nil; i = @results[1]
+    @inp1 = @results[2] if i >= 1
+    @inp2 = @results[3] if i >= 2
+
+    # inp1 and inp2 hold: object numbers, or 0 for "multiple object",
+    # or 1 for "a number or dictionary address"
+
+    if @inp1 == 1 then @noun = @special_number1 else @noun = @inp1 end
+    if @inp2 == 1
+      if @inp1 == 1 then @second = @special_number2
+      else               @second = @special_number1
+      end
+    else @second = @inp2
+    end
+
+    #  --------------------------------------------------------------
+
+    if @actor != @player
+
+    # The player's "orders" property can refuse to allow conversation
+    # here, by returning true.  If not, the order is sent to the
+    # other person's "orders" property.  If that also returns false,
+    # then: if it was a misunderstood command anyway, it is converted
+    # to an Answer action (thus "floyd, grrr" ends up as
+    # "say grrr to floyd").  If it was a good command, it is finally
+    # offered to the Order: part of the other person's "life"
+    # property, the old-fashioned way of dealing with conversation.
+
+      j = RunRoutines(@player, :orders)
+      if j == false || j.nil?
+        j = RunRoutines(@actor, :orders)
+        if j == false || j.nil?
+          if @action == :NotUnderstood
+            @results[3] = @actor; @actor = @player; @action = :Answer
+            return begin__action()
+          end
+          if RunLife(@actor, :Order) == 0 then L__M(:Order, 1, @actor); end
+        end
+      end
+      return turn__end()
+    end
+
+    # --------------------------------------------------------------
+    # Generate the action...
+
+    if (i == 0) ||
+       (i == 1 && @inp1 != 0) ||
+       (i == 2 && @inp1 != 0 && @inp2 != 0) ||
+       (i == @parameters && @inp1 != 0 && @inp2 != 0)
+      result = self.begin_action(@action, @noun, @second, 0)
+      print_routine_result(result)
+      return turn__end(result)
+    end
+
+    # ...unless a multiple object must be substituted.  First:
+    # (a) check the multiple list isn't empty;
+    # (b) warn the player if it has been cut short because too long;
+    # (c) generate a sequence of actions from the list
+    #     (stopping in the event of death or movement away).
+
+    @multiflag = true
+    if @multiple_object.empty?
+      return L__M(:Miscellany, 2)
+      return late__error() # rubocop: disable Lint/UnreachableCode
+    end
+    if @toomany_flag
+      @toomany_flag = false
+      print L__M(:Miscellany, 1)
+    end
+    i = @location
+    for l in @multiple_object
+      return if deadflag != 0
+      return L__M(:Miscellany, 51) if @location != i
+      PronounNotice(l)
+      @second = @results[3]
+      print "#{l}: "
+      if @inp1.nil?
+        @inp1 = l; result = self.begin_action(@action, l, @second, 0); @inp1 = nil
+      else
+        @inp2 = l; result = self.begin_action(@action, @noun, l, 0); @inp2 = nil
+      end
+      print_routine_result(result)
+    end
+    turn__end(result)
+  end
+  # def begin__action
+
+    # --------------------------------------------------------------
+
+  def turn__end(result = nil)
+
+    # No time passes if either (i) the verb was meta, or
+    # (ii) we've only had the implicit take before the "real"
+    # action to follow.
+    # if @notheld_mode then NoteObjectAcquisitions(); throw :continue; end
+    if @notheld_mode then NoteObjectAcquisitions(); return true; end
+    # throw :continue if @meta
+    return true if @meta
+    unless defined?(MULTI_PLAYER)
+    self.end_turn_sequence() if deadflag == 0
+    end
+    result
+  end
 
   def end_turn_sequence
     AdvanceWorldClock()
-    return if deadflag
+    return if deadflag != 0
     RunTimersAndDaemons()
-    return if deadflag
+    return if deadflag != 0
     RunEachTurnProperties()
-    return if deadflag
+    return if deadflag != 0
     TimePasses()
-    return if deadflag
+    return if deadflag != 0
     AdjustLight()
-    return if deadflag
+    return if deadflag != 0
     NoteObjectAcquisitions()
   end
 
@@ -5381,7 +5395,8 @@ class InformLibrary < Inform::Ephemeral::Object
     end # DEBUG
 
     contextualize
-    if (!@verb.nil? && @verb.meta?) || BeforeRoutines(a) == false
+    before = BeforeRoutines(a)
+    if (!@verb.nil? && @verb.meta?) || before == false
       rv = ActionPrimitive(a)
     end
     return rv
@@ -5395,9 +5410,9 @@ class InformLibrary < Inform::Ephemeral::Object
     color :black_on_white
     bgcolor :white
     print "***"
-    L__M(:Miscellany, 3) if deadflag == true
+    L__M(:Miscellany, 3) if deadflag != 0
     L__M(:Miscellany, 4) if deadflag == 2
-    if deadflag != false && deadflag != true && deadflag != 2
+    if deadflag != 0 && deadflag != 1 && deadflag != 2
       print " "
       DeathMessage()
       print " "
@@ -5415,7 +5430,7 @@ class InformLibrary < Inform::Ephemeral::Object
   end
 
   def AdvanceWorldClock
-    return unless defined? SINGLE_PLAYER
+    return if defined?(MULTI_PLAYER)
     @turns += 1
     if !@the_time.nil?
       if @time_rate >= 0 then @the_time = @the_time + @time_rate
@@ -5431,10 +5446,10 @@ class InformLibrary < Inform::Ephemeral::Object
   end
 
   def RunTimersAndDaemons
-    return if !defined?(SINGLE_PLAYER)
+    return if defined?(MULTI_PLAYER)
     if defined?(DEBUG)
       if (@debug_flag & 4) != 0
-        @active_timers.each do |the_timer|
+        @the_timers.each do |the_timer|
           next if the_timer.nil?
           print name(the_timer & !WORD_HIGHBIT) + ": "
           if (the_timer & WORD_HIGHBIT) != 0 then print "daemon"
@@ -5446,21 +5461,21 @@ class InformLibrary < Inform::Ephemeral::Object
       end
     end # DEBUG
 
-    @active_timers.each do |the_timer|
+    @the_timers.each do |the_timer|
       break if deadflag != 0
       next if the_timer.nil?
-      if (the_timer & WORD_HIGHBIT) != 0 then RunRoutines(the_timer & !WORD_HIGHBIT, daemon)
-      elsif the_timer.time_left == 0
+      if the_timer.respond_to?(:daemon) then RunRoutines(the_timer, :daemon)
+      elsif (the_timer.&(:time_left) || nil) == 0
         StopTimer(the_timer)
-        RunRoutines(the_timer, time_out)
+        RunRoutines(the_timer, :time_out)
       else
-        the_timer.time_left = the_timer.time_left - 1
+        the_timer.&(:time_left, the_timer.|(:time_left, 0) - 1)
       end
     end
   end
 
   def RunEachTurnProperties
-    return unless defined? SINGLE_PLAYER
+    return if defined?(MULTI_PLAYER)
     @scope_reason = scope_reason = EACH_TURN_REASON; @verb_word = nil
     DoScopeAction(@location, scope_reason)
     SearchScope(ScopeCeiling(@player), @player, nil)
@@ -5477,7 +5492,7 @@ class InformLibrary < Inform::Ephemeral::Object
   end
 
   def AfterGameOver
-    return unless defined? SINGLE_PLAYER
+    return if defined?(MULTI_PLAYER)
     prompt
     @temp_global = 0
     i = @parse[1]
@@ -5506,13 +5521,15 @@ class InformLibrary < Inform::Ephemeral::Object
 
   def R_Process(a, i, j)
     s1 = @inp1; s2 = @inp2
-    @inp1 = i; @inp2 = j; InformLibrary.begin_action(a, i, j, 1)
+    @inp1 = i; @inp2 = j; result = self.begin_action(a, i, j, 1)
+    print_routine_result(result)
+  ensure
     @inp1 = s1; @inp2 = s2
   end
 
   def NoteObjectAcquisitions
-    return unless defined? SINGLE_PLAYER
-    player.objectloop.each do |i|
+    return if defined?(MULTI_PLAYER)
+    player.objectloop do |i|
       if i.hasnt?(:moved)
         give i, :moved
         if i.has?(:scored)
@@ -5581,24 +5598,27 @@ class InformLibrary < Inform::Ephemeral::Object
 
   def ZRegion(z)
     return 0 if z.nil?
-    case z.class # Left over from Inform 5
+    return 1 if z.object?
+    case z # Left over from Inform 5
     # when NilClass then 0
-    when Object, Class then 1
+    when Class then 1
     when Symbol then 2
     when String then 3
     end
   end
 
-  def PrintOrRun(obj, prop, flag = 0)
+  def PrintOrRun(obj, prop, flag = false)
     si = obj.inflib; obj.inflib = inflib
-    return RunRoutines(obj, prop) if obj.properties.include?(prop)
+    # return RunRoutines(obj, prop) if obj.properties.include?(prop)
+    return RunRoutines(obj, prop) if obj.properties[prop].is_a?(Array)
     if obj.respond_to?(prop) && !obj.method(prop).nil?
       result = obj.send(prop)
       if result.is_a?(Class) || result.nil? || obj.linked?(prop)
         return RunTimeError(2, obj, prop)
       elsif result.is_a?(String)
         print result.to_s
-        new_line if flag == 0
+        raise "Why is flag true?" if flag == true
+        new_line if flag == false
         return true
       else
         return result
@@ -5610,12 +5630,12 @@ class InformLibrary < Inform::Ephemeral::Object
     obj.inflib = si
   end
 
-  def PrintOrRunVar(var, flag)
+  def PrintOrRunVar(var, flag = false)
     if var.respond_to?(:name)
       print var.name
     elsif var.is_a?(String)
       print var
-      new_line if flag == 0
+      new_line if flag == false
     elsif var.respond_to?(:call)
       return var.call
     else
@@ -5625,15 +5645,77 @@ class InformLibrary < Inform::Ephemeral::Object
   end
 
   def ValueOrRun(obj, prop)
-    value = obj.respond_to?(prop) ? obj.send(prop) : RunRoutines(obj, prop)
-    return value.number? ? value.to_i : value
+    if obj.properties.key?(prop)
+      value = obj.&(prop)
+      return value.number? ? value.to_i : value
+    elsif obj.respond_to?(prop)
+      value = obj.send(prop)
+      return value.number? ? value.to_i : value
+    end
+    return RunRoutines(obj, prop)
   end
 
   def RunRoutines(obj, prop)
     obj = @real_location if obj == thedark && prop.notin?(:initial, :short_name, :description, :life)
     return false if prop.nil?
-    val = obj.&(prop); return val unless val.nil?
-    return reacts_to?(obj, prop)
+
+    value = obj.&(prop)
+    return print_routine_result(value) unless value.nil?
+
+    reacts_to?(obj, prop)
+  end
+
+# ----------------------------------------------------------------------------
+
+  def StartTimer(obj, timer)
+    return false if @the_timers.include?(obj)
+    if @the_timers.length >= MAX_TIMERS
+      RunTimeError(4)
+      return
+    end
+    if obj.&(:time_left) == 0
+      RunTimeError(5,obj)
+      return
+    end
+    @the_timers << obj
+    obj.&(:time_left, timer)
+  end
+
+  def StopTimer(obj)
+    return false unless @the_timers.include?(obj)
+    if obj.&(:time_left) == 0
+      RunTimeError(5,obj)
+      return
+    end
+    @the_timers.delete(obj)
+    obj.&(:time_left, 0)
+  end
+
+  def StartDaemon(obj)
+    return false if @the_timers.include?(obj)
+    RunTimeError(4) if @the_timers.length >= MAX_TIMERS
+    @the_timers << obj
+  end
+
+  def StopDaemon(obj)
+    return false unless @the_timers.include?(obj)
+    @the_timers.delete(obj)
+  end
+
+# ----------------------------------------------------------------------------
+
+  def DisplayStatus
+    if @sys_statusline_flag == 0 then @sline1 = @score; @sline2 = @turns
+    else @sline1 = @the_time/60; @sline2 = @the_time%60; end
+  end
+
+  def SetTime(t, s)
+    @the_time = t; @time_rate = s; @time_step = 0
+    @time_step = 0 - s if s < 0
+  end
+
+  def NotifyTheScore
+    print "\n[";  L__M(:Miscellany, 50, @score - @last_score);  print ".]\n"
   end
 # ----------------------------------------------------------------------------
 end