inform6lib 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75df46b86e8925d0c8718ba0e793d0f2d0484d5c1453799353f08e1b309ad315
-  data.tar.gz: 41f7feeec64e87be45b5f21aaf8fc5762caa69dc76c99760a6380aa853081dc9
+  metadata.gz: d9f1deb9cf509ad1583e444225fae2d0e94aeee6a150844e83b39818ffae1792
+  data.tar.gz: cf1bf259e26d5496ed8bd6d1e2daeeebdc8df95915e61d66a90a6646def02c68
 SHA512:
-  metadata.gz: cad7012fd9edb3fdc6a2fc861781d7ed27a1600dfe1c0d48b7592db6c0499bf9091af0ac379178c7b4fd6b663f2d9c40fb2f9abffea48b486e068a1cdaec9988
-  data.tar.gz: b53828a2b70ad238ab6cbcfef5a9056922ac8815548b7527634b692d7bd3824c343b9820f0470161db5cd7e171cf43c738bf73bfd99694833132c040ee179563
+  metadata.gz: 32ee527e72c9648a864e2f4f0d06a750d92e8835c3954118d7a5283c636ec7e701ac81d13768f04c602753fb12cc27d2df0f4980f98a0e0abb1ea17b4eb6ff70
+  data.tar.gz: 615afb3f2854063b9964289e720290124c9196bd692c5b576de3cd8542ce7c501117407106426d895a5efbea48de49647f62d42f302bec7a372fd37225900499

data/Rakefile

@@ -10,8 +10,8 @@ require 'rake/clean'
 unless defined?(Inform6Lib::PROJECT)
 # Ensure Inform6Lib module constants
 module Inform6Lib
-  SUFFIX = '-ruby'.freeze unless defined?(Inform6Lib::SUFFIX)
-  PROJECT = File.basename(__dir__, Inform6Lib::SUFFIX)
+  SUFFIX = '-ruby'.freeze unless defined?(SUFFIX)
+  PROJECT = File.basename(File.expand_path(__dir__), SUFFIX)
 end
 end
 

data/lib/inform/English.h.rb

@@ -66,7 +66,7 @@ module English
   # ------------------------------------------------------------------------------
 
   # The CompassDirection class
-  class CompassDirection < Inform::System::Object
+  class CompassDirection < Inform::Ephemeral::Object
     def initialize(name, number = 0, article = "the")
       super(name)
       @number = number
@@ -75,7 +75,7 @@ module English
     end
   end
 
-  Compass = Inform::System::Object.new "compass"
+  Compass = Inform::Ephemeral::Object.new "compass"
   Compass.has :concealed
 
   Compass > $n_obj  = CompassDirection.new("north") {
@@ -1268,9 +1268,9 @@ if defined? Inform::Object
       include Inform::English
     end
 
-    # The Inform::System module
-    module System
-      # The Inform::System::Object class to include the English module
+    # The Inform::Ephemeral module
+    module Ephemeral
+      # The Inform::Ephemeral::Object class to include the English module
       class Object
         include Inform::English
       end

data/lib/inform/VerbLib.h.rb

@@ -52,7 +52,7 @@ module Verbs
   end
 
   unless defined? LibraryMessages
-    LibraryMessages = Inform::System::Object.new
+    LibraryMessages = Inform::Ephemeral::Object.new
   end
 
   unless defined? NO_PLACES

data/lib/inform/parserm.h.rb

@@ -504,7 +504,7 @@ module Parser
 #  location-name on the status line can be "Darkness".
 # ----------------------------------------------------------------------------
 
-  Darkness = Inform::System::Object.new "(darkness object)"
+  Darkness = Inform::Ephemeral::Object.new "(darkness object)"
   Darkness.with do
     def short_name; DARKNESS__TX; end
     def description; L__M(:Miscellany, 17); end
@@ -574,7 +574,7 @@ module Parser
 #
 # ----------------------------------------------------------------------------
 
-  # InformParser = Inform::System::Object.new "(Inform Parser)"
+  # InformParser = Inform::Ephemeral::Object.new "(Inform Parser)"
   # def InformParser.parse_input; Parser__parse(); end
   # InformParser.has :proper
 
@@ -4676,7 +4676,7 @@ module Parser
 
     # artform = LanguageArticles
     #     + 3*WORDSIZE*LanguageContractionForms*(short_name_case + i*LanguageCases);You can see acode: 2
-    # TODO: Remove wtf
+    # TODO: Remove
     # print "acode: ", acode, "^";
     # print "artform-->acode: ", (string) (artform-->acode), "^";
     # print "artform-->0: ", (string) (artform-->0), "^";
@@ -5174,13 +5174,10 @@ end
 
 # The InformLibrary class.
 # Inform 6 defines this as an Object.
-class InformLibrary < Inform::System::Object
+class InformLibrary < Inform::Ephemeral::Object
   REGISTRY = Struct.new(:memo).new(defined?(Java) ? java.util.concurrent.ConcurrentHashMap.new : {})
-  include Inform::Context
-  include Inform::StdLib
-  include Inform::Parser
   include Inform::Rules
-  include Inform::History
+  include Inform::Parser
 
   attr_accessor :player
 
@@ -5842,7 +5839,7 @@ module Inform
 end
 
 # The LibExt class
-class LibExt < Inform::System::Object
+class LibExt < Inform::Ephemeral::Object
   attr_accessor :ext_initialise, :ext_messages
 
   def init

data/lib/inform/verblibm.h.rb

@@ -1034,7 +1034,7 @@ module Verbs
   # of using Netty.
   def YesOrNo
     loop do
-      @input = Inform::Runtime.instance.read
+      @input = __read
       DrawStatusLine() if !location.nil? && !parent(@player).nil?
       j = @input
       unless @input.empty? # at least one word entered
@@ -1049,7 +1049,43 @@ module Verbs
   # TODO: How could this work in a non-blocking IO system? FIXME
   def QuitSub
     L__M(:Quit, 2)
-    quit if YesOrNo()
+    __quit if YesOrNo()
+  end
+
+  def RestartSub
+    L__M(:Restart, 1)
+    __restart if YesOrNo()
+  end
+
+  def RestoreSub
+    return if self.respond_to?(:__restore) && __restore(self.method(:RMaybe))
+    L__M(:Restore, 1)
+  end
+
+  def RMaybe
+    L__M(:Restore, 2)
+  end
+
+  def SaveSub
+    return if self.respond_to?(:__save) && __save(self.method(:SMaybe))
+    L__M(:Save, 1)
+  end
+
+  def SMaybe
+    L__M(:Save, 2)
+  end
+
+  def VerifySub
+    return if self.respond_to?(:__verify) && __verify(self.method(:Vmaybe))
+    Vwrong()
+  end
+
+  def Vmaybe
+    L__M(:Verify, 1)
+  end
+
+  def Vwrong
+    L__M(:Verify, 2)
   end
 
   def NotifyOnSub;  notify_mode = 1; L__M(:NotifyOn);  end
@@ -2363,7 +2399,7 @@ module Verbs
 # ----------------------------------------------------------------------------
 
   def XTestMove(obj, dest)
-    if obj.is_a?(InformLibrary) || obj == LibraryMessages || obj.is_a?(Inform::System::Object)
+    if obj.is_a?(InformLibrary) || obj == LibraryMessages || obj.is_a?(Inform::Ephemeral::Object)
       println "[Can't move #{obj.name}: it's a system object.]"
       return true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inform6lib
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Nels Nelson