inform6lib 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67d43a91363dccdbd3470eda7c3dd46a2afcb3face3cafeaf4fcec1a58228dd0
-  data.tar.gz: f70a79847dc16624691bfdc018157d22855065209e6e1b2ffb58fda5e7e945d8
+  metadata.gz: a40c23e7e9dcb8a291939c84699bdb885ca9101117b214875ec1ac6019ca486a
+  data.tar.gz: 500c0ba61643ccfd81a11ba98aac6a1152a59e644b5a871f1ffdbdc4fdfee4ec
 SHA512:
-  metadata.gz: e7c8338747716e068f2295f1070d666752fee22cf2092943a0e0b97215d8dd9cd3dda9d7c233160cad110695f027cdea64021a45d83aec81b83dfde98b1d8962
-  data.tar.gz: f6060216dca42a2232080ca6e36113c9ae549ceed031906e8f233cb1c5f9d9dfc1514a0315c95bb4b0d0ad1d23b01880de09cff7bdf2fac8405c7f9c12a3ac4d
+  metadata.gz: c2ab599b6af58b719f1e24bdb5ed7ac08ece5139139499bf50f8817380c0e3ed4e7a67b38d5b5a17c17bf18760411a1086d3d2412981f419f886e96b3cfc7c3c
+  data.tar.gz: be343e7f21440e7c127b3ff51c53c7d558bab0032767aa218a95b88e289eb2cfc1b9797508bba8df9e21a0aa0348fc3251568b4577d48c535e4ee6512ae0de25

data/lib/inform/parserm.h.rb

@@ -251,11 +251,11 @@ module Parser
   @the_timers = []
   @active_timers                   # Number of timers/daemons actives
 
-  @score                           # The current score
+  @score = 0                       # The current score
   @last_score                      # Score last turn (for testing for changes)
   @notify_mode = true              # Score notification
-  @places_score                    # Contribution to score made by visiting
-  @things_score                    # Contribution made by acquisition
+  @places_score = 0                # Contribution to score made by visiting
+  @things_score = 0                # Contribution made by acquisition
 
 # ------------------------------------------------------------------------------
 #   The player
@@ -4823,12 +4823,24 @@ module Parser
     PrefaceByArticle(o, 0); @indef_mode = i;
   end
 
+  def PrintShortName(o)
+    i = @indef_mode; @indef_mode = nil
+    PSN__(o); @indef_mode = i
+  end
+
+  def EnglishNumber(n); LanguageNumber(n); end
+
   def NumberWord(o)
     n = LanguageNumbers.find { |k, _v| k == o }
     return n.last if !n.nil? && !n.empty? # TODO: Be more syntactically precise
     return 0
   end
 
+  def RandomEntry(tab)
+    return RunTimeError(8) if !tab.respond_to?(:empty?) || tab.empty?
+    tab.sample
+  end
+
 # ----------------------------------------------------------------------------
 
   # The ParserError error class
@@ -5050,14 +5062,23 @@ class InformLibrary < Inform::Ephemeral::Object
     @player.unmute if @player.respond_to?(:unmute) && deadflag != 0
     enqueue(command: @buffer.dup)
 
-    if deadflag != 0
-      log.debug "#{@player} is entering the death state" # TODO: Remove
-      :death
-    end
+    return session.state if deadflag == 0 && respond_to?(:session) && !session.nil?
+    return __method__ if deadflag == 0
 
-    return session.state if respond_to?(:session) && !session.nil?
+    AfterLife() if deadflag != 2
+    return :playing if deadflag == 0
 
-    __method__
+    OBIT_HEAD()
+    println ScoreSub()
+    DisplayStatus()
+    log.debug "#{@player} is entering the death state" # TODO: Remove
+    RRQPL()
+  end
+
+  def death
+    return :playing if deadflag == 0
+
+    AfterGameOver()
   end
 
   def stop
@@ -5098,37 +5119,26 @@ class InformLibrary < Inform::Ephemeral::Object
 
     @results = [nil, 0, nil, nil]; @meta = false
 
-    # 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
+    return late__error() if @deadflag == 0
+
     AfterLife() if deadflag != 2
-    return very__late__error if deadflag == 0
+    if deadflag == 0
+      very__late__error()
+      return late__error()
+    end
 
     OBIT_HEAD()
-    ScoreSub()
+    println ScoreSub()
     DisplayStatus()
-    AfterGameOver()
+    RRQPL()
   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."
