inform6lib 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0a615fe20b2f83055cddf811f048a2a49484ffadf36f6530484f17dff94ee6
-  data.tar.gz: 68f0f81e22933676a396445659d4e5ab73caadc799612c1e67f21036ad4aefa8
+  metadata.gz: a40c23e7e9dcb8a291939c84699bdb885ca9101117b214875ec1ac6019ca486a
+  data.tar.gz: 500c0ba61643ccfd81a11ba98aac6a1152a59e644b5a871f1ffdbdc4fdfee4ec
 SHA512:
-  metadata.gz: d8240c06d833b2ccdf0e0051a5e61c774c40178d919e9a39029d6935157e7d0b72b8553efaa11cc80f7ee9c1a65b28ec763ac4b2d92f56b536df7ed0ae230047
-  data.tar.gz: 312174cb06f649bc4d8e192fe901bfdf97b9a72d7d679bdbc6d9bbf9d9855d305ee01388cfd92706a8a7e71c7360cdf6da19d8c95ed583f65a12a96b26dd8e14
+  metadata.gz: c2ab599b6af58b719f1e24bdb5ed7ac08ece5139139499bf50f8817380c0e3ed4e7a67b38d5b5a17c17bf18760411a1086d3d2412981f419f886e96b3cfc7c3c
+  data.tar.gz: be343e7f21440e7c127b3ff51c53c7d558bab0032767aa218a95b88e289eb2cfc1b9797508bba8df9e21a0aa0348fc3251568b4577d48c535e4ee6512ae0de25

data/lib/inform/parserm.h.rb

@@ -5062,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
+
+    OBIT_HEAD()
+    println ScoreSub()
+    DisplayStatus()
+    log.debug "#{@player} is entering the death state" # TODO: Remove
+    RRQPL()
+  end
+
+  def death
+    return :playing if deadflag == 0
 
-    __method__
+    AfterGameOver()
   end
 
   def stop
@@ -5110,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
@@ -5272,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
 
@@ -5499,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
@@ -5526,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
 

data/lib/inform/verblibm.h.rb

@@ -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
@@ -1178,7 +1177,7 @@ module Verbs
   end
 
   def FullScoreSub
-    ScoreSub()
+    println ScoreSub()
     return false if @score == 0 || TASKS_PROVIDED == 1
     new_line
     L__M(:FullScore, 1)
@@ -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.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Nels Nelson