inform6lib 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9f1deb9cf509ad1583e444225fae2d0e94aeee6a150844e83b39818ffae1792
-  data.tar.gz: cf1bf259e26d5496ed8bd6d1e2daeeebdc8df95915e61d66a90a6646def02c68
+  metadata.gz: eb96a12c00fe171072a37b734b09ace326c78f5c2b7e5f64a8a288d0c44d5c3c
+  data.tar.gz: 18602dac5e23311f3b3f314c9c3f4a3fcc4599d2ed6c6047ff48957d6399f5a7
 SHA512:
-  metadata.gz: 32ee527e72c9648a864e2f4f0d06a750d92e8835c3954118d7a5283c636ec7e701ac81d13768f04c602753fb12cc27d2df0f4980f98a0e0abb1ea17b4eb6ff70
-  data.tar.gz: 615afb3f2854063b9964289e720290124c9196bd692c5b576de3cd8542ce7c501117407106426d895a5efbea48de49647f62d42f302bec7a372fd37225900499
+  metadata.gz: 66f4af9e13875301a235819e59da8d7597408c350d35f5c9a5858445d154d9bf02c0d3636bfc9620b4e767f5cff215dd9e0546bfad683a18dbe8435f1897e9cf
+  data.tar.gz: c0c89127eaf9083c65becbfb55580322ac2d74a7dfa192745e52a8528fdbd0c19dc6b8407182583161f525ec1fdb02b166933a34f54b95e4ad7a2bc8e338d326

data/Rakefile

@@ -47,7 +47,7 @@ task :verify do
   system('bundle', 'exec', 'rspec', 'spec/verify_gem_spec.rb') or abort
   system('bundle', 'exec', 'rake', 'clean')
 end
-task verify: :explode
+task verify: %i[package explode]
 
 desc 'Host dev gem'
 task :devhost do

data/lib/inform/parserm.h.rb

@@ -516,7 +516,7 @@ module Parser
 
   # If you want to use the third-person of the narrative voice, you will
   # need to replace this selfobj with your own.
