- Removed some cases for handling stringified crefs.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12434 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: perost

Compiler/BackEnd/BackendVariable.mo

@@ -1780,59 +1780,23 @@ public function topLevelInput "function: topLevelInput
   input DAE.VarDirection inVarDirection;
   input DAE.ConnectorType inConnectorType;
 algorithm
-  _ := matchcontinue (inComponentRef,inVarDirection,inConnectorType)
-    local
-      DAE.ComponentRef cr;
-      String name;
-    case ((cr as DAE.CREF_IDENT(ident = name)),DAE.INPUT(),_)
-      equation
-        {_} = Util.stringSplitAtChar(name, ".") "top level ident, no dots" ;
-      then
-        ();
-    case (DAE.CREF_IDENT(ident = name),DAE.INPUT(),DAE.POTENTIAL()) /* Connector input variables at top level for crefs that are stringified */
-      equation
-        {_,_} = Util.stringSplitAtChar(name, ".");
-      then
-        ();
-    case (DAE.CREF_IDENT(ident = name),DAE.INPUT(),DAE.FLOW())
-      equation
-        {_,_} = Util.stringSplitAtChar(name, ".");
-      then
-        ();
-    /* For crefs that are not yet stringified, e.g. lower_known_var */
-    case (DAE.CREF_QUAL(ident = name,componentRef = DAE.CREF_IDENT(ident = _)),DAE.INPUT(),DAE.FLOW()) then ();
-    case ((cr as DAE.CREF_QUAL(ident = name,componentRef = DAE.CREF_IDENT(ident = _))),DAE.INPUT(),DAE.POTENTIAL()) then ();
-  end matchcontinue;
+  _ := match (inComponentRef,inVarDirection,inConnectorType)
+    case (DAE.CREF_IDENT(ident = _), DAE.INPUT(), _) then ();
+    case (DAE.CREF_QUAL(componentRef = DAE.CREF_IDENT(ident = _)), DAE.INPUT(), DAE.FLOW()) then ();
+    case (DAE.CREF_QUAL(componentRef = DAE.CREF_IDENT(ident = _)), DAE.INPUT(), DAE.POTENTIAL()) then ();
+  end match;
 end topLevelInput;
 
 protected function topLevelOutput
   input DAE.ComponentRef inComponentRef;
   input DAE.VarDirection inVarDirection;
   input DAE.ConnectorType inConnectorType;
 algorithm
-  _ := matchcontinue(inComponentRef, inVarDirection, inConnectorType)
-  local 
-    DAE.ComponentRef cr;
-    String name;
-    case ((cr as DAE.CREF_IDENT(ident = name)),DAE.OUTPUT(),_)
-      equation
-        {_} = Util.stringSplitAtChar(name, ".") "top level ident, no dots" ;
-      then
-        ();
-    case (DAE.CREF_IDENT(ident = name),DAE.OUTPUT(),DAE.POTENTIAL()) /* Connector input variables at top level for crefs that are stringified */
-      equation
-        {_,_} = Util.stringSplitAtChar(name, ".");
-      then
-        ();
-    case (DAE.CREF_IDENT(ident = name),DAE.OUTPUT(),DAE.FLOW())
-      equation
-        {_,_} = Util.stringSplitAtChar(name, ".");
-      then
-        ();
-    /* For crefs that are not yet stringified, e.g. lower_known_var */
-    case (DAE.CREF_QUAL(ident = name,componentRef = DAE.CREF_IDENT(ident = _)),DAE.OUTPUT(),DAE.FLOW()) then ();
-    case ((cr as DAE.CREF_QUAL(ident = name,componentRef = DAE.CREF_IDENT(ident = _))),DAE.OUTPUT(),DAE.POTENTIAL()) then ();
-  end matchcontinue;
+  _ := match(inComponentRef, inVarDirection, inConnectorType)
+    case (DAE.CREF_IDENT(ident = _), DAE.OUTPUT(), _) then ();
+    case (DAE.CREF_QUAL(componentRef = DAE.CREF_IDENT(ident = _)), DAE.OUTPUT(), DAE.FLOW()) then ();
+    case (DAE.CREF_QUAL(componentRef = DAE.CREF_IDENT(ident = _)), DAE.OUTPUT(), DAE.POTENTIAL()) then ();
+  end match;
 end topLevelOutput;
 
 

Compiler/FrontEnd/CheckModel.mo

@@ -342,32 +342,12 @@ public function topLevelInput
   input DAE.ConnectorType inConnectorType;
   output Boolean b;
 algorithm
-  b := matchcontinue (inComponentRef,inVarDirection,inConnectorType)
-    local
-      DAE.ComponentRef cr;
-      String name;
-    case ((cr as DAE.CREF_IDENT(ident = name)),DAE.INPUT(),_)
-      equation
-        {_} = Util.stringSplitAtChar(name, ".") "top level ident, no dots" ;
-      then
-        true;
-    case (DAE.CREF_IDENT(ident = name),DAE.INPUT(),DAE.POTENTIAL()) /* Connector input variables at top level for crefs that are stringified */
-      equation
-        {_,_} = Util.stringSplitAtChar(name, ".");
-      then
-        true;
-    case (DAE.CREF_IDENT(ident = name),DAE.INPUT(),DAE.FLOW())
-      equation
-        {_,_} = Util.stringSplitAtChar(name, ".");
-      then
-        true;
-    /* For crefs that are not yet stringified, e.g. lower_known_var */
-    case (DAE.CREF_QUAL(ident = name,componentRef = DAE.CREF_IDENT(ident = _)),DAE.INPUT(),DAE.FLOW()) then true;
-    case ((cr as DAE.CREF_QUAL(ident = name,componentRef = DAE.CREF_IDENT(ident = _))),DAE.INPUT(),DAE.POTENTIAL()) then true;
-    else 
-      then 
-        false;
-  end matchcontinue;
+  b := match (inComponentRef,inVarDirection,inConnectorType)
+    case (DAE.CREF_IDENT(ident = _), DAE.INPUT(), _) then true;
+    case (DAE.CREF_QUAL(componentRef = DAE.CREF_IDENT(ident = _)), DAE.INPUT(), DAE.FLOW()) then true;
+    case (DAE.CREF_QUAL(componentRef = DAE.CREF_IDENT(ident = _)), DAE.INPUT(), DAE.POTENTIAL()) then true;
+    else false;
+  end match;
 end topLevelInput;
 
 public function algorithmOutputs