Added new SCD metamodel, breaking quite a lot

bootstrap/metamodels.alc

@@ -152,56 +152,62 @@ Element function initialize_SCD(location : String):
 	Element scd
 	scd = instantiate_bottom()
 
-	// Initial model, typed using LTM_bottom
+	model_add_node(scd, "Element")
 	model_add_node(scd, "Class")
-	model_add_node(scd, "Any")
+	model_add_node(scd, "AttributeValue")
 	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
+	model_add_value(scd, "name_value", "name")
+	model_add_edge(scd, "Association", "Class", "Class")
+	model_add_edge(scd, "Inheritance", "Element", "Element")
+	model_add_edge(scd, "Attribute", "Element", "AttributeValue")
+	model_add_edge(scd, "attr_name", "Attribute", "String")
+	model_add_edge(scd, "attr_name_name", "attr_name", "name_value")
+	model_add_edge(scd, "class_inh_element", "Class", "Element")
+	model_add_edge(scd, "attributevalue_inh_element", "AttributeValue", "Element")
+	model_add_edge(scd, "association_inh_class", "Association", "Class")
+	model_add_edge(scd, "attribute_inh_attributevalue", "Attribute", "AttributeValue")
+
+	// Retype to self
 	retype_model(scd, scd)
+	retype(scd, "Element", "Class")
 	retype(scd, "Class", "Class")
-	retype(scd, "Any", "Class")
-	retype(scd, "String", "Class")
-	retype(scd, "name", "String")
+	retype(scd, "AttributeValue", "Class")
+	retype(scd, "String", "AttributeValue")
+	retype(scd, "name_value", "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")
+	retype(scd, "Attribute", "Association")
+	retype(scd, "attr_name", "Attribute")
+	retype(scd, "attr_name_name", "attr_name")
+	retype(scd, "class_inh_element", "Inheritance")
+	retype(scd, "attributevalue_inh_element", "Inheritance")
+	retype(scd, "association_inh_class", "Inheritance")
+	retype(scd, "attribute_inh_attributevalue", "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")
+	instantiate_node(scd, "AttributeValue", "Natural")
+	instantiate_node(scd, "AttributeValue", "Boolean")
+	model_define_attribute(scd, "Attribute", "optional", False, "Boolean")
+	model_define_attribute(scd, "Class", "lower_cardinality", False, "Natural")
+	model_define_attribute(scd, "Class", "upper_cardinality", False, "Natural")
+	model_define_attribute(scd, "Association", "source_lower_cardinality", False, "Natural")
+	model_define_attribute(scd, "Association", "target_lower_cardinality", False, "Natural")
+	model_define_attribute(scd, "Association", "source_upper_cardinality", False, "Natural")
+	model_define_attribute(scd, "Association", "target_upper_cardinality", False, "Natural")
 
 	// Add in the Action Language metamodel
 	add_AL_to_MM(scd)
 
-	// Now still allow for constraints on classes
-	instantiate_link(scd, "Association", "constraint", "Class", "funcdef")
-	instantiate_attribute(scd, "constraint", "name", "constraint")
+	// Define additional attributes that define functions
+	model_define_attribute(scd, "Element", "constraint", True, "funcdef")
+	model_define_attribute(scd, "AttributeValue", "to_string", False, "funcdef")
+
+	// Define some constraints
+	instantiate_attribute(scd, "Natural", "constraint", constraint_natural)
+	instantiate_attribute(scd, "String", "constraint", constraint_string)
 
 	// Add constraints to all primitive classes
+	// TODO this is much too slow right now
 	//add_constraint(scd, "if", constraint_if)
 	//add_constraint(scd, "while", constraint_while)
 	//add_constraint(scd, "break", constraint_break)
@@ -217,10 +223,6 @@ Element function initialize_SCD(location : String):
 	//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!
@@ -234,24 +236,15 @@ Element function initialize_PN(location_SCD : String, location_PN : String):
 	pn = instantiate_model(scd)
 	instantiate_node(pn, "Class", "Place")
 	instantiate_node(pn, "Class", "Transition")
