Changeset 25dbe82 in OpenModelica for Compiler/FrontEnd/Lookup.mo

Timestamp:

2016-04-08T19:06:55+02:00 (8 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:

12b9c58

Parents:

6e3121a4

git-author:

Per Östlund <perost86@…> (04/08/16 19:06:55)

git-committer:

hudson <openmodelica@…> (04/08/16 19:06:55)

Message:

Fix for ticket:3825.

• Handle conditional expandable connectors.
• Moved InstSection.isExpandableConnectorType => Types.isExpandableConnector.

File:

• Compiler/FrontEnd/Lookup.mo (modified) (2 diffs)

Compiler/FrontEnd/Lookup.mo

@@ -1066 +1066 @@
   output DAE.Type ty;
   output FCore.Status status;
+  output Boolean isExpandable = false;
 protected
   FCore.Graph comp_env;
@@ -1088 +1089 @@
           attr := parent_attr;
         else
-          (attr, ty, status) :=
-            lookupConnectorVar(comp_env, cr.componentRef, false);
+          try
+            (attr, ty, status, isExpandable) :=
+              lookupConnectorVar(comp_env, cr.componentRef, false);
+          else
+            if Types.isExpandableConnector(ty) then
+              attr := parent_attr;
+              isExpandable := true;
+            else
+              fail();
+            end if;
+          end try;
 
           // Propagate variability.