Fixes for bugs: #1430, #1432

- moved printing functions from SCode to SCodeDump.
- some fixes to redeclares-as-element in SCodeFlattenRedeclare.mo
- fixes for handling derived classes (that do not extend from basic types)
  to have the correct scope, not the scope of the base class (Inst.mo).
- added SCodeDump.mo
- added SCodeFlat.mo (not part of the compilation yet).
- added more tests for replaceable functions and for functions in derived packages that depend on a modified constant.
- added SCodeMod.mo to handle modifiers.
- some changes in SCodeHashTable.mo
- disabled SCodeFlattenExtends.mo for now.

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

Compiler/FrontEnd/Algorithm.mo

@@ -68,6 +68,7 @@ protected import ExpressionDump;
 protected import RTOpts;
 protected import Types;
 protected import Util;
+protected import SCodeDump;
 
 public function algorithmEmpty "Returns true if algorithm is empty, i.e. no statements"
   input Algorithm alg;
@@ -388,7 +389,7 @@ algorithm
         rhs_str = ExpressionDump.printExpStr(rhs);
         str1 = Util.stringDelimitList(Util.listMap(lprop, Types.printPropStr), ", ");
         str2 = Types.printPropStr(rprop);
-        strInitial = SCode.printInitialStr(initial_);
+        strInitial = SCodeDump.printInitialStr(initial_);
         Debug.traceln("- Algorithm.makeTupleAssignment failed on: \n\t" +& 
           lhs_str +& " = " +& rhs_str +& 
           "\n\tprops lhs: (" +& str1 +& ") =  props rhs: " +& str2 +&

Compiler/FrontEnd/Ceval.mo

@@ -5261,8 +5261,8 @@ algorithm
           "\n env: " +& Env.printEnvPathStr(env) +&
           "\n subs: " +& Util.stringDelimitList(Util.listMap(subs, ExpressionDump.printSubscriptStr), ", ") +&
           "\n value: " +& ValuesUtil.printValStr(inValue) +&
-          "\n dim sizes: " +& Util.stringDelimitList(Util.listMap(dims, intString), ", ") +&
-          "\n env: " +& Env.printEnvStr(env)  
+          "\n dim sizes: " +& Util.stringDelimitList(Util.listMap(dims, intString), ", ") /*+&
+          "\n env: " +& Env.printEnvStr(env)*/
         );
       then
         fail();

Compiler/FrontEnd/ClassInf.mo

@@ -179,6 +179,7 @@ protected import Print;
 protected import Error;
 protected import RTOpts;
 protected import Util;
+protected import SCodeDump;
 
 public function printStateStr "- Printing
 
@@ -606,7 +607,7 @@ algorithm
       equation
         str1 = Absyn.pathString(getStateName(st));
         str2 = printStateStr(st);
-        str3 = SCode.restrString(re);
+        str3 = SCodeDump.restrString(re);
         Error.addSourceMessage(Error.RESTRICTION_VIOLATION, {str1,str2,str3}, info);
       then
         fail();

Compiler/FrontEnd/DAEDump.mo

@@ -59,6 +59,7 @@ protected import Types;
 protected import ClassInf;
 protected import Algorithm;
 protected import RTOpts;
+protected import SCodeDump;
 
 public function printDAE "function: printDAE
   This function prints out a list of elements (i.e. a DAE)
@@ -930,7 +931,7 @@ algorithm
       String s;
     case SCode.ANNOTATION(modification = ann_mod)
       equation
-        s = " annotation" +& SCode.printModStr(ann_mod);
+        s = " annotation" +& SCodeDump.printModStr(ann_mod);
       then
         s;
   end match;

Compiler/FrontEnd/Env.mo

@@ -189,6 +189,7 @@ protected import Util;
 protected import Types;
 protected import OptManager;
 protected import RTOpts;
+protected import SCodeDump;
 
 public constant Env emptyEnv={} "- Values" ;
 
@@ -1035,7 +1036,7 @@ algorithm
         s1 = printAvlTreeStr(ht);
         s2 = printAvlTreeStr(httypes);
         s3 = printImportsStr(imps);
-        encflag_str = SCode.encapsulatedStr(encflag);
+        encflag_str = SCodeDump.encapsulatedStr(encflag);
         res = stringAppendList(
           "FRAME: " :: sid :: " (enc=" :: encflag_str ::
           ") \nclasses and vars:\n=============\n" :: s1 :: "   Types:\n======\n" :: s2 :: "   Imports:\n=======\n" :: s3 :: {});
@@ -1045,9 +1046,7 @@ algorithm
 end printFrameStr;
 
 protected function printFrameVarsStr "function: printFrameVarsStr
-
-  Print only the variables in a Frame to a string.
-"
+  Print only the variables in a Frame to a string."
   input Frame inFrame;
   output String outString;
 algorithm
