weel 1.99.25 → 1.99.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 964418576857800c8bfc5a43f96f024443d63c43
-  data.tar.gz: 0aaf05e10645392981fadfa8d25608bd57775c38
+  metadata.gz: c9bd94ef3f1ec50791e2a643602536a1d8ac0583
+  data.tar.gz: 3f789f0ee61ac31d1fbba6cff4ec466c3696c2a6
 SHA512:
-  metadata.gz: 6b6be6896d75a628beac4fe26a644d7da4338f1b1a48e6f7b349aeef5be6c352973dc4e94720fb6285b25b250f6f39450b1d352d5e8391f1b26f37a54dbd1de5
-  data.tar.gz: 3397d7c467519dc4cbd8021aa73ee89a55a3e3e9c08a1a95876c35558cd82809394c90efe3aa5c1a7ae80b4b12ee24442fd297825c818cde3b312ba860d2a3f2
+  metadata.gz: 8fb935824d9f81f0fd355bcf58d82bc5104c09a05f4964387d83cacbbac174fb18f54c8da578da1f960d224be947eb65ae742b4bdeb32d5f9d2ed3c7f8ba7656
+  data.tar.gz: 33133bcf1dc767f26a2ee6348371a38fc816857391bfeda1be4310faa9be7aee03f820e29b80e24ca410b3ec962a3a24d9da0ffaea74570030633e46bfb9a3c4

data/lib/weel.rb

@@ -452,9 +452,9 @@ class WEEL
     # Defines a possible choice of a choose-Construct
     # Block is executed if condition == true or
     # searchmode is active (to find the starting position)
-    def alternative(condition)# {{{
+    def alternative(condition,args={})# {{{
       return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
-      hw, pos = __weel_sim_start(:alternative,:mode => Thread.current[:alternative_mode]) if __weel_sim
+      hw, pos = __weel_sim_start(:alternative,args.merge(:mode => Thread.current[:alternative_mode])) if __weel_sim
       Thread.current[:mutex] ||= Mutex.new
       Thread.current[:mutex].synchronize do
         return if Thread.current[:alternative_mode] == :exclusive && Thread.current[:alternative_executed][-1] = true
@@ -465,13 +465,13 @@ class WEEL
         Thread.current[:alternative_executed][-1] = true if condition
       end  
       yield if __weel_is_in_search_mode || __weel_sim || condition
-      __weel_sim_stop(:alternative,hw,pos,:mode => Thread.current[:alternative_mode]) if __weel_sim
+      __weel_sim_stop(:alternative,hw,pos,args.merge(:mode => Thread.current[:alternative_mode])) if __weel_sim
     end # }}}
-    def otherwise # {{{
+    def otherwise(args={}) # {{{
       return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
-      hw, pos = __weel_sim_start(:otherwise,:mode => Thread.current[:alternative_mode]) if __weel_sim
+      hw, pos = __weel_sim_start(:otherwise,args.merge(:mode => Thread.current[:alternative_mode])) if __weel_sim
       yield if __weel_is_in_search_mode || __weel_sim || !Thread.current[:alternative_executed].last
-      __weel_sim_stop(:otherwise,hw,pos,:mode => Thread.current[:alternative_mode]) if __weel_sim
+      __weel_sim_stop(:otherwise,hw,pos,args.merge(:mode => Thread.current[:alternative_mode])) if __weel_sim
     end # }}}
 
     # Defines a critical block (=Mutex)
@@ -489,8 +489,8 @@ class WEEL
     end # }}}
 
     # Defines a Cycle (loop/iteration)
-    def loop(condition)# {{{ 
-      unless condition.is_a?(Array) && (condition[0].is_a?(Proc) || condition[0].is_a?(String)) && [:pre_test,:post_test].include?(condition[1])
+    def loop(condition,args={})# {{{ 
+      unless condition.is_a?(Array) && (condition[0].is_a?(Proc) || condition[0].is_a?(String)) && [:pre_test,:post_test].include?(condition[1]) && args.is_a?(Hash)
         raise "condition must be called pre_test{} or post_test{}"
       end
       return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
@@ -499,9 +499,9 @@ class WEEL
         return if __weel_is_in_search_mode
       end  
       if __weel_sim
-        hw, pos = __weel_sim_start(:loop,:testing=>condition[1])
+        hw, pos = __weel_sim_start(:loop,args.merge(:testing=>condition[1]))
         yield
-        __weel_sim_stop(:loop,hw,pos,:testing=>condition[1])
+        __weel_sim_stop(:loop,hw,pos,args.merge(:testing=>condition[1]))
         return
       end
       handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args unless condition[0].is_a?(Proc)

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.25"
+  s.version          = "1.99.26"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of the Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.25
+  version: 1.99.26
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies: []
 description: see http://cpee.org
 email: juergen.mangler@gmail.com