ruote 0.9.19 → 0.9.20

data/lib/openwfe/expressions/fe_command.rb

@@ -1,41 +1,27 @@
-#
 #--
-# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2007-2009, John Mettraux, jmettraux@gmail.com
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 require 'openwfe/expressions/condition'
 
@@ -50,19 +36,23 @@ module OpenWFE
 
     protected
 
-      A_COMMAND_FIELD = "command-field"
-      F_COMMAND = "__cursor_command__"
-      A_DISALLOW = "disallow"
+    A_COMMAND_FIELD = 'command-field'
+    F_COMMAND = '__cursor_command__'
+    A_DISALLOW = 'disallow'
+
+    C_BACK = 'back'
+    C_SKIP = 'skip'
+
+    C_BREAK = 'break'
+    C_CANCEL = 'cancel'
+    C_OVER = 'over'
+    BREAK_COMMANDS = [ C_BREAK, C_CANCEL, C_OVER ]
 
-      C_BACK = "back"
-      C_SKIP = "skip"
-      C_BREAK = "break"
-      C_CANCEL = "cancel"
-      C_REWIND = "rewind"
-      C_CONTINUE = "continue"
-      C_JUMP = "jump"
+    C_REWIND = 'rewind'
+    C_CONTINUE = 'continue'
+    C_JUMP = 'jump'
 
-      A_STEP = "step"
+    A_STEP = 'step'
   end
 
   #
@@ -72,67 +62,73 @@ module OpenWFE
   #
   module CommandMixin
     include CommandConstants
+    include ConditionMixin
 
     protected
 
-      def determine_command_and_step (workitem)
+    def determine_command_and_step (workitem)
 
-        command_field = lookup_command_field workitem
+      #
+      # at first, look at the condition attribute
 
-        command, step = lookup_command command_field, workitem
+      %w{ break rewind }.each do |cmd|
+        return [ cmd, 0 ] \
+          if eval_condition("#{cmd}-if", workitem, "#{cmd}-unless")
+      end
 
-        disallow_list = lookup_disallow workitem
+      #
+      # then look at the command field
 
-        command = nil \
-          if disallow_list and disallow_list.include?(command)
+      command_field = lookup_command_field(workitem)
 
-        workitem.attributes.delete(command_field)
+      command, step = lookup_command(command_field, workitem)
 
-        [ command, step ]
-      end
+      disallow_list = lookup_disallow(workitem)
 
-    private
+      command = nil \
+        if disallow_list and disallow_list.include?(command)
 
-      #
-      # Looks up the value in the command field.
-      #
-      def lookup_command_field (workitem)
+      workitem.attributes.delete(command_field)
 
-        lookup_attribute(
-          A_COMMAND_FIELD, workitem, :default => F_COMMAND)
-      end
+      [ command, step ]
+    end
 
-      #
-      # Returns the command and the step
-      #
-      def lookup_command (command_field, workitem)
+    private
 
-        command = workitem.attributes[command_field]
+    #
+    # Looks up the value in the command field.
+    #
+    def lookup_command_field (workitem)
 
-        return [ nil, 1 ] unless command
-          #
-          # this corresponds to the "just one step forward" default
+      lookup_attribute(A_COMMAND_FIELD, workitem, :default => F_COMMAND)
+    end
 
-        command, step = command.strip.split
+    #
+    # Returns the command and the step
+    #
+    def lookup_command (command_field, workitem)
 
-        step = if step
-          step.to_i
-        else
-          1
-        end
+      command = workitem.attributes[command_field]
 
-        step = -step if command == C_BACK
+      return [ nil, 1 ] unless command
+        #
+        # this corresponds to the "just one step forward" default
 
-        [ command, step ]
-      end
+      command, step = command.strip.split
 
-      #
-      # Fetches the value of the 'disallow' cursor attribute.
-      #
-      def lookup_disallow (workitem)
+      step = step ? step.to_i : 1
+      step = -step if command == C_BACK
 
-        lookup_array_attribute A_DISALLOW, workitem
-      end
+      [ command, step ]
+    end
+
+    #
+    # Fetches the value of the 'disallow' cursor attribute.
+    #
+    def lookup_disallow (workitem)
+
+      lookup_array_attribute(A_DISALLOW, workitem)
+    end
   end
 
   #
@@ -211,7 +207,7 @@ module OpenWFE
     include CommandConstants
     include ConditionMixin
 