-	instantiate_node(pn, "Class", "Natural")
+	instantiate_node(pn, "AttributeValue", "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)
+	model_define_attribute(pn, "Place", "tokens", False, "Natural")
+	model_define_attribute(pn, "P2T", "weight", False, "Natural")
+	model_define_attribute(pn, "T2P", "weight", False, "Natural")
 
 	// Add constraint on the Natural
-	add_constraint(pn, "Natural", constraint_natural)
+	instantiate_attribute(pn, "Natural", "constraint", constraint_natural)
 
 	export_node(location_PN, pn)
 
@@ -294,29 +287,29 @@ Element function create_metamodels():
 	return dict_read(dict_read(read_root(), "__hierarchy"), "models")!
 
 Void function add_AL_to_MM(model : Element):
-	instantiate_node(model, "Class", "Action")
-	instantiate_node(model, "Class", "Statement")
-	instantiate_node(model, "Class", "Expression")
-	instantiate_node(model, "Class", "funcdef")
-	instantiate_node(model, "Class", "param")
-	instantiate_node(model, "Class", "if")
-	instantiate_node(model, "Class", "break")
-	instantiate_node(model, "Class", "while")
-	instantiate_node(model, "Class", "continue")
-	instantiate_node(model, "Class", "assign")
-	instantiate_node(model, "Class", "return")
-	instantiate_node(model, "Class", "output")
-	instantiate_node(model, "Class", "declare")
-	instantiate_node(model, "Class", "global")
-	instantiate_node(model, "Class", "access")
-	instantiate_node(model, "Class", "constant")
-	instantiate_node(model, "Class", "input")
-	instantiate_node(model, "Class", "resolve")
-	instantiate_node(model, "Class", "call")
-	instantiate_link(model, "Association", "dict_link", "Action", "Any")
-	instantiate_link(model, "Association", "to_str", "dict_link", "String")
+	instantiate_node(model, "AttributeValue", "Action")
+	instantiate_node(model, "AttributeValue", "Statement")
+	instantiate_node(model, "AttributeValue", "Expression")
+	instantiate_node(model, "AttributeValue", "funcdef")
+	instantiate_node(model, "AttributeValue", "param")
+	instantiate_node(model, "AttributeValue", "if")
+	instantiate_node(model, "AttributeValue", "break")
+	instantiate_node(model, "AttributeValue", "while")
+	instantiate_node(model, "AttributeValue", "continue")
+	instantiate_node(model, "AttributeValue", "assign")
+	instantiate_node(model, "AttributeValue", "return")
+	instantiate_node(model, "AttributeValue", "output")
+	instantiate_node(model, "AttributeValue", "declare")
+	instantiate_node(model, "AttributeValue", "global")
+	instantiate_node(model, "AttributeValue", "access")
+	instantiate_node(model, "AttributeValue", "constant")
+	instantiate_node(model, "AttributeValue", "input")
+	instantiate_node(model, "AttributeValue", "resolve")
+	instantiate_node(model, "AttributeValue", "call")
+	instantiate_link(model, "Attribute", "dict_link", "Action", "Element")
+	instantiate_link(model, "Attribute", "to_str", "dict_link", "String")
 	instantiate_attribute(model, "to_str", "name", "name")
-	instantiate_link(model, "Inheritance", "", "Action", "Any")
+	instantiate_link(model, "Inheritance", "", "Action", "Element")
 	instantiate_link(model, "Inheritance", "", "funcdef", "Action")
 	instantiate_link(model, "Inheritance", "", "param", "Action")
 	instantiate_link(model, "Inheritance", "", "Statement", "Action")
@@ -335,29 +328,29 @@ Void function add_AL_to_MM(model : Element):
 	instantiate_link(model, "Inheritance", "", "access", "Expression")
 	instantiate_link(model, "Inheritance", "", "constant", "Expression")
 	instantiate_link(model, "Inheritance", "", "input", "Expression")
-	instantiate_link(model, "Association", "statement_next", "Statement", "Statement")
-	instantiate_link(model, "Association", "if_cond", "if", "Expression")
-	instantiate_link(model, "Association", "if_then", "if", "Statement")
-	instantiate_link(model, "Association", "if_else", "if", "Statement")
-	instantiate_link(model, "Association", "while_cond", "while", "Expression")
-	instantiate_link(model, "Association", "while_body", "while", "Statement")
-	instantiate_link(model, "Association", "assign_var", "assign", "Any")
-	instantiate_link(model, "Association", "assign_value", "assign", "Expression")
-	instantiate_link(model, "Association", "break_while", "break", "while")
-	instantiate_link(model, "Association", "continue_while", "continue", "while")
-	instantiate_link(model, "Association", "return_value", "return", "Expression")
-	instantiate_link(model, "Association", "resolve_var", "resolve", "Any")
-	instantiate_link(model, "Association", "access_var", "access", "Any")
-	instantiate_link(model, "Association", "constant_node", "constant", "Any")
-	instantiate_link(model, "Association", "output_node", "output", "Expression")
-	instantiate_link(model, "Association", "global_var", "global", "String")
-	instantiate_link(model, "Association", "param_name", "param", "String")
-	instantiate_link(model, "Association", "param_value", "param", "Expression")
-	instantiate_link(model, "Association", "param_next_param", "param", "param")
-	instantiate_link(model, "Association", "funcdef_body", "funcdef", "Statement")
-	instantiate_link(model, "Association", "call_func", "call", "Expression")
-	instantiate_link(model, "Association", "call_params", "call", "param")
-	instantiate_link(model, "Association", "call_last_param", "call", "param")
+	instantiate_link(model, "Attribute", "statement_next", "Statement", "Statement")
+	instantiate_link(model, "Attribute", "if_cond", "if", "Expression")
+	instantiate_link(model, "Attribute", "if_then", "if", "Statement")
+	instantiate_link(model, "Attribute", "if_else", "if", "Statement")
+	instantiate_link(model, "Attribute", "while_cond", "while", "Expression")
+	instantiate_link(model, "Attribute", "while_body", "while", "Statement")
+	instantiate_link(model, "Attribute", "assign_var", "assign", "Element")
+	instantiate_link(model, "Attribute", "assign_value", "assign", "Expression")
+	instantiate_link(model, "Attribute", "break_while", "break", "while")
+	instantiate_link(model, "Attribute", "continue_while", "continue", "while")
+	instantiate_link(model, "Attribute", "return_value", "return", "Expression")
+	instantiate_link(model, "Attribute", "resolve_var", "resolve", "Element")
+	instantiate_link(model, "Attribute", "access_var", "access", "Element")
+	instantiate_link(model, "Attribute", "constant_node", "constant", "Element")
+	instantiate_link(model, "Attribute", "output_node", "output", "Expression")
+	instantiate_link(model, "Attribute", "global_var", "global", "String")
+	instantiate_link(model, "Attribute", "param_name", "param", "String")
+	instantiate_link(model, "Attribute", "param_value", "param", "Expression")
+	instantiate_link(model, "Attribute", "param_next_param", "param", "param")
+	instantiate_link(model, "Attribute", "funcdef_body", "funcdef", "Statement")
+	instantiate_link(model, "Attribute", "call_func", "call", "Expression")
+	instantiate_link(model, "Attribute", "call_params", "call", "param")
+	instantiate_link(model, "Attribute", "call_last_param", "call", "param")
 	instantiate_link(model, "Inheritance", "", "statement_next", "dict_link")
 	instantiate_link(model, "Inheritance", "", "if_cond", "dict_link")
 	instantiate_link(model, "Inheritance", "", "if_then", "dict_link")
@@ -383,45 +376,45 @@ Void function add_AL_to_MM(model : Element):
 	instantiate_link(model, "Inheritance", "", "call_last_param", "dict_link")
 
 	// Add cardinalities on how many connections are allowed: one of each
-	instantiate_attribute(model, "statement_next", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "if_cond", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "if_cond", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "if_then", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "if_then", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "if_else", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "while_cond", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "while_cond", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "while_body", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "while_body", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "assign_var", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "assign_var", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "assign_value", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "assign_value", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "break_while", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "break_while", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "continue_while", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "continue_while", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "return_value", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "resolve_var", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "resolve_var", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "access_var", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "access_var", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "constant_node", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "constant_node", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "output_node", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "output_node", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "global_var", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "global_var", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "param_name", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "param_name", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "param_value", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "param_value", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "param_next_param", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "funcdef_body", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "funcdef_body", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "call_func", "target_lower_cardinality", 1)
-	instantiate_attribute(model, "call_func", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "call_params", "target_upper_cardinality", 1)
-	instantiate_attribute(model, "call_last_param", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "statement_next", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "if_cond", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "if_cond", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "if_then", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "if_then", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "if_else", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "while_cond", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "while_cond", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "while_body", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "while_body", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "assign_var", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "assign_var", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "assign_value", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "assign_value", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "break_while", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "break_while", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "continue_while", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "continue_while", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "return_value", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "resolve_var", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "resolve_var", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "access_var", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "access_var", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "constant_node", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "constant_node", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "output_node", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "output_node", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "global_var", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "global_var", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "param_name", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "param_name", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "param_value", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "param_value", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "param_next_param", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "funcdef_body", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "funcdef_body", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "call_func", "target_lower_cardinality", 1)
+	// instantiate_attribute(model, "call_func", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "call_params", "target_upper_cardinality", 1)
+	// instantiate_attribute(model, "call_last_param", "target_upper_cardinality", 1)
 
 	return !