weel 1.99.155 → 1.99.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d315d0d198c25589af6896bdea53ea7b739ca7d894ae50710dbc269de3e12498
-  data.tar.gz: e2e3959764ddbb84ce4333516848680eb6e1c7af7d156c0b9b3cb052d4f350b0
+  metadata.gz: 7c178eae822059636c1650312316a9a86569aa5410b1fa0925a27217eb489b9c
+  data.tar.gz: 43d9ddbdc46507eed44a9983d432dcc33f99bd41977eef8e0c7ab3a9a4374994
 SHA512:
-  metadata.gz: 22c95a4616057c3700e17832feb8b91aaf7e2fbf39704d76fcd5c181f25d3731c791d01061f9c5aba4324e628b6d82eb06d83e80d41e66dfc8cead5f7a7bac5f
-  data.tar.gz: c16598a4608ca09f92c8bef0460d00b80c0d671c2affc366d82b86182976cc2a45cab5e65bf6daa11b93afa432beb80448062aa30178b6f4a44f301da91771ce
+  metadata.gz: 344d3e94a850997740096f6bdaea7db93573c2633ff4bd615f0868f26f71bded594fac65bbb696a95e7bc17fc2bf1b07f5a246e4f0eea7b7f62a2965ff71b837
+  data.tar.gz: 0deae3dff31f63d47f743e91a250bdadfa6a2085fa26779bbbbb34fb0c7a32ad5ac1603b14912e9eb819ac79dc4a2a154b99a47aefa28a00bedf3eefbf9c99ce

data/lib/weel.rb

@@ -663,14 +663,16 @@ class WEEL
     def alternative(eid,condition,args={},&block)# {{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       Thread.current[:mutex] ||= Mutex.new
-      Thread.current[:mutex].synchronize do
-        return if Thread.current[:alternative_mode][-1] == :exclusive && Thread.current[:alternative_executed][-1] == true
-        if condition.is_a?(String)
-          condition = __weel_eval_condition(eid, condition, args)
+      searchmode = __weel_is_in_search_mode
+      unless searchmode
+        Thread.current[:mutex].synchronize do
+          return if Thread.current[:alternative_mode][-1] == :exclusive && Thread.current[:alternative_executed][-1] == true
+          if condition.is_a?(String)
+            condition = __weel_eval_condition(eid, condition, args)
+          end
+          Thread.current[:alternative_executed][-1] = true if condition
         end
-        Thread.current[:alternative_executed][-1] = true if condition
       end
-      searchmode = __weel_is_in_search_mode
       __weel_protect_yield(&block) if searchmode || condition
       Thread.current[:alternative_executed][-1] = true if __weel_is_in_search_mode != searchmode # we swiched from searchmode true to false, thus branch has been executed which is as good as evaling the condition to true
     end # }}}
@@ -826,7 +828,7 @@ class WEEL
         connectionwrapper.test_condition(eid,@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional,condition,args)
       rescue NameError => err # don't look into it, or it will explode
         self.__weel_state = :stopping
-        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("protect_yield: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("eval_condition: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
         nil
       rescue WEEL::Signal::Error => err
         self.__weel_state = :stopping

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.155"
+  s.version          = "1.99.157"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.155
+  version: 1.99.157
 platform: ruby
 authors:
 - Juergen eTM Mangler