weel 1.99.45 → 1.99.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d57eac9eb689932f63b2593786953aa933e35e
-  data.tar.gz: cec4065be69a5ca463baad015f218f4d89f56b88
+  metadata.gz: 1b267f01fd4b59aec270e7f438bfe10ff98da0f0
+  data.tar.gz: 51661c098b1efdd8aa69de6c1ea2abcbcca79587
 SHA512:
-  metadata.gz: 9fb2c1c43348383e42f6f1fcc3beb72dd397a840a6c8f167e9d1cee902703a4f642b9c1c08bb77d08b9f20513ed1e788ce37a86532e95d898f1cf88ab3e59792
-  data.tar.gz: a74e8b19b3b337b6005170c85b35373d7236fb0bb630d1ababcae458e4ccb94d2e31529e41db052de2732cc08bf805502382c074f64beb387a03d2b9a607c472
+  metadata.gz: 4ce546f2803ba8b2b117e67d3674f6b3f14f1fd2ba775c3af41e7020cf99efad252ef4a80277870344293d2078dce6b6a2063dbb86c022f80ff2308df013c32f
+  data.tar.gz: a7d3617a1ed7f6a3903a05b1a2a21ab53a7dbd6a2bf02d31de5070867004711b02030ef19da1547f33376bfc4a7118c201e7a5c07fc1c2d1a6d9ef207f0913fe

data/lib/weel.rb

@@ -331,7 +331,7 @@ class WEEL
 
       hw, pos = __weel_sim_start(:parallel) if __weel_sim
 
-      yield
+      __weel_protect_yield &Proc.new
 
       Thread.current[:branch_wait_count] = (type.is_a?(Hash) && type.size == 1 && type[:wait] != nil && (type[:wait].is_a?(Integer) && type[:wait] > 0) ? type[:wait] : Thread.current[:branches].size)
       1.upto Thread.current[:branches].size do
@@ -400,13 +400,7 @@ class WEEL
           handlerwrapper.simulate(:parallel_branch,:start,Thread.current[:branch_sim_pos],current_branch_sim_pos)
         end
 
-        begin
-          yield(*local)
-        rescue => err
-          self.__weel_state = :stopping
-          @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,err,nil)
-          Thread.pass
-        end
+        __weel_protect_yield *local, &Proc.new
 
         __weel_sim_stop(:parallel_branch,handlerwrapper,current_branch_sim_pos) if __weel_sim
 
@@ -441,7 +435,7 @@ class WEEL
       Thread.current[:alternative_executed] << false
       Thread.current[:alternative_mode] << mode
       hw, pos = __weel_sim_start(:choose,:mode => Thread.current[:alternative_mode].last) if __weel_sim
-      yield
+      __weel_protect_yield &Proc.new
       __weel_sim_stop(:choose,hw,pos,:mode => Thread.current[:alternative_mode].last) if __weel_sim
       Thread.current[:alternative_executed].pop
       Thread.current[:alternative_mode].pop
@@ -458,18 +452,17 @@ class WEEL
       Thread.current[:mutex].synchronize do
         return if Thread.current[:alternative_mode] == :exclusive && Thread.current[:alternative_executed][-1] = true
         if condition.is_a?(String) && !__weel_sim
-          handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args
-          condition = handlerwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints),condition)
+          condition = __weel_eval_condition(condition)
         end
         Thread.current[:alternative_executed][-1] = true if condition
       end
-      yield if __weel_is_in_search_mode || __weel_sim || condition
+      __weel_protect_yield(&Proc.new) if __weel_is_in_search_mode || __weel_sim || condition
       __weel_sim_stop(:alternative,hw,pos,args.merge(:mode => Thread.current[:alternative_mode].last, :condition => condition.is_a?(String) ? condition : nil)) if __weel_sim
     end # }}}
     def otherwise(args={}) # {{{
       return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       hw, pos = __weel_sim_start(:otherwise,args.merge(:mode => Thread.current[:alternative_mode].last)) if __weel_sim
