Further improve naming for Simulink MATLAB functions

Author: florianschanda

miss_hit/mh_trace.py

@@ -138,9 +138,11 @@ def visit_end(self, node, n_parent, relation):
         if isinstance(node, Function_Definition) and \
            not any(self.no_tracing_stack):
             if self.blockname:
-                name = self.blockname
+                name      = self.blockname
+                shortname = self.blockname
             else:
-                name = self.name_prefix + node.get_local_name()
+                name      = self.name_prefix + node.get_local_name()
+                shortname = node.get_local_name()
             tag  = "matlab %s" % name
             location = node.loc()
             lobster_loc  = {"kind"   : "file",
@@ -152,7 +154,7 @@ def visit_end(self, node, n_parent, relation):
                                                set()))
             item = {"tag"         : tag,
                     "location"    : lobster_loc,
-                    "name"        : node.get_local_name(),
+                    "name"        : shortname,
                     "refs"        : ["req %s" % tag for tag in all_tags],
                     "just_up"     : [],
                     "just_down"   : [],

miss_hit_core/s_ast.py

@@ -199,8 +199,10 @@ def full_name(self):
         name_stack = []
         ptr = self
         while ptr:
-            if isinstance(ptr, Container):
+            if isinstance(ptr, Model):
                 name_stack.append(ptr.name)
+            elif isinstance(ptr, Library):
+                break
             elif isinstance(ptr, Block):
                 name_stack.append(ptr.name)
             ptr = ptr.n_parent

tests/trace/simulink-matlab/mh_imp_trace.lobster

@@ -31,7 +31,7 @@
         "kind": "file",
         "line": 1
       },
-      "name": "fcn",
+      "name": "test/Potato/Thing_A",
       "refs": [],
       "shared": false,
       "tag": "matlab test/Potato/Thing_A"
@@ -48,7 +48,7 @@
         "kind": "file",
         "line": 1
       },
-      "name": "fcn",
+      "name": "test/Potato/Thing_B",
       "refs": [
         "req foo.bar"
       ],