-    names :back, :skip, :continue, :break, :cancel, :rewind, :jump
+    names :back, :skip, :continue, :break, :cancel, :rewind, :jump, :over
 
     def apply (workitem)
 
@@ -233,7 +229,7 @@ module OpenWFE
         workitem.attributes[F_COMMAND] = command
       end
 
-      reply_to_parent workitem
+      reply_to_parent(workitem)
     end
   end
 

data/lib/openwfe/expressions/fe_concurrence.rb

@@ -1,41 +1,27 @@
-#
 #--
-# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2006-2009, John Mettraux, jmettraux@gmail.com
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 require 'openwfe/utils'
 require 'openwfe/rudefinitions'
@@ -136,76 +122,48 @@ module OpenWFE
 
     names :concurrence
 
-    attr_accessor \
-      :sync_expression
-
+    attr_accessor :sync_expression
 
     def apply (workitem)
 
-      sync = lookup_sym_attribute(
-        :sync, workitem, :default => :generic)
+      extract_children # initializes the @children array
+
+      do_apply(workitem)
+    end
+
+    def reply (workitem)
+
+      @sync_expression.reply(self, workitem)
+    end
+
+    protected
+
+    def do_apply (workitem)
+
+      sync = lookup_sym_attribute(:sync, workitem, :default => :generic)
 
       @sync_expression =
         get_expression_map.get_sync_class(sync).new(self, workitem)
 
       @children.each do |child|
-        @sync_expression.add_child child
+        @sync_expression.add_child(child)
       end
 
       store_itself
 
-      #concurrence = self
-
       @children.each_with_index do |child, index|
 
-        get_expression_pool.apply(
-          child,
-          get_workitem(workitem, index))
-
-        #Thread.new do
-        #  begin
-        #    #ldebug { "apply() child : #{child.to_debug_s}" }
-        #    concurrence.synchronize do
-        #      get_expression_pool().apply(
-        #        child,
-        #        #workitem.dup)
-        #        get_workitem(workitem, index))
-        #    end
-        #  rescue Exception => e
-        #    lwarn do
-        #      "apply() " +
-        #      "caught exception in concurrent child  " +
-        #      child.to_debug_s + "\n" +
-        #      OpenWFE::exception_to_s(e)
-        #    end
-        #  end
-        #end
+        get_expression_pool.apply(child, get_workitem(workitem, index))
       end
 
-      #@sync_expression.ready(self)
-        #
-        # this is insufficient, have to do that :
-
-      #synchronize do
-      #
-      # Making sure the freshest version of the concurrence
-      # expression is used.
-      # This is especially important when using pure persistence.
-      #
-      reloaded_self, _fei = get_expression_pool.fetch @fei
-      reloaded_self.sync_expression.ready reloaded_self
-      #end
+      reloaded_self, _fei = get_expression_pool.fetch(@fei)
+      reloaded_self.sync_expression.ready(reloaded_self)
     end
 
-    def reply (workitem)
-      @sync_expression.reply(self, workitem)
-    end
-
-    protected
+    def get_workitem (workitem, index)
 
-      def get_workitem (workitem, index)
-        workitem.dup
-      end
+      workitem.dup
+    end
   end
 
   #
@@ -233,19 +191,13 @@ module OpenWFE
 
     names :concurrent_iterator
 
-    #attr_accessor :template
-
-    uses_template
-
-
     def apply (workitem)
 
-      return reply_to_parent(workitem) \
-        if raw_children.length < 1
+      return reply_to_parent(workitem) if has_no_expression_child
 
       @workitems = []
 
-      iterator = Iterator.new self, workitem
+      iterator = Iterator.new(self, workitem)
 
       return reply_to_parent(workitem) \
         unless iterator.has_next?
@@ -253,32 +205,29 @@ module OpenWFE
       while iterator.has_next?
 
         wi = workitem.dup
-
+        vars = iterator.next(wi)
         @workitems << wi
 
-        vars = iterator.next wi
-
-        #rawexp = get_expression_pool.prepare_from_template(
-        #  self, nil, iterator.index, template, vars)
-        #@children << rawexp.fei
-
         get_expression_pool.tprepare_child(
           self,
           raw_children.first,
           iterator.index,
-          true, # register child
-          vars)
+          :register_child => true,
+          :dont_store_parent => true,
+          :variables => vars)
       end
 
