Option to filter the nested classes when dumping the class via listFile

adeas31 · OpenModelica-Hudson · commit 570e9f077a95 · 2019-03-20T15:36:15.000+01:00
Belonging to [master]: - #2950 - OpenModelica/OpenModelica-testsuite#1143
diff --git a/Compiler/FrontEnd/Absyn.mo b/Compiler/FrontEnd/Absyn.mo
@@ -5582,6 +5582,52 @@ algorithm
   end match;
 end filterAnnotationItem;
 
+public function filterNestedClasses
+  "Filter outs the nested classes from the class if any."
+  input Class cl;
+  output Class o;
+algorithm
+  o := match cl
+    local
+      Ident name;
+      Boolean partialPrefix, finalPrefix, encapsulatedPrefix;
+      Restriction restriction;
+      list<String> typeVars;
+      list<NamedArg> classAttrs;
+      list<ClassPart> classParts;
+      list<Annotation> annotations;
+      Option<String> comment;
+      Info info;
+    case CLASS(name,partialPrefix,finalPrefix,encapsulatedPrefix,restriction,PARTS(typeVars,classAttrs,classParts,annotations,comment),info)
+      equation
+        (classParts as _::_) = List.fold(listReverse(classParts),filterNestedClassesParts,{});
+      then CLASS(name,partialPrefix,finalPrefix,encapsulatedPrefix,restriction,PARTS(typeVars,classAttrs,classParts,annotations,comment),info);
+    else cl;
+  end match;
+end filterNestedClasses;
+
+protected function filterNestedClassesParts
+  "Helper funciton for filterNestedClassesParts."
+  input ClassPart classPart;
+  input list<ClassPart> inClassParts;
+  output list<ClassPart> outClassPart;
+algorithm
+  outClassPart := match (classPart, inClassParts)
+    local
+      list<ClassPart> classParts;
+      list<ElementItem> elts;
+    case (PUBLIC(elts), classParts)
+      equation
+        classPart.contents = List.filterOnFalse(elts, isElementItemClass);
+      then classPart::classParts;
+    case (PROTECTED(elts), classParts)
+      equation
+        classPart.contents = List.filterOnFalse(elts, isElementItemClass);
+      then classPart::classParts;
+    else classPart::inClassParts;
+  end match;
+end filterNestedClassesParts;
+
 public function getExternalDecl
   "@author: adrpo
    returns the EXTERNAL form parts if there is any.
diff --git a/Compiler/FrontEnd/ModelicaBuiltin.mo b/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -2293,6 +2293,7 @@ end list;
 
 function listFile "Lists the contents of the file given by the class."
   input TypeName class_;
+  input Boolean nestedClasses = true;
   output String contents;
 external "builtin";
 annotation(Documentation(info="<html>
diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo
@@ -781,7 +781,7 @@ algorithm
 
     case (cache,_,"list",_,_) then (cache,Values.STRING(""));
 
-    case (cache,_,"listFile",{Values.CODE(Absyn.C_TYPENAME(className))},_)
+    case (cache,_,"listFile",{Values.CODE(Absyn.C_TYPENAME(className)),Values.BOOL(b)},_)
       equation
         path = match className
           case Absyn.FULLYQUALIFIED() then className.path;
@@ -790,6 +790,7 @@ algorithm
         // handle encryption
         Values.ENUM_LITERAL(index=access) = Interactive.checkAccessAnnotationAndEncryption(path, SymbolTable.getAbsyn());
         (absynClass as Absyn.CLASS(restriction=restriction, info=SOURCEINFO(fileName=str))) = Interactive.getPathedClassInProgram(className, SymbolTable.getAbsyn());
+        absynClass = if b then absynClass else Absyn.filterNestedClasses(absynClass);
         /* If the class has Access.packageText annotation or higher
          * If the class has Access.nonPackageText annotation or higher and class is not a package
          */
