inform6lib 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c832fae34b158458f4ff2550832e9756033a725633750854d4afae675f915eab
-  data.tar.gz: 93ce34112c5b2c236ab1eb3aa0027ee8fce90e39249c1dc5b3d3d33310142e1a
+  metadata.gz: eb96a12c00fe171072a37b734b09ace326c78f5c2b7e5f64a8a288d0c44d5c3c
+  data.tar.gz: 18602dac5e23311f3b3f314c9c3f4a3fcc4599d2ed6c6047ff48957d6399f5a7
 SHA512:
-  metadata.gz: 57c086700bcaeef38381113c158c6922983e2918ede45937a04615efc4cd0286df39eb8d8dbad06dcdfa2496bdc41d747fe029d6b6ce91537cc57b193b6deae8
-  data.tar.gz: ddad647de642419cdf28a6b7c790a37dc443dd705bc62a017c9ef8334a6546d34a4d5ca9abdb6da8431244a05d74f37fa8e5661aaaa1f650afd310302ad8c543
+  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}\"" +
@@ -1927,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
@@ -2399,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?
@@ -2407,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.]"
@@ -2419,7 +2416,6 @@ module Verbs
   end
 
   def GonearSub
-    raise Parser::VerbUnrecognized unless @player.builder?
     x = noun
     loop do
       break if parent(x).nil?
@@ -2431,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.1
+  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.