Cleanup of request handler

kernel/modelverse_kernel/request_handler.py

@@ -3,23 +3,6 @@ import modelverse_kernel.primitives as primitive_functions
 import modelverse_kernel.jit as jit
 from collections import defaultdict
 
-class KnownRequestHandled(Exception):
-    """An exception that signifies that a known request was handled."""
-    pass
-
-class UnhandledRequestHandlerException(Exception):
-    """The type of exception that is thrown when the request handler encounters an
-       unhandled exception."""
-    def __init__(self, inner_exception, stack_trace):
-        import traceback
-        Exception.__init__(
-            self,
-            """The request handler encountered an unknown exception.\n
-               Inner exception: %s\n
-            """ % (traceback.format_exc()))
-        self.inner_exception = inner_exception
-        self.stack_trace = stack_trace
-
 class RequestHandler(object):
     """A type of object that intercepts logic-related Modelverse requests, and
        forwards Modelverse state requests."""
@@ -120,7 +103,6 @@ class RequestHandler(object):
                 # Handle the request.
                 self.handlers[elem[0]](elem[1])
                 return (False, None)
-                #raise KnownRequestHandled()
             else:
                 for i, elem in enumerate(requests):
                     if elem[0] in self.handlers:
@@ -155,10 +137,7 @@ class RequestHandler(object):
         # that dummy entry.
         try:
             self.push_generator(func(**kwargs))
-        except StopIteration:
-            self.push_generator(None)
-            raise
-        except primitive_functions.PrimitiveFinished:
+        except primitive_functions.PrimitiveFinished, StopIteration:
             self.push_generator(None)
             raise
         except:
@@ -177,10 +156,7 @@ class RequestHandler(object):
         # that dummy entry.
         try:
             self.push_generator(func(*args))
-        except StopIteration:
-            self.push_generator(None)
-            raise
-        except primitive_functions.PrimitiveFinished:
+        except primitive_functions.PrimitiveFinished, StopIteration:
             self.push_generator(None)
             raise
 

wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Fri Apr 27 10:46:54 2018
+Date:   Fri Apr 27 11:01:30 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server