-      super
+      store_itself
+
+      do_apply(workitem)
     end
 
     protected
 
-      def get_workitem (workitem, index)
+    def get_workitem (wi, index)
 
-        @workitems[index]
-      end
+      @workitems[index]
+    end
   end
 
   #
@@ -347,7 +296,6 @@ module OpenWFE
     # can be processed
     #
     def ready (synchable)
-      #synchable.synchronize do
 
       synchable.ldebug do
         "ready() called by  #{synchable.fei.to_debug_s}  " +
@@ -358,22 +306,19 @@ module OpenWFE
       @unready_queue = nil
       synchable.store_itself
 
-      queue.each do |workitem|
-        break if do_reply(synchable, workitem)
-          #
-          # do_reply() will return 'true' as soon as the
-          # concurrence is over, if this is the case, the
-          # queue should not be treated anymore
-      end
-      #end
+      queue.each { |workitem| break if do_reply(synchable, workitem) }
+        #
+        # do_reply() will return 'true' as soon as the
+        # concurrence is over, if this is the case, the
+        # queue should not be treated anymore
     end
 
     def add_child (child)
+
       @remaining_children << child
     end
 
     def reply (synchable, workitem)
-      #synchable.synchronize do
 
       if @unready_queue
 
@@ -387,274 +332,266 @@ module OpenWFE
         end
 
       else
-        do_reply synchable, workitem
+
+        do_reply(synchable, workitem)
       end
-      #end
     end
 
     protected
 
-      def do_reply (synchable, workitem)
+    def do_reply (synchable, workitem)
 
-        synchable.ldebug do
-          "#{self.class}.do_reply() from " +
-          "#{workitem.last_expression_id.to_debug_s}"
-        end
+      synchable.ldebug do
+        "#{self.class}.do_reply() from " +
+        "#{workitem.last_expression_id.to_debug_s}"
+      end
 
-        @merge_array.push(synchable, workitem)
+      @merge_array.push(synchable, workitem)
 
-        @reply_count = @reply_count + 1
+      @reply_count = @reply_count + 1
 
-        @remaining_children.delete(workitem.last_expression_id)
+      @remaining_children.delete(workitem.last_expression_id)
 
-        #synchable.ldebug do
-        #  "#{self.class}.do_reply()  "+
-        #  "remaining children : #{@remaining_children.length}"
-        #end
+      if @over #over
+        #
+        # sync is over, don't determine it again
+        #
+        synchable.store_itself
+        return true
+      end
 
-        if @remaining_children.length <= 0
-          reply_to_parent(synchable)
-          return true
-        end
+      if @remaining_children.length <= 0
 
-        if @count > 0 and @reply_count >= @count
-          treat_remaining_children(synchable)
-          reply_to_parent(synchable)
-          return true
-        end
+        reply_to_parent(synchable)
+        return true
+      end
 
-        #
-        # over-if
+      if @count > 0 and @reply_count >= @count
 
-        conditional =
-          synchable.eval_condition("over-if", workitem, "over-unless")
+        @over = true
+        synchable.store_itself
 
-        if conditional
-          treat_remaining_children(synchable)
-          reply_to_parent(synchable)
-          return true
-        end
+        #treat_remaining_children(synchable)
+        synchable.get_workqueue.push(
+          self, :treat_remaining_children, synchable)
 
-        #
-        # not over, resuming
+        return true
+      end
+
+      #
+      # over-if
 
-        synchable.store_itself()
+      if synchable.eval_condition('over-if', workitem, 'over-unless')
 
-        #synchable.ldebug do
-        #  "#{self.class}.do_reply() not replying to parent "+
-        #  "#{workitem.last_expression_id.to_debug_s}"
-        #end
+        @over = true
+        synchable.store_itself
 
-        false
+        #treat_remaining_children(synchable)
+        synchable.get_workqueue.push(
+          self, :treat_remaining_children, synchable)
+
+        return true
       end
 
-      def reply_to_parent (synchable)
+      #
+      # not over, resuming
 
-        workitem = @merge_array.do_merge
+      synchable.store_itself
 
-        synchable.reply_to_parent workitem
-      end
+      false
+    end
+
+    def reply_to_parent (synchable)
 
-      def treat_remaining_children (synchable)
+      workitem = @merge_array.do_merge
 
