Changeset 3c1d34e in OpenModelica

Timestamp:

2019-01-14T11:26:28+01:00 (5 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

8481cc5

Parents:

0fb5b980

git-author:

Per Östlund <per.ostlund@…> (01/14/19 11:26:28)

git-committer:

hudson <openmodelica@…> (01/14/19 11:26:28)

Message:

[NF] Collect functions in builtin attributes.

Belonging to [master]:

• OpenModelica/OMCompiler#2869

File:

• Compiler/NFFrontEnd/NFFlatten.mo (modified) (2 diffs)

Compiler/NFFrontEnd/NFFlatten.mo

@@ -1239 +1239 @@
   input Variable var;
   input output FunctionTree funcs;
-protected
-  Binding binding;
-  ComponentRef cref;
-  InstNode node;
-  Type ty;
 algorithm
   () := match var
-    case Variable.VARIABLE(ty = ty, binding = binding)
-      algorithm
-        // TODO: Collect functions from the component's type attributes.
-
-        funcs := collectTypeFuncs(ty, funcs);
-
-        // Collect functions used in the component's binding, if it has one.
-        if Binding.isExplicitlyBound(binding) then
-          funcs := collectExpFuncs(Binding.getTypedExp(binding), funcs);
-        end if;
+    case Variable.VARIABLE()
+      algorithm
+        funcs := collectTypeFuncs(var.ty, funcs);
+        funcs := collectBindingFuncs(var.binding, funcs);
+
+        for attr in var.typeAttributes loop
+          funcs := collectBindingFuncs(Util.tuple22(attr), funcs);
+        end for;
       then
         ();
@@ -1261 +1254 @@
   end match;
 end collectComponentFuncs;
+
+function collectBindingFuncs
+  input Binding binding;
+  input output FunctionTree funcs;
+algorithm
+  if Binding.isExplicitlyBound(binding) then
+    funcs := collectExpFuncs(Binding.getTypedExp(binding), funcs);
+  end if;
+end collectBindingFuncs;
 
 function collectTypeFuncs