[NF] do not set structural parameter variability for constants

if they have annotation(Evaluate=true)

Belonging to [master]:
  - #2601

Author: adrpo

Compiler/NFFrontEnd/NFExpression.mo

@@ -1179,7 +1179,10 @@ public
 
     end match;
 
-    // (dexp, changed) := ExpressionSimplify.simplify(dexp);
+    //(dexp, changed) := ExpressionSimplify.simplify(dexp);
+    //if changed then
+    //  (dexp, changed) := ExpressionSimplify.simplify(dexp);
+    //end if;
   end toDAE;
 
   function dimensionCount

Compiler/NFFrontEnd/NFTyping.mo

@@ -691,8 +691,9 @@ algorithm
   c := InstNode.component(node);
 
   // @adrpo: if Evaluate=true make the parameter a structural parameter
-  if Component.getEvaluateAnnotation(c) then
-    c := Component.setVariability(Variability.STRUCTURAL_PARAMETER, c);
+  // only make it a structural parameter if is not constant, duh!, 1071 regressions :)
+  if Component.getEvaluateAnnotation(c) and (Component.variability(c) > Variability.STRUCTURAL_PARAMETER) then
+      c := Component.setVariability(Variability.STRUCTURAL_PARAMETER, c);
   end if;
 
   () := match c