- Fixes for #1371

- Implemented errors when functions contain illegal elements (except public elements that should be protected, since MSL uses that)
  - Added testcases FunctionWithEquation.mo and FunctionProtectedInput.mo


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

Compiler/BackEnd/BackendDAECreate.mo

@@ -1553,6 +1553,7 @@ protected function lowerAlgorithm
   input Integer aindx;
   output list<BackendDAE.Equation> lst;
   output list<BackendDAE.Equation> lst1 "algorithms with no outputs will be moved to known equations";
+protected
   list<DAE.Exp> inputs,outputs;
   BackendDAE.Value numnodes;
 algorithm
@@ -1887,6 +1888,7 @@ protected function transformDelayExpressions
 "Helper for processDelayExpressions()"
   input tuple<DAE.Exp,Integer> itpl;
   output tuple<DAE.Exp,Integer> otpl;
+protected
   DAE.Exp e;
   Integer i;
 algorithm
@@ -2598,6 +2600,7 @@ protected function differentZeroCrossing "function: differentZeroCrossing
   input BackendDAE.ZeroCrossing zc1;
   input BackendDAE.ZeroCrossing zc2;
   output Boolean res_1;
+protected
   Boolean res;
 algorithm
   res := sameZeroCrossing(zc1, zc2);
@@ -2616,6 +2619,7 @@ public function findZeroCrossings "function: findZeroCrossings
   input list<BackendDAE.WhenClause> wc;
   input list<DAE.Algorithm> algs;
   output list<BackendDAE.ZeroCrossing> res_1;
+protected
   list<BackendDAE.ZeroCrossing> res;
 algorithm
   res := findZeroCrossings2(vars, knvars,eq,multiDimEqs,1, wc, 1, algs);

Compiler/BackEnd/BackendDAEUtil.mo

@@ -83,6 +83,7 @@ public function checkBackendDAEWithErrorMsg"function: checkBackendDAEWithErrorMs
   author: Frenkel TUD
   run checkDEALow and prints all errors"
   input BackendDAE.BackendDAE inBackendDAE;
+protected
   list<tuple<DAE.Exp,list<DAE.ComponentRef>>> expCrefs;
 algorithm  
   expCrefs := checkBackendDAE(inBackendDAE);
@@ -104,6 +105,7 @@ algorithm
 
     case ({}) then ();
 
+
     case (((e,crefs))::res)
       equation
         false = RTOpts.debugFlag("checkBackendDAE");
@@ -1074,6 +1076,7 @@ public function emptyVars
   Returns a Variable datastructure that is empty.
   Using the bucketsize 10000 and array size 1000."
   output BackendDAE.Variables outVariables;
+protected
   array<list<BackendDAE.CrefIndex>> arr;
   array<list<BackendDAE.StringIndex>> arr2;
   list<Option<BackendDAE.Var>> lst;
@@ -2591,6 +2594,7 @@ public function treeGet "function: treeGet
   input BackendDAE.BinTree bt;
   input BackendDAE.Key key;
   output BackendDAE.Value v;
+protected
   String keystr;
 algorithm
   keystr := ComponentReference.printComponentRefStr(key);
@@ -3748,6 +3752,7 @@ public function transposeMatrix
   i.e. which equations each variable is present in."
   input BackendDAE.IncidenceMatrix m;
   output BackendDAE.IncidenceMatrixT mt;
+protected
   list<list<BackendDAE.Value>> mlst,mtlst;
 algorithm
   mlst := arrayList(m);

Compiler/BackEnd/SimCode.mo

@@ -469,6 +469,7 @@ public function crefSubIsScalar
  scalar."
   input DAE.ComponentRef cref;
   output Boolean isScalar;
+protected
   list<DAE.Subscript> subs;
 algorithm
   subs := ComponentReference.crefSubs(cref);
@@ -7458,6 +7459,7 @@ protected function getCalledFunctionsInFunctions
   input list<Absyn.Path> accumulated;
   input DAE.FunctionTree funcs;
   output list<Absyn.Path> res;
+protected
   list<list<Absyn.Path>> pathslist;
 algorithm
   res := matchcontinue(paths,accumulated,funcs)

Compiler/FrontEnd/Algorithm.mo

@@ -406,6 +406,7 @@ protected function getPropExpType "function: getPropExpType
   getTypeExpType. Used by makeAssignment."
   input DAE.Properties p;
   output DAE.ExpType t;
+protected
   tuple<DAE.TType, Option<Absyn.Path>> ty;
 algorithm
   ty := Types.getPropType(p);

Compiler/FrontEnd/Builtin.mo

@@ -3038,6 +3038,7 @@ public function initialEnv "function: initialEnv
   input Env.Cache inCache;
   output Env.Cache outCache;
   output list<Env.Frame> env;
+protected
   Env.Cache cache;
 algorithm
   (outCache,env) := matchcontinue(inCache)

Compiler/FrontEnd/Ceval.mo

@@ -1399,6 +1399,7 @@ protected function cevalKnownExternalFuncs "function: cevalKnownExternalFuncs
   input Msg msg;
   output Env.Cache outCache;
   output Values.Value res;
+protected
   SCode.Class cdef;
   list<Env.Frame> env_1;
   String fid;
@@ -2993,6 +2994,7 @@ protected function cevalCat "function: cevalCat
   input list<Values.Value> v_lst;
   input Integer dim;
   output Values.Value outValue;
+protected
   list<Values.Value> v_lst_1;
 algorithm
   v_lst_1 := catDimension(v_lst, dim);

Compiler/FrontEnd/CevalFunction.mo

@@ -962,7 +962,7 @@ protected function extendEnvWithForScope
   output Env.Env outEnv;
   output DAE.Type outIterType;
   output DAE.ComponentRef outIterCref;
-
+protected
   DAE.ComponentRef iter_cr;
 algorithm
   outIterType := Types.expTypetoTypesType(inIterType);
@@ -985,7 +985,7 @@ protected function appendDimensions
   input Env.Env inEnv;
   output Env.Cache outCache;
   output DAE.Type outType;
-
+protected
   list<Integer> binding_dims;
 algorithm
   binding_dims := ValuesUtil.valueDimensions(
@@ -1350,7 +1350,7 @@ protected function updateVariableBinding
   input DAE.Type inType;
   input Values.Value inNewValue;
   output Env.Env outEnv;
-
+protected
   String var_name;
   DAE.Var var;
 algorithm
@@ -1379,7 +1379,7 @@ protected function getVariableTypeAndValue
   input Env.Env inEnv;
   output DAE.Type outType;
   output Values.Value outValue;
-
+protected
   DAE.Binding binding;
 algorithm
   (outType, binding) := getVariableTypeAndBinding(inCref, inEnv);
@@ -1691,7 +1691,7 @@ protected function findDependencies
   input DAE.ComponentRef inCref;
   input list<Dependency> inDependencies;
   output list<DAE.ComponentRef> outDependencies;
-
+protected
   list<DAE.ComponentRef> deps;
   list<list<DAE.ComponentRef>> dep_deps;
 algorithm