+    return if @deadflag != 0
+    return if @score == @last_score
+
+    NotifyTheScore() if @notify_mode == true
+    @last_score = @score
   end
 
   def late__error
@@ -5260,6 +5270,14 @@ class InformLibrary < Inform::Ephemeral::Object
     return L__M(:Miscellany, NO_OBJECT)
   rescue CycleError
     return L__M(:Miscellany, TREE_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
 
@@ -5487,23 +5505,25 @@ class InformLibrary < Inform::Ephemeral::Object
   end
 
   def RRQPL
-    L__M(:Miscellany, 5)
-    AfterGameOver()
+    print L__M(:Miscellany, 5)
+    :death
   end
 
   def AfterGameOver
-    return if defined?(MULTI_PLAYER)
-    prompt
+    return :playing if defined?(MULTI_PLAYER)
+
     @temp_global = 0
-    i = @parse[1]
+    i = @buffer.to_s.split(WordOrCommaSplitPattern).first.to_s.downcase
     if [QUIT1__WD, QUIT2__WD].include?(i)
-      quit
+      return __quit
     end
     if i == RESTART__WD
-      restart
+      return __restart
     end
     if i == RESTORE__WD
       RestoreSub()
+      return :playing if deadflag == 0
+
       return RRQPL()
     end
     if [FULLSCORE1__WD, FULLSCORE2__WD].include?(i) && TASKS_PROVIDED == 0
@@ -5514,8 +5534,8 @@ class InformLibrary < Inform::Ephemeral::Object
       new_line; Amusing()
       return RRQPL()
     end
-    L__M(:Miscellany, 8)
-    return RRQL()
+    print L__M(:Miscellany, 8)
+    :death
   end
   alias RRQL AfterGameOver
 
@@ -5533,8 +5553,8 @@ class InformLibrary < Inform::Ephemeral::Object
       if i.hasnt?(:moved)
         give i, :moved
         if i.has?(:scored)
-          self.score = self.score + OBJECT_SCORE
-          self.things_score = self.things_score + OBJECT_SCORE
+          @score = @score + OBJECT_SCORE
+          @things_score = @things_score + OBJECT_SCORE
         end
       end
     end
@@ -5659,6 +5679,8 @@ class InformLibrary < Inform::Ephemeral::Object
     obj = @real_location if obj == thedark && prop.notin?(:initial, :short_name, :description, :life)
     return false if prop.nil?
 
+    # TODO: Is this really necessary?
+    obj.safe_refresh if obj.respond_to?(:safe_refresh)
     value = obj.&(prop)
     return print_routine_result(value) unless value.nil?
 
@@ -5679,6 +5701,7 @@ class InformLibrary < Inform::Ephemeral::Object
     end
     @the_timers << obj
     obj.&(:time_left, timer)
+    return
   end
 
   def StopTimer(obj)
@@ -5689,17 +5712,20 @@ class InformLibrary < Inform::Ephemeral::Object
     end
     @the_timers.delete(obj)
     obj.&(:time_left, 0)
+    return
   end
 
   def StartDaemon(obj)
     return false if @the_timers.include?(obj)
     RunTimeError(4) if @the_timers.length >= MAX_TIMERS
     @the_timers << obj
+    return
   end
 
   def StopDaemon(obj)
     return false unless @the_timers.include?(obj)
     @the_timers.delete(obj)
+    return
   end
 
 # ----------------------------------------------------------------------------

data/lib/inform/verblibm.h.rb

@@ -385,7 +385,7 @@ module Verbs
         if k2.nil? || k2.list_together != j.list_together
           # Omit_WL2
 
-          if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == 1
+          if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == true
             # Omit_FL2
             i += 1
             senc -= 1
@@ -446,7 +446,7 @@ module Verbs
           if listing_size == 1
             # Omit_WL2
 
-            if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == 1
+            if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == true
               # Omit_FL2
               i += 1; senc -= 1
               next
@@ -574,7 +574,7 @@ module Verbs
 
       # label Omit_WL2
 
-      if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == 1
+      if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == true
         # Omit_FL2
         i += 1; senc -= 1
         next
@@ -651,7 +651,7 @@ module Verbs
         if k.nil? || (k.list_together != j.list_together)
           # Omit_WL
 
-          if WriteBeforeEntry(j, depth, i - senc, c_style, wlf_indent) == 1
+          if WriteBeforeEntry(j, depth, i - senc, c_style, wlf_indent) == true
             # Omit_FL
             j = NextEntry(j, depth, lt_value, c_style, &query)
             i += 1
@@ -775,7 +775,7 @@ module Verbs
 
       # label Omit_WL
 
-      if WriteBeforeEntry(j, depth, i - senc, c_style, wlf_indent) == 1
+      if WriteBeforeEntry(j, depth, i - senc, c_style, wlf_indent) == true
         # Omit_FL
         j = NextEntry(j, depth, lt_value, c_style, &query)
         i += 1
@@ -1030,8 +1030,7 @@ module Verbs
   # TODO: Figure out how this could work in a non-blocking IO system. FIXME
   # The read method would have to create an evented future promise or
   # something. That seems like it would cause this code to block on the
-  # read command, and avoiding such blocking behavior was the entire point
-  # of using Netty.
+  # read command.
   def YesOrNo
     loop do
       @input = __read
@@ -1158,7 +1157,7 @@ module Verbs
   def Achieved(num)
     if task_done[num].nil?
       task_done[num] = true
-      score = score + TaskScore(num)
+      @score = @score + TaskScore(num)
     end
   end
 
@@ -1178,8 +1177,8 @@ module Verbs
   end
 
   def FullScoreSub
-    ScoreSub()
-    return false if score == 0 || TASKS_PROVIDED == 1
+    println ScoreSub()
+    return false if @score == 0 || TASKS_PROVIDED == 1
     new_line
     L__M(:FullScore, 1)
     for i in 0..NUMBER_TASKS
@@ -1188,15 +1187,15 @@ module Verbs
         PrintTaskName(i)
       end
     end
-    if things_score != 0
-      PANum(things_score)
+    if @things_score != 0
+      PANum(@things_score)
       L__M(:FullScore, 2)
     end
-    if places_score != 0
-      PANum(places_score)
+    if @places_score != 0
+      PANum(@places_score)
       L__M(:FullScore, 3)
     end
-    new_line; PANum(score); L__M(:FullScore, 4)
+    new_line; PANum(@score); L__M(:FullScore, 4)
   end
 
 # ----------------------------------------------------------------------------
@@ -2399,6 +2398,38 @@ module Verbs
 #   Debugging verbs
 # ----------------------------------------------------------------------------
 
+# if defined?(DEBUG)
+
+  def TraceOnSub; @parser_trace=1; "[Trace on.]"; end
+
+  def TraceLevelSub
+      @parser_trace = @noun
+      print "[Parser tracing set to level #{@parser_trace} .]\n"
+  end
+
+  def TraceOffSub; @parser_trace=0; "Trace off."; end
+
+  def RoutinesOnSub;  @debug_flag = @debug_flag | 1;  "[Message listing on.]"; end
+
+  def RoutinesOffSub; @debug_flag = @debug_flag & 14; "[Message listing off.]"; end
+
+  def ActionsOnSub;   @debug_flag = @debug_flag | 2;  "[Action listing on.]"; end
+
+  def ActionsOffSub;  @debug_flag = @debug_flag & 13; "[Action listing off.]"; end
+
+  def TimersOnSub;    @debug_flag = @debug_flag | 4;  "[Timers listing on.]"; end
+
+  def TimersOffSub;   @debug_flag = @debug_flag & 11; "[Timers listing off.]"; end
+
+  def ChangesOnSub;   @debug_flag = @debug_flag | 8;  "[Changes listing on.]"; end
+
+  def ChangesOffSub;  @debug_flag = @debug_flag & 7;  "[Changes listing off.]"; end
+
+  def PredictableSub
+    setrandom(100)
+    "[Random number generator now predictable.]"
+  end
+
   def XTestMove(obj, dest)
     if obj.is_a?(InformLibrary) || obj == LibraryMessages || obj.is_a?(Inform::Ephemeral::Object)
       println "[Can't move #{obj.name}: it's a system object.]"
@@ -2473,6 +2504,8 @@ module Verbs
     "Nothing is in scope." if @x_scope_count == 0
   end
 
+# end # defined?(DEBUG)
+
 # ----------------------------------------------------------------------------
 #   Finally: the mechanism for library text (the text is in the language defn)
 # ----------------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inform6lib
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Nels Nelson
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.24
 specification_version: 4
 summary: The Inform6 Library Ruby Port is a faithful port of the Inform6 interactive
   fiction standard library in Ruby.