Changeset 5ed2c5e in OpenModelica

Timestamp:

2016-04-01T19:22:48+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:

141c87f0

Parents:

c914d20

git-author:

Martin Sjölund <martin.sjolund@…> (04/01/16 19:22:48)

git-committer:

hudson <openmodelica@…> (04/01/16 19:22:48)

Message:

Detect cardinality being used

Location:

Compiler/FrontEnd

Files:

• NFSCodeDependency.mo (modified) (4 diffs)
• NFSCodeFlatten.mo (modified) (3 diffs)

Compiler/FrontEnd/NFSCodeDependency.mo

@@ -278 +278 @@
   input Env inEnv;
 algorithm
-  _ := matchcontinue(inItem, inEnv)
+  // Check if the item is already marked as used, then we can stop here.
+  if NFSCodeEnv.isItemUsed(inItem) then
+    return;
+  end if;
+  _ := match(inItem, inEnv)
     local
       SCode.ClassDef cdef;
@@ -288 +292 @@
       SCode.Comment cmt;
 
-    // Check if the item is already marked as used, then we can stop here.
-    case (_, _)
-      equation
-        true = NFSCodeEnv.isItemUsed(inItem);
-      then
-        ();
-
     // A component, mark it and it's environment as used.
     case (NFSCodeEnv.VAR(), env)
@@ -312 +309 @@
         markItemAsUsed(inItem, env);
         env = NFSCodeEnv.enterFrame(cls_env, env);
+        if (if cls.name=="cardinality" then match inEnv case {NFSCodeEnv.FRAME(name=NONE())} then true; else false; end match else false) then
+          System.setUsesCardinality(true);
+        end if;
         analyseClassDef(cdef, res, env, false, info);
         analyseMetaType(res, env, info);
@@ -329 +329 @@
         fail();
 
-  end matchcontinue;
+  end match;
 end analyseItem;
 

Compiler/FrontEnd/NFSCodeFlatten.mo

@@ -115 +115 @@
         System.tmpTickResetIndex(0, NFSCodeEnv.tmpTickIndex);
         System.tmpTickResetIndex(1, NFSCodeEnv.extendsTickIndex);
+        System.setUsesCardinality(false);
         // TODO: Enable this when NFSCodeEnv.tmpTickIndex is removed.
         //System.tmpTickResetIndex(0, NFSCodeEnv.tmpTickIndex);
@@ -123 +124 @@
 
         (prog, env) = NFSCodeDependency.analyse(inClassName, env, prog);
-        checkForCardinality(env);
         (prog, env) = NFSCodeFlattenImports.flattenProgram(prog, env);
 
@@ -143 +143 @@
   end matchcontinue;
 end flattenClassInProgram;
-
-protected function checkForCardinality
-  "Checks if the cardinality operator is used or not and sets the system flag,
-  so that some work can be avoided in Inst if cardinality isn't used."
-  input Env inEnv;
-algorithm
-  _ := matchcontinue(inEnv)
-    case _
-      equation
-        (_, _, _) = NFSCodeLookup.lookupNameSilent(Absyn.IDENT("cardinality"),
-          inEnv, Absyn.dummyInfo);
-        System.setUsesCardinality(true);
-      then
-        ();
-
-    else
-      equation
-        System.setUsesCardinality(false);
-      then
-        ();
-
-  end matchcontinue;
-end checkForCardinality;
 
 public function flattenCompleteProgram