@@ -1064,7 +1063,7 @@ algorithm
     case FRAME(optName = SOME(sid),clsAndVars = ht,types = httypes,imports = imps,connectionSet = crs,encapsulatedPrefix = encflag)
       equation
         s1 = printAvlTreeStr(ht);
-        encflag_str = SCode.encapsulatedStr(encflag);
+        encflag_str = SCodeDump.encapsulatedStr(encflag);
         res = stringAppendList(
           {"FRAME: ",sid," (enc=",encflag_str,
           ") \nclasses and vars:\n=============\n",s1,"\n\n\n"});
@@ -1074,7 +1073,7 @@ algorithm
     case FRAME(optName = NONE(),clsAndVars = ht,types = httypes,imports = imps,connectionSet = crs,encapsulatedPrefix = encflag)
       equation
         s1 = printAvlTreeStr(ht);
-        encflag_str = SCode.encapsulatedStr(encflag);
+        encflag_str = SCodeDump.encapsulatedStr(encflag);
         res = stringAppendList(
           {"FRAME: unnamed (enc=",encflag_str,
           ") \nclasses and vars:\n=============\n",s1,"\n\n\n"});
@@ -1140,8 +1139,8 @@ algorithm
 
     case ((n,VAR(instantiated = (tv as DAE.TYPES_VAR(attributes = DAE.ATTR(variability = var),ty = tp,binding = bind)),declaration = SOME((elt,_)),instStatus = i,env = (compframe :: _))))
       equation
-        s = SCode.variabilityString(var);
-        elt_str = SCode.printElementStr(elt);
+        s = SCodeDump.variabilityString(var);
+        elt_str = SCodeDump.printElementStr(elt);
         tp_str = Types.unparseType(tp);
         var_str = Types.unparseVar(tv);
         frame_str = printFrameVarsStr(compframe);
@@ -1154,8 +1153,8 @@ algorithm
 
     case ((n,VAR(instantiated = (tv as DAE.TYPES_VAR(attributes = DAE.ATTR(variability = var),ty = tp)),declaration = SOME((elt,_)),instStatus = i,env = {})))
       equation
-        s = SCode.variabilityString(var);
-        elt_str = SCode.printElementStr(elt);
+        s = SCodeDump.variabilityString(var);
+        elt_str = SCodeDump.printElementStr(elt);
         tp_str = Types.unparseType(tp);
         var_str = Types.unparseVar(tv);
         res = stringAppendList(
@@ -1636,21 +1635,21 @@ algorithm
       equation
         str = "var:    " +& name +& " " +& Types.unparseType(tp) +& "("
         +& Types.printTypeStr(tp) +& ")" +& " attr: " +& 
-        SCode.flowStr(flowPrefix) +& ", " +&
-        SCode.streamStr(streamPrefix) +& ", " +&
-        SCode.accessibilityString(accessibility) +& ", " +&
-        SCode.variabilityString(variability) +& ", " +&
-        SCode.innerouterString(innerOuter);
+        SCodeDump.flowStr(flowPrefix) +& ", " +&
+        SCodeDump.streamStr(streamPrefix) +& ", " +&
+        SCodeDump.accessibilityString(accessibility) +& ", " +&
+        SCodeDump.variabilityString(variability) +& ", " +&
+        SCodeDump.innerouterString(innerOuter);
       then str;
 
     case(VAR(declaration = SOME((SCode.COMPONENT(name=name,typeSpec=tsp,prefixes=SCode.PREFIXES(innerOuter=innerOuter),attributes=SCode.ATTR(_, flowPrefix, streamPrefix, accessibility, variability, direction)), _)))) 
       equation
         str = "var:    " +& name +& " " +& Dump.unparseTypeSpec(tsp) +& " attr: " +& 
-        SCode.flowStr(flowPrefix) +& ", " +&
-        SCode.streamStr(streamPrefix) +& ", " +&
-        SCode.accessibilityString(accessibility) +& ", " +&
-        SCode.variabilityString(variability) +& ", " +&
-        SCode.innerouterString(innerOuter);
+        SCodeDump.flowStr(flowPrefix) +& ", " +&
+        SCodeDump.streamStr(streamPrefix) +& ", " +&
+        SCodeDump.accessibilityString(accessibility) +& ", " +&
+        SCodeDump.variabilityString(variability) +& ", " +&
+        SCodeDump.innerouterString(innerOuter);
       then str;
 
     case(CLASS(cl=SCode.CLASS(name=name))) 

Compiler/FrontEnd/Inline.mo

@@ -45,7 +45,6 @@ encapsulated package Inline
 public import Absyn;
 public import BackendDAE;
 public import DAE;
-public import Error;
 public import SCode;
 public import Util;
 public import Values;