-  SelfObj = Object("(self object)") {
+  SelfObj = Inform::Ephemeral::Object.new("(self object)") {
     with {
       def short_name; return L__M(:Miscellany, 18); end
       def description; return L__M(:Miscellany, 19); end
@@ -4980,203 +4980,9 @@ class NoVerbRoutine < StandardError; end
 
 class CycleError < StandardError; end
 
-# The Inform module
-module Inform
-# The Rules module defines functional additions to the Session state
-# machine. The additional functionality supports user interface patterns
-# commonly found in interactive fiction games, specifically those created
-# using Inform.  Supporting the principle of least surprise mandates that
-# the expectations held by the users of such games should be satisfied.
-# TODO: Perhaps this should go in the mudlib
-module Rules
-  def ask(s = nil)
-    println s if s.is_a?(String)
-    if session
-      @previous ||= session.state
-      session.state = :asked
-    end
-    # true
-    session.state
-  end
-
-  def yesorno(s = nil)
-    print s.to_s unless s.nil?
-    unless session.nil?
-      @previous ||= session.state
-      session.state = :asked
-    end
-    session&.state || false
-  end
-
-  def asked
-    yesorno?
-  end
-
-  def yesorno?
-    reset_io # TODO: Remove this. Why is the buffer getting a newline character added to it?
-    case @buffer.split.first
-    when /^(y|yes)$/i
-      println(resume)
-      responded
-    when /^(n|no)$/i
-      prompt
-      responded
-    else
-      L__M(:Quit, 1); print "> "
-      session&.state
-    end
-  end
-
-  def disambiguate
-    session.state = :disambiguating unless session.nil?
-    false
-  end
-
-  def disambiguating
-    WhichOne() if @ambiguity
-    session.state = :playing unless session.nil?
-  end
-
-  def complete
-    session.state = :completing unless session.nil?
-    false
-  end
-
-  def completing
-    Incomplete() if @ambiguity
-    session.state = :playing unless session.nil?
-  end
-
-  SolicitedStates = %i[asked yesorno? solicited].freeze
-  def solicit(s = nil)
-    if !session.nil? && !SolicitedStates.include?(session.state)
-      prompt s if s.is_a?(String)
-      @previous ||= session.state
-    end
-    session.state = :solicited unless session.nil?
-  end
-
-  def disambiguated
-    session.state = :playing unless session.nil?
-    queue @input
-  end
-
-  def completed
-    session.state = :playing unless session.nil?
-    queue @input
-  end
-
-  def solicited
-    responded? @input
-  end
-
-  def responded
-    session&.state = previous_state = @previous
-    @previous = nil
-    session&.state || previous_state
-  end
-
-  def asked?
-    session&.state == :asked
-  end
-
-  def disambiguating?
-    session&.state == :disambiguating
-  end
-
-  def completing?
-    session&.state == :completing
-  end
-
-  def solicited?
-    session&.state == :solicited
-  end
-
-  def responded?(_s)
-    reset_io # TODO: Remove this. Why is the buffer getting a newline character added to it?
-    if @buffer.empty?
-      prompt
-    else
-      responded
-      @consult_words = @input = @buffer.dup
-      result = resume
-      println(result)
-      if result == :playing
-        reset_prompt
-        prompt
-      end
-    end
-    session&.state
-  end
-
-  More = Struct.new(:text, :page_index)
-
-  DefaultMoreParameters = {
-    page_index: 0, limit: 10, help: nil, done: :playing
-  }.freeze
-
-  # This method supports the MoreSub verb implementation.
-  def more(text = nil, params = {})
-    params = DefaultMoreParameters.merge(params)
-    unless session
-      println text
-      return params[:done]
-    end
-    input = @buffer.dup
-    @more ||= More.new([], params[:page_index])
-
-    if text
-      @more.text = text
-    else
-      text = @more.text
-    end
-
-    case input
-    when /\?/
-      println params[:help] || "<Help for More goes here>"
-    when /^(q|quit)$/
-      @more = nil
-      @prompt = nil
-      prompt
-      return session.state = params[:done]
-    else
-      text = @more.text.split('\n') if @more.text.is_a? String
-      unless text.is_a?(Array)
-        println "[Error: Format problem using the more command -- cannot handle given text.]"
-        return session.state = params[:done]
-      end
-
-      println text[@more.page_index, params[:limit]].join("\n")
-
-      @more.page_index += params[:limit]
-    end
-
-    percent_complete = [100, (100 * (@more.page_index.to_f / text.length)).floor].min
-    @more = nil unless @more.page_index < @more.text.length
-
-    new_line
-    print "--More--(#{percent_complete}%)"
-
-    if percent_complete < 100
-      prompt " [?]: "
-      session.state = :more
-    else
-      new_line
-      prompt nil
-      session.state = params[:done]
-    end
-  end
-  # def more
-end
-# module Rules
-end
-# module Inform
-
 # The InformLibrary class.
 # Inform 6 defines this as an Object.
 class InformLibrary < Inform::Ephemeral::Object
-  REGISTRY = Struct.new(:memo).new(defined?(Java) ? java.util.concurrent.ConcurrentHashMap.new : {})
-  include Inform::Rules
   include Inform::Parser
 
   attr_accessor :player

data/lib/inform/verblibm.h.rb

@@ -101,7 +101,7 @@ module Verbs
 
   def RunTimeError(n, p1 = nil, p2 = nil)
     if defined? DEBUG
-      print "** Library error #{n} (p1,p2) **\n** "
+      print "** Library error #{n} (#{p1},#{p2}) **\n** "
       case n
       when 1  then   print "preposition not found (this should not occur)"
       when 2  then   print "Property value not routine or string: \"#{p2}\" of \"#{p1}\"" +
@@ -1359,7 +1359,6 @@ module Verbs
 
     # Transfer the item.
 
-    @player.publish L__M(:Take, 15, noun)
     move item, @player
 
     # Send "after" message to the object letting go of the item, if any.
@@ -1413,7 +1412,6 @@ module Verbs
     move noun, @player.parent
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Drop, 5, noun)
     return L__M(:Drop, 4, noun)
   end
 
@@ -1453,7 +1451,6 @@ module Verbs
       @action = :PutOn
     end
     return if @keep_silent
-    @player.publish L__M(:PutOn, 9, noun)
     return L__M(:PutOn, 7) if @multiflag
     L__M(:PutOn, 8, noun)
   end
@@ -1496,7 +1493,6 @@ module Verbs
       @action = :Insert
     end
     return true if @keep_silent
-    @player.publish L__M(:Insert, 10, noun)
     return L__M(:Insert, 8, noun) if @multiflag
     L__M(:Insert, 9, noun)
   end
@@ -1556,7 +1552,6 @@ module Verbs
   def GiveSub
     return L__M(:Give, 1, noun) if parent(noun) != @player
     if second == @player
-      @player.publish A(player) + " juggles " + a(noun) + " for a second or two."
       return L__M(:Give, 2, noun)
     end
     return false if RunLife(second, :Give)
@@ -1619,7 +1614,6 @@ module Verbs
     return true if AfterRoutines()
     return true if @keep_silent
     Locale(noun)
-    @player.publish L__M(:Enter, 8, noun)
     L__M(:Enter, 5, noun)
   end
 
@@ -1644,7 +1638,6 @@ module Verbs
 
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Exit, 5, parent_obj)
     L__M(:Exit, 3, parent_obj)
     LookSub(true)
   end
@@ -1704,7 +1697,6 @@ module Verbs
     end
 
     orig_loc = @real_location
-    @player.publish L__M(:Go, 7, noun) unless @keep_silent
 
     if movewith.nil? then move @player, j else move movewith, j end
 
@@ -1729,8 +1721,6 @@ module Verbs
       @location = thedark; @lightflag = false
     end
 
-    @player.publish L__M(:Go, 8, ArrivalDir(j, orig_loc)) unless @keep_silent
-
     return true if AfterRoutines()
     return true if @keep_silent
     LookSub(true)
@@ -1937,7 +1927,6 @@ module Verbs
     end
 
     L__M(:Look, 3, @player) if @print_player_flag
-    L__M(:Look, 9, @player) if @player.respond_to?(:builder?) && @player.builder?
     new_line
 
     # TODO: FIXME
@@ -2012,17 +2001,6 @@ module Verbs
     unless @keep_silent
       if noun.has? :animate
         @action = :LookAt
-        if noun.in?(@player)
-          @player.publish A(@player) + " looks at " + hisorher(@player, noun) + "."
-        elsif noun != @player
-          @player.publish A(@player) + " looks over at " + a(noun) + "."
-        end
-      else
-        if noun.in?(@player)
-          @player.publish A(@player) + " examines " + hisorher(@player, noun) + "."
-        else
-          @player.publish A(@player) + " examines " + a(noun) + "."
-        end
       end
     end
     i = noun.description
@@ -2039,7 +2017,6 @@ module Verbs
 
   def LookUnderSub
     return L__M(:LookUnder, 1) if @location == thedark
-    @player.publish L__M(:LookUnder, 3, noun)
     L__M(:LookUnder, 2)
   end
 
@@ -2052,7 +2029,6 @@ module Verbs
     return if ObjectIsUntouchable(noun)
     f = VisibleContents(noun)
     if noun.has? :supporter
-      @player.publish L__M(:Search, 8, noun) unless @keep_silent
       return L__M(:Search, 2, noun) if f == 0
       return L__M(:Search, 3, noun)
     end
@@ -2060,7 +2036,6 @@ module Verbs
     return L__M(:Search, 5, noun) if noun.hasnt?(:transparent) && noun.hasnt?(:open)
     return true if AfterRoutines()
 
-    @player.publish L__M(:Search, 8, noun) unless @keep_silent
     return L__M(:Search, 6, noun) if f == 0
     L__M(:Search, 7, noun)
   end
@@ -2077,7 +2052,6 @@ module Verbs
     take noun, :locked
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Unlock, 5, noun)
     L__M(:Unlock, 4, noun)
   end
 
