Revert "All action language code is now automatically typed upon upload"

This reverts commit 45b3a12b1d812566e6a03d66fa7eb832eb006d1b.

bootstrap/bootstrap.py

@@ -100,18 +100,19 @@ def bootstrap():
     initial_user = "user_manager"
     initial_user_code = \
     '''
-    include "io.alh"
-    include "primitives.alc"
-    include "constructors.alc"
-    include "object_operations.alc"
-    include "library.alc"
-    include "conformance_scd.alc"
-    include "modelling.alc"
-    include "metamodels.alc"
-    include "compilation_manager.alc"
+    Element function read_root() = ?primitives/read_root
+    Element function dict_read(a: Element, b: Element) = ?primitives/dict_read
+    Element function create_node() = ?primitives/create_node
+    Element function create_value(a: Element) = ?primitives/create_value
+    Element function dict_add(a: Element, b: Element, c: Element) = ?primitives/dict_add
+    Boolean function value_eq(a: String, b: String) = ?primitives/value_eq
+    Boolean function delete_element(a: Element) = ?primitives/delete_element
+    Boolean function bool_not(a: Boolean) = ?primitives/bool_not
+    Boolean function dict_in(a: Element, b: Element) = ?primitives/dict_in
+
+    Element function input()
 
     Void function __main():
-    \tcreate_metamodels()
     \tString username
     \tElement user_root
     \tElement user_frame
@@ -151,13 +152,12 @@ def bootstrap():
     // Do this only in the bootstrapper
     include "io.alh"
     include "primitives.alc"
+    include "compilation_manager.alc"
     include "constructors.alc"
     include "object_operations.alc"
     include "library.alc"
     include "conformance_scd.alc"
     include "modelling.alc"
-    include "metamodels.alc"
-    include "compilation_manager.alc"
 
     Void function __main():
     \tInteger interface

bootstrap/compilation_manager.alc

@@ -1,9 +1,6 @@
 include "primitives.alh"
 include "constructors.alh"
 include "conformance_scd.alh"
-include "modelling.alh"
-include "metamodels.alh"
-include "library.alh"
 
 Element function compilation_manager():
 	String operation
@@ -23,7 +20,7 @@ Element function compilation_manager():
 	operation = input()
 	if (operation == "upload"):
 		object_name = input()
-		node = instantiate_model(import_node("models/SimpleClassDiagrams"))
+		node = create_node()
 		dict_add(root, object_name, node)
 		dict_add(node, "hash_md5", input())
 		if (input()):
@@ -31,8 +28,6 @@ Element function compilation_manager():
 		else:
 			dict_add(node, "initializers", deserialize(input()))
 
-		add_AL(node, node["initializers"], "")
-
 		Element symbols
 		symbols = create_node()
 		dict_add(node, "symbols", symbols)

bootstrap/metamodels.alc

@@ -145,270 +145,265 @@ Element function constraint_call(model : Element, name : String):
 	else:
 		return "Expected physical action value"
 
-Void function initialize_SCD(location : String):
-	//TODO fix this hardcoded location!
-	if (bool_not(dict_in(dict_read(dict_read(read_root(), "__hierarchy"), "models"), "SimpleClassDiagrams"))):
-		Element scd
-		scd = instantiate_bottom()
-
-		// Initial model, typed using LTM_bottom
-		model_add_node(scd, "Class")
-		model_add_node(scd, "Any")
-		model_add_node(scd, "String")
-		model_add_value(scd, "name", "name")
-		model_add_edge(scd, "Association", "Class", "Any")
-		model_add_edge(scd, "Inheritance", "Class", "Class")
-		model_add_edge(scd, "Association_attribute", "Association", "String")
-		model_add_edge(scd, "Association_name", "Association_attribute", "name")
-		model_add_edge(scd, "assoc_inh_class", "Association", "Class")
-		model_add_edge(scd, "class_inh_any", "Class", "Any")
-		model_add_edge(scd, "string_inh_any", "String", "Any")
-
-		// Retype to a "real" LTM, which happens to be itself
-		retype_model(scd, scd)
-		define_inheritance(scd, "Inheritance")
-		retype(scd, "Class", "Class")
-		retype(scd, "Any", "Class")
-		retype(scd, "String", "Class")
-		retype(scd, "name", "String")
-		retype(scd, "Association", "Association")
-		retype(scd, "Inheritance", "Association")
-		retype(scd, "Association_attribute", "Association")
-		retype(scd, "Association_name", "Association_attribute")
-		retype(scd, "assoc_inh_class", "Inheritance")
-		retype(scd, "class_inh_any", "Inheritance")
-		retype(scd, "string_inh_any", "Inheritance")
-
-		// Add some attributes, now that it is an ordinary model
-		instantiate_node(scd, "Class", "Natural")
-		instantiate_link(scd, "Association", "lc", "Class", "Natural")
-		instantiate_attribute(scd, "lc", "name", "lower_cardinality")
-		instantiate_link(scd, "Association", "uc", "Class", "Natural")
-		instantiate_attribute(scd, "uc", "name", "upper_cardinality")
-		instantiate_link(scd, "Association", "slc", "Association", "Natural")
-		instantiate_attribute(scd, "slc", "name", "source_lower_cardinality")
-		instantiate_link(scd, "Association", "suc", "Association", "Natural")
-		instantiate_attribute(scd, "suc", "name", "source_upper_cardinality")
-		instantiate_link(scd, "Association", "tlc", "Association", "Natural")
-		instantiate_attribute(scd, "tlc", "name", "target_lower_cardinality")
-		instantiate_link(scd, "Association", "tuc", "Association", "Natural")
-		instantiate_attribute(scd, "tuc", "name", "target_upper_cardinality")
-
-		// Add in the Action Language metamodel
-		instantiate_node(scd, "Class", "Action")
-		instantiate_node(scd, "Class", "Statement")
-		instantiate_node(scd, "Class", "Expression")
-		instantiate_node(scd, "Class", "funcdef")
-		instantiate_node(scd, "Class", "param")
-		instantiate_node(scd, "Class", "if")
-		instantiate_node(scd, "Class", "break")
-		instantiate_node(scd, "Class", "while")
-		instantiate_node(scd, "Class", "continue")
-		instantiate_node(scd, "Class", "assign")
-		instantiate_node(scd, "Class", "return")
-		instantiate_node(scd, "Class", "output")
-		instantiate_node(scd, "Class", "declare")
-		instantiate_node(scd, "Class", "global")
-		instantiate_node(scd, "Class", "access")
-		instantiate_node(scd, "Class", "constant")
-		instantiate_node(scd, "Class", "input")
-		instantiate_node(scd, "Class", "resolve")
-		instantiate_node(scd, "Class", "call")
-		instantiate_link(scd, "Association", "dict_link", "Action", "Any")
-		instantiate_link(scd, "Association", "to_str", "dict_link", "String")
-		instantiate_attribute(scd, "to_str", "name", "name")
-		instantiate_link(scd, "Inheritance", "", "Action", "Any")
-		instantiate_link(scd, "Inheritance", "", "funcdef", "Action")
-		instantiate_link(scd, "Inheritance", "", "param", "Action")
-		instantiate_link(scd, "Inheritance", "", "Statement", "Action")
-		instantiate_link(scd, "Inheritance", "", "Expression", "Action")
-		instantiate_link(scd, "Inheritance", "", "resolve", "Statement")
-		instantiate_link(scd, "Inheritance", "", "if", "Statement")
-		instantiate_link(scd, "Inheritance", "", "break", "Statement")
-		instantiate_link(scd, "Inheritance", "", "continue", "Statement")
-		instantiate_link(scd, "Inheritance", "", "global", "Statement")
-		instantiate_link(scd, "Inheritance", "", "while", "Statement")
-		instantiate_link(scd, "Inheritance", "", "assign", "Statement")
-		instantiate_link(scd, "Inheritance", "", "return", "Statement")
-		instantiate_link(scd, "Inheritance", "", "call", "Statement")
-		instantiate_link(scd, "Inheritance", "", "declare", "Statement")
-		instantiate_link(scd, "Inheritance", "", "call", "Expression")
-		instantiate_link(scd, "Inheritance", "", "access", "Expression")
-		instantiate_link(scd, "Inheritance", "", "constant", "Expression")
-		instantiate_link(scd, "Inheritance", "", "input", "Expression")
-		instantiate_link(scd, "Association", "statement_next", "Statement", "Statement")
-		instantiate_link(scd, "Association", "if_cond", "if", "Expression")
-		instantiate_link(scd, "Association", "if_then", "if", "Statement")
-		instantiate_link(scd, "Association", "if_else", "if", "Statement")
-		instantiate_link(scd, "Association", "while_cond", "while", "Expression")
-		instantiate_link(scd, "Association", "while_body", "while", "Statement")
-		instantiate_link(scd, "Association", "assign_var", "assign", "Any")
-		instantiate_link(scd, "Association", "assign_value", "assign", "Expression")
-		instantiate_link(scd, "Association", "break_while", "break", "while")
-		instantiate_link(scd, "Association", "continue_while", "continue", "while")
-		instantiate_link(scd, "Association", "return_value", "return", "Expression")
-		instantiate_link(scd, "Association", "resolve_var", "resolve", "Any")
-		instantiate_link(scd, "Association", "access_var", "access", "Any")
-		instantiate_link(scd, "Association", "constant_node", "constant", "Any")
-		instantiate_link(scd, "Association", "output_node", "output", "Expression")
-		instantiate_link(scd, "Association", "global_var", "global", "String")
-		instantiate_link(scd, "Association", "param_name", "param", "String")
-		instantiate_link(scd, "Association", "param_value", "param", "Expression")
-		instantiate_link(scd, "Association", "param_next_param", "param", "param")
-		instantiate_link(scd, "Association", "funcdef_body", "funcdef", "Statement")
-		instantiate_link(scd, "Association", "call_func", "call", "Expression")
-		instantiate_link(scd, "Association", "call_params", "call", "param")
-		instantiate_link(scd, "Association", "call_last_param", "call", "param")
-		instantiate_link(scd, "Inheritance", "", "statement_next", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "if_cond", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "if_then", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "if_else", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "while_cond", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "while_body", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "assign_var", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "assign_value", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "break_while", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "continue_while", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "return_value", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "resolve_var", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "access_var", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "constant_node", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "output_node", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "global_var", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "param_name", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "param_value", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "param_next_param", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "funcdef_body", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "call_func", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "call_params", "dict_link")
-		instantiate_link(scd, "Inheritance", "", "call_last_param", "dict_link")
-
-		// Add cardinalities on how many connections are allowed: one of each
-		instantiate_attribute(scd, "statement_next", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "if_cond", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "if_cond", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "if_then", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "if_then", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "if_else", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "while_cond", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "while_cond", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "while_body", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "while_body", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "assign_var", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "assign_var", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "assign_value", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "assign_value", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "break_while", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "break_while", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "continue_while", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "continue_while", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "return_value", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "resolve_var", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "resolve_var", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "access_var", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "access_var", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "constant_node", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "constant_node", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "output_node", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "output_node", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "global_var", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "global_var", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "param_name", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "param_name", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "param_value", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "param_value", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "param_next_param", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "funcdef_body", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "funcdef_body", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "call_func", "target_lower_cardinality", 1)
-		instantiate_attribute(scd, "call_func", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "call_params", "target_upper_cardinality", 1)
-		instantiate_attribute(scd, "call_last_param", "target_upper_cardinality", 1)
-
-		// Now still allow for constraints on classes
-		instantiate_link(scd, "Association", "constraint", "Class", "funcdef")
-		instantiate_attribute(scd, "constraint", "name", "constraint")
-
-		// Add constraints to all primitive classes
-		//add_constraint(scd, "if", constraint_if)
-		//add_constraint(scd, "while", constraint_while)
-		//add_constraint(scd, "break", constraint_break)
-		//add_constraint(scd, "continue", constraint_continue)
-		//add_constraint(scd, "assign", constraint_assign)
-		//add_constraint(scd, "return", constraint_return)
-		//add_constraint(scd, "output", constraint_output)
-		//add_constraint(scd, "input", constraint_input)
-		//add_constraint(scd, "declare", constraint_declare)
-		//add_constraint(scd, "global", constraint_global)
-		//add_constraint(scd, "access", constraint_access)
-		//add_constraint(scd, "constant", constraint_constant)
-		//add_constraint(scd, "resolve", constraint_resolve)
-		//add_constraint(scd, "call", constraint_call)
-
-		// And add some, to enforce correct physical types
-		add_constraint(scd, "Natural", constraint_natural)
-		add_constraint(scd, "String", constraint_string)
-
-		// Finally done, so export!
-		export_node(location, scd)
-
-	return
-
-Void function initialize_PN(location_SCD : String, location_PN : String):
-	if (bool_not(dict_in(dict_read(dict_read(read_root(), "__hierarchy"), "models"), "PetriNets"))):
-		Element pn
-		Element scd
-
-		scd = import_node(location_SCD)
-
-		pn = instantiate_model(scd)
-		define_inheritance(pn, "Inheritance")
-		instantiate_node(pn, "Class", "Place")
-		instantiate_node(pn, "Class", "Transition")
-		instantiate_node(pn, "Class", "Natural")
-		instantiate_link(pn, "Association", "P2T", "Place", "Transition")
-		instantiate_link(pn, "Association", "T2P", "Transition", "Place")
-		instantiate_link(pn, "Association", "Place_tokens", "Place", "Natural")
-		instantiate_attribute(pn, "Place_tokens", "name", "tokens")
-		instantiate_attribute(pn, "Place_tokens", "target_lower_cardinality", 1)
-		instantiate_attribute(pn, "Place_tokens", "target_upper_cardinality", 1)
-		instantiate_link(pn, "Association", "P2T_weight", "P2T", "Natural")
-		instantiate_attribute(pn, "P2T_weight", "name", "weight")
-		instantiate_attribute(pn, "P2T_weight", "target_lower_cardinality", 1)
-		instantiate_attribute(pn, "P2T_weight", "target_upper_cardinality", 1)
-		instantiate_link(pn, "Association", "T2P_weight", "T2P", "Natural")
-		instantiate_attribute(pn, "T2P_weight", "name", "weight")
-		instantiate_attribute(pn, "T2P_weight", "target_lower_cardinality", 1)
-		instantiate_attribute(pn, "T2P_weight", "target_upper_cardinality", 1)
-
-		// Add constraint on the Natural
-		add_constraint(pn, "Natural", constraint_natural)
-
-		// Add global constraints
-		//set_model_constraints(pn, petrinet_constraints)
-		export_node(location_PN, pn)
-
-	return
-
-Void function initialize_bottom(location_bottom : String):
-	if (bool_not(dict_in(dict_read(dict_read(read_root(), "__hierarchy"), "models"), "LTM_bottom"))):
-		Element ltm_bottom
-		ltm_bottom = instantiate_bottom()
-		model_add_node(ltm_bottom, "Node")
-		model_add_edge(ltm_bottom, "Edge", "Node", "Node")
-		model_add_edge(ltm_bottom, "inheritance", "Node", "Node")
-		model_add_edge(ltm_bottom, "__inh", "Edge", "Node")
-
-		retype_model(ltm_bottom, ltm_bottom)
-		define_inheritance(ltm_bottom, "inheritance")
-		retype(ltm_bottom, "Node", "Node")
-		retype(ltm_bottom, "Edge", "Edge")
-		retype(ltm_bottom, "inheritance", "Edge")
-		retype(ltm_bottom, "__inh", "inheritance")
-
-		export_node(location_bottom, ltm_bottom)
-
-	return
+Element function initialize_SCD(location : String):
+	Element scd
+	scd = instantiate_bottom()
+
+	// Initial model, typed using LTM_bottom
+	model_add_node(scd, "Class")
+	model_add_node(scd, "Any")
+	model_add_node(scd, "String")
+	model_add_value(scd, "name", "name")
+	model_add_edge(scd, "Association", "Class", "Any")
+	model_add_edge(scd, "Inheritance", "Class", "Class")
+	model_add_edge(scd, "Association_attribute", "Association", "String")
+	model_add_edge(scd, "Association_name", "Association_attribute", "name")
+	model_add_edge(scd, "assoc_inh_class", "Association", "Class")
+	model_add_edge(scd, "class_inh_any", "Class", "Any")
+	model_add_edge(scd, "string_inh_any", "String", "Any")
+
+	// Retype to a "real" LTM, which happens to be itself
+	retype_model(scd, scd)
+	define_inheritance(scd, "Inheritance")
+	retype(scd, "Class", "Class")
+	retype(scd, "Any", "Class")
+	retype(scd, "String", "Class")
+	retype(scd, "name", "String")
+	retype(scd, "Association", "Association")
+	retype(scd, "Inheritance", "Association")
+	retype(scd, "Association_attribute", "Association")
+	retype(scd, "Association_name", "Association_attribute")
+	retype(scd, "assoc_inh_class", "Inheritance")
+	retype(scd, "class_inh_any", "Inheritance")
+	retype(scd, "string_inh_any", "Inheritance")
+
+	// Add some attributes, now that it is an ordinary model
+	instantiate_node(scd, "Class", "Natural")
+	instantiate_link(scd, "Association", "lc", "Class", "Natural")
+	instantiate_attribute(scd, "lc", "name", "lower_cardinality")
+	instantiate_link(scd, "Association", "uc", "Class", "Natural")
+	instantiate_attribute(scd, "uc", "name", "upper_cardinality")
+	instantiate_link(scd, "Association", "slc", "Association", "Natural")
+	instantiate_attribute(scd, "slc", "name", "source_lower_cardinality")
+	instantiate_link(scd, "Association", "suc", "Association", "Natural")
+	instantiate_attribute(scd, "suc", "name", "source_upper_cardinality")
+	instantiate_link(scd, "Association", "tlc", "Association", "Natural")
+	instantiate_attribute(scd, "tlc", "name", "target_lower_cardinality")
+	instantiate_link(scd, "Association", "tuc", "Association", "Natural")
+	instantiate_attribute(scd, "tuc", "name", "target_upper_cardinality")
+
+	// Add in the Action Language metamodel
+	instantiate_node(scd, "Class", "Action")
+	instantiate_node(scd, "Class", "Statement")
+	instantiate_node(scd, "Class", "Expression")
+	instantiate_node(scd, "Class", "funcdef")
+	instantiate_node(scd, "Class", "param")
+	instantiate_node(scd, "Class", "if")
+	instantiate_node(scd, "Class", "break")
+	instantiate_node(scd, "Class", "while")
+	instantiate_node(scd, "Class", "continue")
+	instantiate_node(scd, "Class", "assign")
+	instantiate_node(scd, "Class", "return")
+	instantiate_node(scd, "Class", "output")
+	instantiate_node(scd, "Class", "declare")
+	instantiate_node(scd, "Class", "global")
+	instantiate_node(scd, "Class", "access")
+	instantiate_node(scd, "Class", "constant")
+	instantiate_node(scd, "Class", "input")
+	instantiate_node(scd, "Class", "resolve")
+	instantiate_node(scd, "Class", "call")
+	instantiate_link(scd, "Association", "dict_link", "Action", "Any")
+	instantiate_link(scd, "Association", "to_str", "dict_link", "String")
+	instantiate_attribute(scd, "to_str", "name", "name")
+	instantiate_link(scd, "Inheritance", "", "Action", "Any")
+	instantiate_link(scd, "Inheritance", "", "funcdef", "Action")
+	instantiate_link(scd, "Inheritance", "", "param", "Action")
+	instantiate_link(scd, "Inheritance", "", "Statement", "Action")
+	instantiate_link(scd, "Inheritance", "", "Expression", "Action")
+	instantiate_link(scd, "Inheritance", "", "resolve", "Statement")
+	instantiate_link(scd, "Inheritance", "", "if", "Statement")
+	instantiate_link(scd, "Inheritance", "", "break", "Statement")
+	instantiate_link(scd, "Inheritance", "", "continue", "Statement")
+	instantiate_link(scd, "Inheritance", "", "global", "Statement")
+	instantiate_link(scd, "Inheritance", "", "while", "Statement")
+	instantiate_link(scd, "Inheritance", "", "assign", "Statement")
+	instantiate_link(scd, "Inheritance", "", "return", "Statement")
+	instantiate_link(scd, "Inheritance", "", "call", "Statement")
+	instantiate_link(scd, "Inheritance", "", "declare", "Statement")
+	instantiate_link(scd, "Inheritance", "", "call", "Expression")
+	instantiate_link(scd, "Inheritance", "", "access", "Expression")
+	instantiate_link(scd, "Inheritance", "", "constant", "Expression")
+	instantiate_link(scd, "Inheritance", "", "input", "Expression")
+	instantiate_link(scd, "Association", "statement_next", "Statement", "Statement")
+	instantiate_link(scd, "Association", "if_cond", "if", "Expression")
+	instantiate_link(scd, "Association", "if_then", "if", "Statement")
+	instantiate_link(scd, "Association", "if_else", "if", "Statement")
+	instantiate_link(scd, "Association", "while_cond", "while", "Expression")
+	instantiate_link(scd, "Association", "while_body", "while", "Statement")
+	instantiate_link(scd, "Association", "assign_var", "assign", "Any")
+	instantiate_link(scd, "Association", "assign_value", "assign", "Expression")
+	instantiate_link(scd, "Association", "break_while", "break", "while")
+	instantiate_link(scd, "Association", "continue_while", "continue", "while")
+	instantiate_link(scd, "Association", "return_value", "return", "Expression")
+	instantiate_link(scd, "Association", "resolve_var", "resolve", "Any")
+	instantiate_link(scd, "Association", "access_var", "access", "Any")
+	instantiate_link(scd, "Association", "constant_node", "constant", "Any")
+	instantiate_link(scd, "Association", "output_node", "output", "Expression")
+	instantiate_link(scd, "Association", "global_var", "global", "String")
+	instantiate_link(scd, "Association", "param_name", "param", "String")
+	instantiate_link(scd, "Association", "param_value", "param", "Expression")
+	instantiate_link(scd, "Association", "param_next_param", "param", "param")
+	instantiate_link(scd, "Association", "funcdef_body", "funcdef", "Statement")
+	instantiate_link(scd, "Association", "call_func", "call", "Expression")
+	instantiate_link(scd, "Association", "call_params", "call", "param")
+	instantiate_link(scd, "Association", "call_last_param", "call", "param")
+	instantiate_link(scd, "Inheritance", "", "statement_next", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "if_cond", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "if_then", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "if_else", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "while_cond", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "while_body", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "assign_var", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "assign_value", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "break_while", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "continue_while", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "return_value", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "resolve_var", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "access_var", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "constant_node", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "output_node", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "global_var", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "param_name", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "param_value", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "param_next_param", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "funcdef_body", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "call_func", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "call_params", "dict_link")
+	instantiate_link(scd, "Inheritance", "", "call_last_param", "dict_link")
+
+	// Add cardinalities on how many connections are allowed: one of each
+	instantiate_attribute(scd, "statement_next", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "if_cond", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "if_cond", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "if_then", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "if_then", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "if_else", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "while_cond", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "while_cond", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "while_body", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "while_body", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "assign_var", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "assign_var", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "assign_value", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "assign_value", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "break_while", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "break_while", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "continue_while", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "continue_while", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "return_value", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "resolve_var", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "resolve_var", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "access_var", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "access_var", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "constant_node", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "constant_node", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "output_node", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "output_node", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "global_var", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "global_var", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "param_name", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "param_name", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "param_value", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "param_value", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "param_next_param", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "funcdef_body", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "funcdef_body", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "call_func", "target_lower_cardinality", 1)
+	instantiate_attribute(scd, "call_func", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "call_params", "target_upper_cardinality", 1)
+	instantiate_attribute(scd, "call_last_param", "target_upper_cardinality", 1)
+
+	// Now still allow for constraints on classes
+	instantiate_link(scd, "Association", "constraint", "Class", "funcdef")
+	instantiate_attribute(scd, "constraint", "name", "constraint")
+
+	// Add constraints to all primitive classes
+	//add_constraint(scd, "if", constraint_if)
+	//add_constraint(scd, "while", constraint_while)
+	//add_constraint(scd, "break", constraint_break)
+	//add_constraint(scd, "continue", constraint_continue)
+	//add_constraint(scd, "assign", constraint_assign)
+	//add_constraint(scd, "return", constraint_return)
+	//add_constraint(scd, "output", constraint_output)
+	//add_constraint(scd, "input", constraint_input)
+	//add_constraint(scd, "declare", constraint_declare)
+	//add_constraint(scd, "global", constraint_global)
+	//add_constraint(scd, "access", constraint_access)
+	//add_constraint(scd, "constant", constraint_constant)
+	//add_constraint(scd, "resolve", constraint_resolve)
+	//add_constraint(scd, "call", constraint_call)
+
+	// And add some, to enforce correct physical types
+	add_constraint(scd, "Natural", constraint_natural)
+	add_constraint(scd, "String", constraint_string)
+
+	// Finally done, so export!
+	export_node(location, scd)
+	return scd
+
+Element function initialize_PN(location_SCD : String, location_PN : String):
+	Element pn
+	Element scd
+
+	scd = import_node(location_SCD)
+
+	pn = instantiate_model(scd)
+	define_inheritance(pn, "Inheritance")
+	instantiate_node(pn, "Class", "Place")
+	instantiate_node(pn, "Class", "Transition")
+	instantiate_node(pn, "Class", "Natural")
+	instantiate_link(pn, "Association", "P2T", "Place", "Transition")
+	instantiate_link(pn, "Association", "T2P", "Transition", "Place")
+	instantiate_link(pn, "Association", "Place_tokens", "Place", "Natural")
+	instantiate_attribute(pn, "Place_tokens", "name", "tokens")
+	instantiate_attribute(pn, "Place_tokens", "target_lower_cardinality", 1)
+	instantiate_attribute(pn, "Place_tokens", "target_upper_cardinality", 1)
+	instantiate_link(pn, "Association", "P2T_weight", "P2T", "Natural")
+	instantiate_attribute(pn, "P2T_weight", "name", "weight")
+	instantiate_attribute(pn, "P2T_weight", "target_lower_cardinality", 1)
+	instantiate_attribute(pn, "P2T_weight", "target_upper_cardinality", 1)
+	instantiate_link(pn, "Association", "T2P_weight", "T2P", "Natural")
+	instantiate_attribute(pn, "T2P_weight", "name", "weight")
+	instantiate_attribute(pn, "T2P_weight", "target_lower_cardinality", 1)
+	instantiate_attribute(pn, "T2P_weight", "target_upper_cardinality", 1)
+
+	// Add constraint on the Natural
+	add_constraint(pn, "Natural", constraint_natural)
+
+	// Add global constraints
+	//set_model_constraints(pn, petrinet_constraints)
+	export_node(location_PN, pn)
+
+	return pn
+
+Element function initialize_bottom(location_bottom : String):
+	Element ltm_bottom
+	ltm_bottom = instantiate_bottom()
+	model_add_node(ltm_bottom, "Node")
+	model_add_edge(ltm_bottom, "Edge", "Node", "Node")
+	model_add_edge(ltm_bottom, "inheritance", "Node", "Node")
+	model_add_edge(ltm_bottom, "__inh", "Edge", "Node")
+
+	retype_model(ltm_bottom, ltm_bottom)
+	define_inheritance(ltm_bottom, "inheritance")
+	retype(ltm_bottom, "Node", "Node")
+	retype(ltm_bottom, "Edge", "Edge")
+	retype(ltm_bottom, "inheritance", "Edge")
+	retype(ltm_bottom, "__inh", "inheritance")
+
+	export_node(location_bottom, ltm_bottom)
+
+	return ltm_bottom
 
 Element function create_metamodels():
 	String location_SCD
@@ -419,8 +414,11 @@ Element function create_metamodels():
 	location_PN = "models/PetriNets"
 	location_bottom = "models/LTM_bottom"
 
-	initialize_SCD(location_SCD)
-	initialize_PN(location_SCD, location_PN)
-	initialize_bottom(location_bottom)
+	if (bool_not(dict_in(dict_read(dict_read(read_root(), "__hierarchy"), "models"), "SimpleClassDiagrams"))):
+		initialize_SCD(location_SCD)
+	if (bool_not(dict_in(dict_read(dict_read(read_root(), "__hierarchy"), "models"), "PetriNets"))):
+		initialize_PN(location_SCD, location_PN)
+	if (bool_not(dict_in(dict_read(dict_read(read_root(), "__hierarchy"), "models"), "LTM_bottom"))):
+		initialize_bottom(location_bottom)
 
 	return dict_read(dict_read(read_root(), "__hierarchy"), "models")

bootstrap/modelling.alc

@@ -271,7 +271,7 @@ Void function add_AL_links(model : Element, list : Element, element : Element, t
 
 	return
 
-String function add_AL(model : Element, element : Element, starting_type : String):
+String function add_AL(model : Element, element : Element):
 	log("Adding constraint: " + cast_e2s(element))
 	Element todo
 	Element node
@@ -282,7 +282,7 @@ String function add_AL(model : Element, element : Element, starting_type : Strin
 	todo = create_node()
 	node = create_node()
 	list_append(node, element)
-	list_append(node, starting_type)
+	list_append(node, "funcdef")
 	set_add(todo, node)
 
 	while (0 < dict_len(todo)):
@@ -358,7 +358,7 @@ Void function add_constraint(model : Element, element : String, constraint : Act
 	String link_name
 	String constraint_name
 
-	constraint_name = add_AL(model, constraint, "funcdef")
+	constraint_name = add_AL(model, constraint)
 	attr_type = find_attribute_type(model, element, "constraint")
 	instantiate_link(model, attr_type, "", element, constraint_name)
 

integration/code/pn_interface.alc

@@ -402,7 +402,6 @@ Element function initial_prompt():
 			output("  delete -- Delete a previously made model")
 			output("  list   -- Show a list of all stored models")
 			output("  help   -- Show a list of possible commands")
-			output("  load_AL-- Type an AL model")
 		elif (command == "new"):
 			output("Metamodel to instantiate?")
 			mm_name = input()

interface/HUTN/hutn_compiler/primitives_visitor.py

@@ -20,7 +20,6 @@ class PrimitivesVisitor(Visitor):
 
     def dict(self, src, val, trgt):
         if src is None or trgt is None:
-            print((src, val, trgt))
             raise Exception("Got None")
         if isinstance(val, str):
             val = "\"%s\"" % val

interface/HUTN/includes/modelling.alh

@@ -18,4 +18,3 @@ Void function construct_model()
 Element function read_attribute(model : Element, elem : String, name : String)
 Void function model_delete_element(model : Element, name : String)
 Void function add_constraint(model : Element, name : String, constraint : Action)
-String function add_AL(model : Element, element : Element, starting_type : String)