Browse Source

Fixed another error in the rules vs. the actually executed ones

Yentl Van Tendeloo 8 years ago
parent
commit
e86a9a6c3e

+ 1 - 1
kernel/rules/MvK_rules.mvc

@@ -1670,7 +1670,7 @@ Rule Resolve_NoAttrGlobal_N28 {
         value = "username"
         value = "username"
     }
     }
     MatchEdge (N28_0, N28_2) {
     MatchEdge (N28_0, N28_2) {
-        value = "'__global'"
+        value = "'globals'"
     }
     }
     MatchEdge (N28_1, N28_3) {
     MatchEdge (N28_1, N28_3) {
         value = "'frame'"
         value = "'frame'"

+ 0 - 6
kernel/rules/to_graphviz.alc

@@ -18,9 +18,6 @@ Boolean function main(model : Element):
 		instantiate_attribute(model, file, "name", rule + ".dot")
 		instantiate_attribute(model, file, "name", rule + ".dot")
 		instantiate_attribute(model, file, "content", content)
 		instantiate_attribute(model, file, "content", content)
 
 
-		log("File " + cast_string(list_read(string_split(rule, "/"), 1)) + ".dot")
-		log(content)
-
     return True!
     return True!
 
 
 String function print_rule(model : Element, rule : String):
 String function print_rule(model : Element, rule : String):
@@ -93,8 +90,6 @@ String function print_rule(model : Element, rule : String):
             style = "color=\"blue\", style=\"dashed\""
             style = "color=\"blue\", style=\"dashed\""
         elif (type == "Rules/NACEdge"):
         elif (type == "Rules/NACEdge"):
             style = "color=\"red\", style=\"dotted\""
             style = "color=\"red\", style=\"dotted\""
-		else:
-			log("Unknown style for type: " + type)
 
 
         // Try to add value
         // Try to add value
 		source = string_replace(readAssociationSource(model, edge), "/", "_")
 		source = string_replace(readAssociationSource(model, edge), "/", "_")
@@ -116,5 +111,4 @@ String function print_rule(model : Element, rule : String):
     // Close everything
     // Close everything
     text = text + "}"
     text = text + "}"
 
 
-    log("Generated text: " + text)
     return text!
     return text!

+ 0 - 2
services/files/main.py

@@ -13,8 +13,6 @@ login("file", "file")
 def file_service(port):
 def file_service(port):
     filename = service_get(port)
     filename = service_get(port)
     content = service_get(port)
     content = service_get(port)
-    import os
-    print(os.getcwd())
     try:
     try:
         with open(filename, 'w') as f:
         with open(filename, 'w') as f:
             f.write(content)
             f.write(content)

+ 1 - 1
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)
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
 
-Date:   Thu Nov 23 14:46:09 2017
+Date:   Thu Nov 23 16:19:24 2017
 
 
 Model author: Yentl Van Tendeloo
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server
 Model name:   MvK Server