Browse Source

Fixed syntax errors

Yentl Van Tendeloo 8 years ago
parent
commit
d280994cc2
2 changed files with 6 additions and 4 deletions
  1. 2 2
      bootstrap/model_management.alc
  2. 4 2
      bootstrap/primitives.alc

+ 2 - 2
bootstrap/model_management.alc

@@ -42,8 +42,8 @@ Element function model_fuse(models : Element):
 			if (is_edge(model["model"][key])):
 				String src
 				String dst
-				src = model_name + cast_e2s(reverse[cast_id2s(read_edge_src(model["model"][key])))
-				dst = model_name + cast_e2s(reverse[cast_id2s(read_edge_dst(model["model"][key])))
+				src = model_name + cast_e2s(reverse[cast_id2s(read_edge_src(model["model"][key]))])
+				dst = model_name + cast_e2s(reverse[cast_id2s(read_edge_dst(model["model"][key]))])
 				if (bool_and(dict_in(new_model["model"], src), dict_in(new_model["model"], dst))):
 					instantiate_link(new_model, type, model_name + key, src, dst)
 				else:

+ 4 - 2
bootstrap/primitives.alc

@@ -350,7 +350,7 @@ Element function set_merge(a : Element, b : Element):
 		set_add(a, set_pop(b))
 	return a!
 
-Element make_reverse_dictionary(dict : Element):
+Element function make_reverse_dictionary(dict : Element):
 	Element keys
 	Element reverse
 	String key
@@ -360,8 +360,10 @@ Element make_reverse_dictionary(dict : Element):
 	while (read_nr_out(keys) > 0):
 		key = set_pop(keys)
 		key = cast_id2s(key)
+		log("Invert " + cast_v2s(dict[key]))
 		if (dict_in(reverse, key)):
 			dict_delete(reverse, key)
 		dict_add(reverse, key, dict[key])
 
-	return reverse
+	log("Created inverse dictionary")
+	return reverse!