@@ -2090,7 +2064,6 @@ module Verbs
     give noun, :locked
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Lock, 6, noun)
     L__M(:Lock, 5, noun)
   end
 
@@ -2101,7 +2074,6 @@ module Verbs
     give noun, :on
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:SwitchOn, 4, noun)
     L__M(:SwitchOn, 3, noun)
   end
 
@@ -2112,7 +2084,6 @@ module Verbs
     take noun, :on
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:SwitchOff, 4, noun)
     L__M(:SwitchOff, 3, noun)
   end
 
@@ -2124,7 +2095,6 @@ module Verbs
     give noun, :open
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Open, 6, noun)
     if noun.has?(:container) && noun.hasnt?(:transparent) &&
        @location != thedark &&
        VisibleContents(noun) != 0 && IndirectlyContains(noun, @player)
@@ -2140,7 +2110,6 @@ module Verbs
     take noun, :open
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Close, 4, noun)
     L__M(:Close, 3, noun)
   end
 
@@ -2150,7 +2119,6 @@ module Verbs
     take noun, :worn
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Disrobe, 3, noun)
     L__M(:Disrobe, 2, noun)
   end
 
@@ -2162,7 +2130,6 @@ module Verbs
     give noun, :worn
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Wear, 5, noun)
     L__M(:Wear, 4, noun)
   end
 
