Pass around kwargs as well in the calls by merging dictionaries all the time

kernel/modelverse_kernel/main.py

@@ -284,7 +284,7 @@ class ModelverseKernel(object):
                 value = "func_result_" + str(ModelverseKernel.counter)
                 ModelverseKernel.counter += 1
                 param_list = "{" + ", ".join(["'%s': %s" % (k, v) for k, v in param_list.items()]) + "}"
-                actual_computation = "%s, = yield [('CALL_KWARGS', [%s, %s])]\n" % (value, func_name, param_list)
+                actual_computation = "%s, = yield [('CALL_KWARGS', [%s, dict(%s.items() + kwargs.items())])]\n" % (value, func_name, param_list)
 
                 if indent == 0:
                     # No indent, meaning that we use it inline

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  6 07:23:07 2018
+Date:   Fri Apr  6 07:27:15 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server