Changeset 219

Timestamp:

06/08/05 06:26:58 (3 years ago)

Author:

ged

Message:

- Futher work on the input/output code. Committing for merge with trunk, so no

tests yet.

Location:

branches/simplest-thing/lib/fm

Files:

• commandparser.rb (modified) (3 diffs)
• spirit.rb (modified) (4 diffs)

branches/simplest-thing/lib/fm/commandparser.rb

@@ -53 +53 @@
 
     # The hash of verbs used by the parser
-    attr_locked_reader :verbset
+    attr_reader :verbset
 
 
@@ -59 +59 @@
     def updateVerbSet( *verbs )
 
+        @verbset.clear
+
         # Extract the words from each verb and add them to the table after
         # checking for collisions.
         verbs.each do |verb|
-            verb.words.each do |word|
-
-                # If the word's already registered for this verb, skip to the
-                # next
-                if @verbset[ word ].eql?( verb )
-                    self.log.debug "  %p already registered" % [word]
-                    next
-                end
+            verb.words.uniq.each do |word|
 
                 # Collision-check
@@ -85 +80 @@
 
 
-
 end # class FaerieMUD::CommandParser
 

branches/simplest-thing/lib/fm/spirit.rb

@@ -87 +87 @@
         @parser = FaerieMUD::CommandParser::new
 
+        @ioHandlers = {
+            :input      => nil,
+            :output     => nil,
+        }
+
         super
     end
@@ -106 +111 @@
     attr_typelocked_accessor :statistics, Hash
 
+    # IO Callbacks
+    attr_reader :ioHandlers
+
+
     
+    ### Provide a +handler+ for output events.
+    def onOutput( &handler )
+        @ioHandlers[:output] = handler
+    end
+
+
+    ### Provide a +callback+ which will be called when the spirit is ready for
+    ### input.
+    def onInputReady( &handler )
+        @ioHandlers[:input] = handler
+    end
+
+
     #################################################################
     ### C O M P O S E D O B J E C T   I N T E R F A C E
@@ -125 +147 @@
             object.controller = self
             @animatedObjects += [ object ]
-            @parser.updateVerbSet( @animatedObjects )
         end
+
+        self.updateParser
     end
 
@@ -136 +159 @@
             object.controller = nil
             @animatedObjects -= [ object ]
-            @parser.updateVerbSet( @animatedObjects )
         end
+    end
+
+    
+    ### Synchronize the parser's verbset with the set of verbs from the
+    ### currently-animated objects.
+    def updateParser
+        verbs = @animatedObjects.collect {|aobj| aobj.verbs}.flatten
+        @parser.updateVerbSet( *verbs )
     end