@@ -2177,7 +2144,6 @@ module Verbs
     noun.destroy
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Eat, 3, noun)
     L__M(:Eat, 2, noun)
   end
 
@@ -2285,19 +2251,19 @@ module Verbs
     L__M(:PushDir, 1, noun)
   end
 
-  def RubSub; @player.publish L__M(:Rub, 2, noun); L__M(:Rub, 1, noun); end
+  def RubSub; L__M(:Rub, 1, noun); end
 
   def SetSub; L__M(:Set, 1, noun); end
 
   def SetToSub; L__M(:SetTo, 1, noun); end
 
-  def SingSub; @player.publish L__M(:Sing, 2, noun); L__M(:Sing, 1, noun); end
+  def SingSub; L__M(:Sing, 1, noun); end
 
-  def SleepSub; @player.publish L__M(:Sleep, 2, noun); L__M(:Sleep, 1, noun); end
+  def SleepSub; L__M(:Sleep, 1, noun); end
 
-  def SmellSub; @player.publish L__M(:Smell, 2, noun); L__M(:Smell, 1, noun); end
+  def SmellSub; L__M(:Smell, 1, noun); end
 
-  def SorrySub; @player.publish L__M(:Sorry, 2, noun); L__M(:Sorry, 1, noun); end
+  def SorrySub; L__M(:Sorry, 1, noun); end
 
   def SqueezeSub
     return if ObjectIsUntouchable(noun)
@@ -2321,7 +2287,6 @@ module Verbs
   end
 
   def ThinkSub
-    @player.publish L__M(:Think, 2, noun)
     L__M(:Think, 1, noun)
   end
 
@@ -2350,7 +2315,6 @@ module Verbs
     return L__M(:Touch, 3, noun) if noun == @player
     return if ObjectIsUntouchable(noun)
     return L__M(:Touch, 1, noun) if noun.has? :animate
-    @player.publish L__M(:Touch,4,noun)
     L__M(:Touch,2,noun)
   end
 
@@ -2363,7 +2327,6 @@ module Verbs
   end
 
   def WaitSub
-    @player.publish L__M(:Wait, 2, noun)
     return true if AfterRoutines()
     L__M(:Wait, 1, noun)
   end
@@ -2378,16 +2341,13 @@ module Verbs
 
   def WaveSub
     return L__M(:Wave, 1, noun) if !noun.nil? && (noun.has?(:clothing, :worn) || noun.notin?(@player))
-    @player.publish L__M(:Wave, 3, noun)
     L__M(:Wave, 2, noun)
   end
 
   def WaveHandsSub
     if noun
-      @player.publish L__M(:WaveHands, 4, noun)
       L__M(:WaveHands, 3, noun)
     else
-      @player.publish L__M(:WaveHands, 2, noun)
       L__M(:WaveHands, 1, noun)
     end
   end
@@ -2438,7 +2398,6 @@ module Verbs
   end
 
   def XTreeSub
-    raise Parser::VerbUnrecognized unless @player.builder?
     return XObj(noun, 1) unless noun.nil?
     objectloop { |i|
       XObj(i) if i.object? && parent(i).nil?
@@ -2446,7 +2405,6 @@ module Verbs
   end
 
   def GotoSub
-    raise Parser::VerbUnrecognized unless @player.builder?
     log.debug "<Goto noun> #=> #{noun}"
     if !noun.is_a?(Inform::Object)
       "[Not a safe place.]"
@@ -2458,7 +2416,6 @@ module Verbs
   end
 
   def GonearSub
-    raise Parser::VerbUnrecognized unless @player.builder?
     x = noun
     loop do
       break if parent(x).nil?
@@ -2470,7 +2427,6 @@ module Verbs
   def Print_ScL(obj); println (@x_scope_count += 1) + ": " + a(obj) + " (" + obj.id + ")"; end
 
   def ScopeSub
-    raise Parser::VerbUnrecognized unless @player.admin?
     @x_scope_count = 0
     LoopOverScope(method(:Print_ScL), noun)
     "Nothing is in scope." if @x_scope_count == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inform6lib
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 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: 3.7.2
+rubygems_version: 4.0.11
 specification_version: 4
 summary: The Inform6 Library Ruby Port is a faithful port of the Inform6 interactive
   fiction standard library in Ruby.