-      yield if __weel_is_in_search_mode || __weel_sim || !Thread.current[:alternative_executed].last
+      __weel_protect_yield(&Proc.new) if __weel_is_in_search_mode || __weel_sim || !Thread.current[:alternative_executed].last
       __weel_sim_stop(:otherwise,hw,pos,args.merge(:mode => Thread.current[:alternative_mode].last)) if __weel_sim
     end # }}}
 
@@ -483,7 +476,7 @@ class WEEL
         @__weel_critical_sections[id] = semaphore if id
       end
       semaphore.synchronize do
-        yield
+        __weel_protect_yield &Proc.new
       end
     end # }}}
 
@@ -495,7 +488,7 @@ class WEEL
       return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       if __weel_is_in_search_mode
         catch :escape do
-          yield
+          __weel_protect_yield &Proc.new
         end
         return if __weel_is_in_search_mode
       end
@@ -503,22 +496,21 @@ class WEEL
         cond = condition[0].is_a?(Proc) ? true : condition[0]
         hw, pos = __weel_sim_start(:loop,args.merge(:testing=>condition[1],:condition=>cond))
         catch :escape do
-          yield
+          __weel_protect_yield &Proc.new
         end
         __weel_sim_stop(:loop,hw,pos,args.merge(:testing=>condition[1],:condition=>cond))
         return
       end
-      handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args unless condition[0].is_a?(Proc)
       catch :escape do
         case condition[1]
           when :pre_test
-            while (condition[0].is_a?(Proc) ? condition[0].call : handlerwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints),condition[0])) && self.__weel_state != :stopping && self.__weel_state != :stopped
-              yield
+            while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped
+              __weel_protect_yield &Proc.new
             end
           when :post_test
             begin
-              yield
-            end while (condition[0].is_a?(Proc) ? condition[0].call : handlerwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints),condition[0])) && self.__weel_state != :stopping && self.__weel_state != :stopped
+              __weel_protect_yield &Proc.new
+            end while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped
         end
       end
     end # }}}
@@ -543,6 +535,28 @@ class WEEL
     end # }}}
 
   private
+    def __weel_protect_yield(*local)
+      begin
+        yield(*local) if block_given?
+      rescue => err
+        self.__weel_state = :stopping
+        @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,Exception.new("DSL error. I don't want to tell you where and why."),nil)
+        nil
+      end
+    end
+
+    def __weel_eval_condition(condition)
+      begin
+        handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args unless condition.is_a?(Proc)
+        condition.is_a?(Proc) ? condition.call : handlerwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints),condition)
+      rescue => err
+        # if you access $! here, BOOOM
+        self.__weel_state = :stopping
+        @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,Exception.new("Condition error. I don't want to tell you where and why."),nil)
+        nil
+      end
+    end
+
     def __weel_activity(position, type, endpoints, parameters, finalize, update=nil)# {{{
       position = __weel_position_test position
       begin
@@ -904,7 +918,7 @@ public
           end
         rescue Exception => err
           @dslr.__weel_state = :stopping
-          @dslr.__weel_handlerwrapper::inform_syntax_error(@dslr.__weel_handlerwrapper_args,err,code)
+          @dslr.__weel_handlerwrapper::inform_syntax_error(@dslr.__weel_handlerwrapper_args,Exception.new("DSL error. I don't want to tell you where and why."),code)
         end
         if @dslr.__weel_state == :running
           @dslr.__weel_state = :finished
@@ -937,6 +951,8 @@ public
       begin
         __weel_control_flow(:running)
       rescue => e
+	puts e.message
+	puts e.backtrace
         handlerwrapper::inform_handlerwrapper_error handlerwrapper_args, e
       end
     end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.45"
+  s.version          = "1.99.46"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   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.45
+  version: 1.99.46
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit