Detect cardinality being used

Author: sjoelund

Compiler/FrontEnd/NFSCodeDependency.mo

@@ -277,7 +277,11 @@ protected function analyseItem
   input Item inItem;
   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;
       NFSCodeEnv.Frame cls_env;
@@ -287,13 +291,6 @@ algorithm
       SCode.Element cls;
       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)
       equation
@@ -311,6 +308,9 @@ algorithm
       equation
         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);
         analyseComment(cmt, env, info);
@@ -328,7 +328,7 @@ algorithm
       then
         fail();
 
-  end matchcontinue;
+  end match;
 end analyseItem;
 
 protected function analyseItemIfRedeclares

Compiler/FrontEnd/NFSCodeFlatten.mo

@@ -114,6 +114,7 @@ algorithm
         //System.startTimer();
         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);
 
@@ -122,7 +123,6 @@ algorithm
         env = NFEnvExtends.update(env);
 
         (prog, env) = NFSCodeDependency.analyse(inClassName, env, prog);
-        checkForCardinality(env);
         (prog, env) = NFSCodeFlattenImports.flattenProgram(prog, env);
 
         //System.stopTimer();
@@ -143,29 +143,6 @@ algorithm
   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
   input SCode.Program inProgram;
   output SCode.Program outProgram;