- Changed structure for storing the result from SCodeInst from lists to a tree.

- Added new phase, SCodeExpand, which expands the result from SCodeInst into a
  DAE.DAElist.
- Implemented inner/outer support in SCodeInst, not complete yet.


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

Author: perost

Compiler/FrontEnd/Absyn.mo

@@ -2810,6 +2810,43 @@ algorithm
   end matchcontinue;
 end stringListPath;
 
+public function stringListPathReversed
+  "Converts a list of strings into a qualified path, in reverse order.
+   Ex: {'a', 'b', 'c'} => c.b.a"
+  input list<String> inStrings;
+  output Path outPath;
+protected
+  String id;
+  list<String> rest_str;
+  Path path;
+algorithm
+  id :: rest_str := inStrings;
+  path := IDENT(id);
+  outPath := stringListPathReversed2(rest_str, path);
+end stringListPathReversed;
+
+protected function stringListPathReversed2
+  input list<String> inStrings;
+  input Path inAccumPath;
+  output Path outPath;
+algorithm
+  outPath := match(inStrings, inAccumPath)
+    local
+      String id;
+      list<String> rest_str;
+      Path path;
+
+    case ({}, _) then inAccumPath;
+
+    case (id :: rest_str, _)
+      equation
+        path = QUALIFIED(id, inAccumPath);
+      then
+        stringListPathReversed2(rest_str, path);
+
+  end match;
+end stringListPathReversed2;
+
 public function pathTwoLastIdents "Returns the two last idents of a path"
   input Path p;
   output Path twoLast;

Compiler/FrontEnd/ComponentReference.mo

@@ -2186,5 +2186,30 @@ algorithm
   end match;
 end replaceWholeDimSubscript2;
 
+public function splitCrefLast
+  "Splits a cref at the end, e.g. a.b.c.d => {a.b.c, d}."
+  input DAE.ComponentRef inCref;
+  output DAE.ComponentRef outPrefixCref;
+  output DAE.ComponentRef outLastCref;
+algorithm
+  (outPrefixCref, outLastCref) := match(inCref)
+    local
+      DAE.Ident id;
+      DAE.Type ty;
+      list<DAE.Subscript> subs;
+      DAE.ComponentRef prefix, last;
+      
+    case DAE.CREF_QUAL(id, ty, subs, last as DAE.CREF_IDENT(ident = _))
+      then (DAE.CREF_IDENT(id, ty, subs), last);
+
+    case DAE.CREF_QUAL(id, ty, subs, last)
+      equation
+        (prefix, last) = splitCrefLast(last);
+      then
+        (DAE.CREF_QUAL(id, ty, subs, prefix), last);
+
+  end match;
+end splitCrefLast;
+
 end ComponentReference;
 

Compiler/FrontEnd/SCode.mo

@@ -3814,5 +3814,23 @@ algorithm
   outElement := COMPONENT(name, pf, attr, ty, mod, cmt, NONE(), info);
 end removeComponentCondition;
 
+public function isInnerComponent
+  "Returns true if the given element is an element with the inner prefix,
+   otherwise false."
+  input Element inElement;
+  output Boolean outIsInner;
+algorithm
+  outIsInner := match(inElement)
+    local
+      Absyn.InnerOuter io;
+
+    case COMPONENT(prefixes = PREFIXES(innerOuter = io))
+      then Absyn.isInner(io);
+
+    else false;
+
+  end match;
+end isInnerComponent;
+
 end SCode;