Merge branch 'array-modification-fix'

lib/wongi-engine/alpha_memory.rb

@@ -49,6 +49,7 @@ def wmes
         copy.each do |wme|
           y << wme unless wme.deleted?
         end
+        @wmes.reject! &:deleted?
       end
     end
 

lib/wongi-engine/beta/beta_memory.rb

@@ -1,7 +1,6 @@
 module Wongi::Engine
 
   class BetaMemory < BetaNode
-    attr_reader :tokens
 
     def initialize parent
       super
@@ -61,7 +60,7 @@ def refresh_child child
     end
 
     def delete_token token
-      tokens.delete token
+      @tokens.delete token
     end
 
     # => TODO: investigate if we really need this

lib/wongi-engine/beta/beta_node.rb

@@ -122,6 +122,15 @@ def delete_token token
       # => noop
     end
 
+    def tokens
+      Enumerator.new do |y|
+        @tokens.dup.each do |token|
+          y << token unless token.deleted?
+        end
+        @tokens.reject! &:deleted?
+      end
+    end
+
     private
 
     def propagate_activation token, wme, assignments

lib/wongi-engine/beta/join_node.rb

@@ -59,7 +59,6 @@ def alpha= a
       def alpha_activate wme
         dp "JOIN alpha-activated with #{wme}"
         collected = collect_assignments( wme )
-        dp "-TOKENS: #{self.parent.tokens.length}"
         self.parent.tokens.each do |token|
           dp "-MATCHING #{token}"
           if matches?( token, wme ) && passes_filters?( token, wme, collected )

lib/wongi-engine/beta/production_node.rb

@@ -13,7 +13,7 @@ def initialize parent, actions
 
       def beta_activate token, wme, assignments
         super
-        generated = tokens.last
+        generated = @tokens.last
         @actions.each do |action|
           # @tokens.each do |t|
           #  action.execute t