Cleanup and minor fixes

bootstrap/modelling.alc

@@ -510,12 +510,10 @@ Element function construct_model_list(model : Element, list : Element):
 		elif (command == "instantiate_attribute_ref"):
 			instantiate_attribute_ref(model, list_pop_final(list), list_pop_final(list), list_pop_final(list))
 		elif (command == "instantiate_attribute_code"):
-			log("Add code attribute")
 			instantiate_attribute_code(model, list_pop_final(list), list_pop_final(list), construct_function_list(trim_AL_constructors(list)))
 		elif (command == "instantiate_link"):
 			instantiate_link(model, list_pop_final(list), list_pop_final(list), list_pop_final(list), list_pop_final(list))
 		elif (command == "add_code_model"):
-			log("Add code model")
 			export_node(list_pop_final(list), construct_function_list(trim_AL_constructors(list)))
 		else:
 			log("Modelling error: did not understand command " + command)

models/AL_to_py.alc

@@ -232,8 +232,8 @@ Boolean function main(model : Element):
 	log("Finding initial function...")
 	function = set_pop(allInstances(model, "AL/Initial"))
 	function = set_pop(allAssociationDestinations(model, function, "AL/initial_funcdef"))
-	log("Initial function: " + cast_id(model["model"][function])
-	code = code + "main = func_" + cast_id(model["model"][function] + "\n"
+	log("Initial function: " + cast_id(model["model"][function]))
+	code = code + "main = func_" + cast_id(model["model"][function]) + "\n"
 
 	// Found the main function, though we only have the name of the function to assign...
 	// What we can do is reassign main to that function!

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:   Thu Apr  5 07:25:36 2018
+Date:   Thu Apr  5 07:27:30 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server