Optimize VerifyModel.checkDiscreteReal

- Don't strip subscripts from and reallocate every single variable when
  we only need to look up discrete ones.
- Use hash and equality functions that ignores subscripts to avoid
  having to strip subscripts at all.

Author: perost

OMCompiler/Compiler/NFFrontEnd/NFVerifyModel.mo

@@ -351,7 +351,7 @@ protected
     list<Variable> illegal_discrete_vars = {};
     String err_str = "";
   algorithm
-    discrete_reals := UnorderedSet.new(ComponentRef.hash, ComponentRef.isEqual);
+    discrete_reals := UnorderedSet.new(ComponentRef.hashStrip, ComponentRef.isEqualStrip);
 
     // collect all lhs crefs that are discrete and real from equations
     for eqn in flatModel.equations loop
@@ -369,7 +369,6 @@ protected
     for variable in flatModel.variables loop
       // check variability and not type for discrete variables
       // remove all subscripts to handle arrays
-      variable.name := ComponentRef.stripSubscriptsAll(variable.name);
       if Variable.variability(variable) == Variability.DISCRETE and Type.isReal(Type.arrayElementType(variable.ty)) and
          not UnorderedSet.contains(variable.name, discrete_reals) then
         illegal_discrete_vars := variable :: illegal_discrete_vars;
@@ -379,7 +378,8 @@ protected
     // report error if there are any
     if not listEmpty(illegal_discrete_vars) then
       for var in illegal_discrete_vars loop
-        Error.addSourceMessage(Error.DISCRETE_REAL_UNDEFINED, {ComponentRef.toString(var.name)}, var.info);
+        Error.addSourceMessage(Error.DISCRETE_REAL_UNDEFINED,
+          {ComponentRef.toString(ComponentRef.stripSubscriptsAll(var.name))}, var.info);
       end for;
       fail();
     end if;
@@ -545,7 +545,7 @@ protected
         guard(Type.isReal(Type.arrayElementType(ty)))
         algorithm
           // remove all subscripts to handle arrays
-          UnorderedSet.add(ComponentRef.stripSubscriptsAll(cref), discreteReals);
+          UnorderedSet.add(cref, discreteReals);
         then
           ();
 
@@ -577,12 +577,12 @@ protected
     list<InstNode> inputs;
   algorithm
     // remove all subscripts to handle arrays
-    UnorderedSet.add(ComponentRef.stripSubscriptsAll(cref), discreteReals);
+    UnorderedSet.add(cref, discreteReals);
     // also add all record elements
     (inputs, _, _) := Record.collectRecordParams(cls);
     for node in inputs loop
       element := ComponentRef.prefixCref(node, InstNode.getType(node), {}, cref);
-      UnorderedSet.add(ComponentRef.stripSubscriptsAll(element), discreteReals);
+      UnorderedSet.add(element, discreteReals);
     end for;
   end checkDiscreteRealRecord;