-        expool = synchable.get_expression_pool
+      synchable.reply_to_parent(workitem)
+    end
 
-        @remaining_children.each do |child|
+    def treat_remaining_children (synchable)
 
-          synchable.ldebug do
-            "#{self.class}.treat_remainining_children() " +
-            "#{child.to_debug_s} " +
-            "(cancel ? #{@cancel_remaining})"
-          end
+      @remaining_children.each do |child|
 
-          if @cancel_remaining
-            expool.cancel(child)
-          else
-            expool.forget(synchable, child)
-          end
+        synchable.ldebug do
+          "#{self.class}.treat_remainining_children() " +
+          "#{child.to_debug_s} " +
+          "(cancel ? #{@cancel_remaining})"
+        end
+
+        if @cancel_remaining
+          synchable.get_expression_pool.cancel(child)
+        else
+          synchable.get_expression_pool.forget(synchable, child)
         end
       end
 
-      def cancel_remaining? (synchable_expression, workitem)
+      reply_to_parent(synchable)
+    end
 
-        s = synchable_expression.lookup_sym_attribute(
-          :remaining, workitem, :default => :cancel)
+    def cancel_remaining? (synchable_expression, workitem)
 
-        (s == :cancel)
-      end
+      s = synchable_expression.lookup_sym_attribute(
+        :remaining, workitem, :default => :cancel)
 
-      def determine_count (synchable_expression, workitem)
+      (s == :cancel)
+    end
 
-        c = synchable_expression.lookup_attribute :count, workitem
-        return -1 if not c
-        i = c.to_i
-        return -1 if i < 1
-        i
-      end
+    def determine_count (synchable_expression, workitem)
 
-      #
-      # This inner class is used to gather workitems (via push()) before
-      # the final merge
-      # This final merge is triggered by calling the do_merge() method
-      # which will return the resulting, merged workitem.
-      #
-      class MergeArray
-        include MergeMixin
+      c = synchable_expression.lookup_attribute(:count, workitem)
+      return -1 if not c
+      i = c.to_i
+      i < 1 ? -1 : i
+    end
 
-        attr_accessor \
-          :synchable_fei,
-          :workitem,
-          :workitems_by_arrival,
-          :workitems_by_altitude,
-          :merge,
-          :merge_type
+    #
+    # This inner class is used to gather workitems (via push()) before
+    # the final merge
+    # This final merge is triggered by calling the do_merge() method
+    # which will return the resulting, merged workitem.
+    #
+    class MergeArray
+      include MergeMixin
+
+      attr_accessor \
+        :synchable_fei,
+        :workitem,
+        :workitems_by_arrival,
+        :workitems_by_altitude,
+        :merge,
+        :merge_type
 
-        def initialize (synchable_fei, merge, merge_type)
+      def initialize (synchable_fei, merge, merge_type)
 
-          @synchable_fei = synchable_fei
+        @synchable_fei = synchable_fei
 
-          @merge = merge
-          @merge_type = merge_type
+        @merge = merge
+        @merge_type = merge_type
 
-          ensure_merge_settings
+        ensure_merge_settings
 
-          @workitem = nil
+        @workitem = nil
 
-          if highest? or lowest?
-            @workitems_by_arrival = []
-            @workitems_by_altitude = []
-          end
+        if highest? or lowest?
+          @workitems_by_arrival = []
+          @workitems_by_altitude = []
         end
+      end
 
-        def push (synchable, wi)
+      def push (synchable, wi)
 
-          #synchable.ldebug do
-          #  "push() isolate? #{isolate?}"
-          #end
+        if isolate?
+          push_in_isolation(wi)
+        elsif last? or first?
+          push_by_position(wi)
+        else
+          push_by_arrival(wi)
+        end
+      end
 
-          if isolate?
-            push_in_isolation wi
-          elsif last? or first?
-            push_by_position wi
-          else
-            push_by_arrival wi
-          end
+      def push_by_position (wi)
+
+        source, target = if first?
+          [ @workitem, wi ]
+        else
+          [ wi, @workitem ]
         end
+        @workitem = merge_workitems(target, source, override?)
+      end
 
-        def push_by_position (wi)
+      def push_in_isolation (wi)
 
