fix #6127, #6128, #6138

- remove error messages in #6129 - rename updateConnectionStr to updateConnectionAnnotation
OpenModelica · Sep 28, 2020 · 2a521d2 · 2a521d2
1 parent f890e1f
commit 2a521d2
Show file tree

Hide file tree

Showing 9 changed files with 258 additions and 144 deletions.
diff --git a/OMCompiler/Compiler/FrontEnd/AbsynUtil.mo b/OMCompiler/Compiler/FrontEnd/AbsynUtil.mo
@@ -6558,5 +6558,18 @@ algorithm
   ELEMENT(specification = elSpec) := el;
 end elementSpec;
 
+public function isClassOrComponentElementSpec
+  "The ElementSpec type contains the name of the element, and this function
+   extracts this name."
+  input ElementSpec inElementSpec;
+  output Boolean yes = false;
+algorithm
+  yes := match (inElementSpec)
+    case CLASSDEF(class_ = CLASS()) then true;
+    case COMPONENTS(components = {COMPONENTITEM()}) then true;
+    else false;
+  end match;
+end isClassOrComponentElementSpec;
+
 annotation(__OpenModelica_Interface="frontend");
 end AbsynUtil;
diff --git a/OMCompiler/Compiler/FrontEnd/ModelicaBuiltin.mo b/OMCompiler/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -3231,7 +3231,7 @@ annotation(preferredView="text",Documentation(info="<html>
 </html>"));
 end updateConnection;
 
-function updateConnectionStr
+function updateConnectionAnnotation
   input TypeName className;
   input String from;
   input String to;
@@ -3241,7 +3241,7 @@ external "builtin";
 annotation(preferredView="text",Documentation(info="<html>
 <p>Updates the connection annotation in the class. See also updateConnectionNames().</p>
 </html>"));
-end updateConnectionStr;
+end updateConnectionAnnotation;
 
 function updateConnectionNames
   input TypeName className;

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFModelicaBuiltin.mo b/OMCompiler/Compiler/NFFrontEnd/NFModelicaBuiltin.mo
@@ -3449,7 +3449,7 @@ annotation(preferredView="text",Documentation(info="<html>
 </html>"));
 end updateConnection;
 
-function updateConnectionStr
+function updateConnectionAnnotation
   input TypeName className;
   input String from;
   input String to;
@@ -3459,7 +3459,7 @@ external "builtin";
 annotation(preferredView="text",Documentation(info="<html>
 <p>Updates the connection annotation in the class. See also updateConnectionNames().</p>
 </html>"));
-end updateConnectionStr;
+end updateConnectionAnnotation;
 
 function updateConnectionNames
   input TypeName className;

diff --git a/OMCompiler/Compiler/Script/CevalScriptBackend.mo b/OMCompiler/Compiler/Script/CevalScriptBackend.mo
@@ -2789,7 +2789,7 @@ algorithm
 
     case (cache,_,"updateConnection",_,_) then (cache,Values.BOOL(false));
 
-    case (cache,_,"updateConnectionStr",{Values.CODE(Absyn.C_TYPENAME(classpath)),Values.STRING(str1), Values.STRING(str2),Values.STRING(annStr)},_)
+    case (cache,_,"updateConnectionAnnotation",{Values.CODE(Absyn.C_TYPENAME(classpath)),Values.STRING(str1), Values.STRING(str2),Values.STRING(annStr)},_)
       algorithm
         istmts := Parser.parsestringexp("__dummy(" + annStr + ");");
         GlobalScript.ISTMTS(interactiveStmtLst = {GlobalScript.IEXP(exp = aexp)}) := istmts;
@@ -2803,7 +2803,7 @@ algorithm
       then
         (cache,Values.BOOL(true));
 
-    case (cache,_,"updateConnectionStr",_,_) then (cache,Values.BOOL(false));
+    case (cache,_,"updateConnectionAnnotation",_,_) then (cache,Values.BOOL(false));
 
     case (cache,_,"updateConnectionNames",{Values.CODE(Absyn.C_TYPENAME(classpath)),Values.STRING(str1), Values.STRING(str2),
                                            Values.STRING(str3), Values.STRING(str4)},_)