-          source, target = if first?
-            [ @workitem, wi ]
-          else
-            [ wi, @workitem ]
-          end
-          @workitem = merge_workitems target, source, override?
+        unless @workitem
+          @workitem = wi.dup
+          att = @workitem.attributes
+          @workitem.attributes = {}
         end
 
-        def push_in_isolation (wi)
+        key = get_child_id(wi)
 
-          unless @workitem
-            @workitem = wi.dup
-            att = @workitem.attributes
-            @workitem.attributes = {}
-          end
+        @workitem.attributes[key.to_s] = OpenWFE.fulldup(wi.attributes)
+      end
 
-          #key = synchable.children.index wi.last_expression_id
-          #key = wi.last_expression_id.child_id
-          key = get_child_id wi
+      def push_by_arrival (wi)
 
-          @workitem.attributes[key.to_s] =
-            OpenWFE::fulldup(wi.attributes)
-        end
+        #index = synchable.children.index wi.last_expression_id
+        #index = Integer(wi.last_expression_id.child_id)
+        index = Integer(get_child_id(wi))
 
-        def push_by_arrival (wi)
+        @workitems_by_arrival << wi
+        @workitems_by_altitude[index] = wi
+      end
 
-          #index = synchable.children.index wi.last_expression_id
-          #index = Integer(wi.last_expression_id.child_id)
-          index = Integer(get_child_id(wi))
+      #
+      # merges the workitems stored here
+      #
+      def do_merge
+
+        return @workitem if @workitem
+
+        list = if first?
+          @workitems_by_arrival.reverse
+        elsif last?
+          @workitems_by_arrival
+        elsif highest?
+          @workitems_by_altitude.reverse
+        elsif lowest?
+          @workitems_by_altitude
+        end
 
-          @workitems_by_arrival << wi
-          @workitems_by_altitude[index] = wi
+        list.inject(nil) do |result, wi|
+          result = merge_workitems(result, wi, override?) if wi
+          result
         end
+      end
 
-        #
-        # merges the workitems stored here
-        #
-        def do_merge
+      protected
 
-          return @workitem if @workitem
+      def first?
+        @merge == :first
+      end
+      def last?
+        @merge == :last
+      end
+      def highest?
+        @merge == :highest
+      end
+      def lowest?
+        @merge == :lowest
+      end
 
-          list = if first?
-            @workitems_by_arrival.reverse
-          elsif last?
-            @workitems_by_arrival
-          elsif highest?
-            @workitems_by_altitude.reverse
-          elsif lowest?
-            @workitems_by_altitude
-          end
+      def mix?
+        @merge_type == :mix
+      end
+      def override?
+        @merge_type == :override
+      end
+      def isolate?
+        @merge_type == :isolate
+      end
 
-          result = nil
+      #
+      # Returns the child id of the expression that just
+      # replied with the given workitem.
+      #
+      def get_child_id (workitem)
 
-          list.each do |wi|
-            next unless wi
-            result = merge_workitems result, wi, override?
-          end
+        return workitem.fei.child_id \
+          if workitem.fei.wfid == @synchable_fei.wfid
 
-          #puts "___ result :"
-          #puts result.to_s
-          #puts
+        workitem.fei.last_sub_instance_id
+      end
 
-          result
-        end
+      #
+      # Making sure @merge and @merge_type are set to
+      # appropriate values.
+      #
+      def ensure_merge_settings
 
-        protected
-
-          def first?
-            @merge == :first
-          end
-          def last?
-            @merge == :last
-          end
-          def highest?
-            @merge == :highest
-          end
-          def lowest?
-            @merge == :lowest
-          end
-
-          def mix?
-            @merge_type == :mix
-          end
-          def override?
-            @merge_type == :override
-          end
-          def isolate?
-            @merge_type == :isolate
-          end
-
-          #
-          # Returns the child id of the expression that just
-          # replied with the given workitem.
-          #
-          def get_child_id (workitem)
-
-            return workitem.fei.child_id \
-              if workitem.fei.wfid == @synchable_fei.wfid
-
-            workitem.fei.last_sub_instance_id
-          end
-
-          #
-          # Making sure @merge and @merge_type are set to
-          # appropriate values.
-          #
-          def ensure_merge_settings
-
-            @merge_type = :mix unless override? or isolate?
-            @merge = :first unless last? or highest? or lowest?
-          end
+        @merge_type = :mix unless override? or isolate?
+        @merge = :first unless last? or highest? or lowest?
       end
+    end
 
   end