- Also sort files in a directory when using the class loader

- Fixed some compiler warnings (unused imports) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@6057 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 8, 2010 · 878d7a4 · 878d7a4
1 parent 292f84a
commit 878d7a4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/Compiler/ClassLoader.mo b/Compiler/ClassLoader.mo
@@ -357,6 +357,7 @@ algorithm
     case (pack,mp,Absyn.WITHIN(path = within_),oldp)
       equation
         mofiles = System.moFiles(mp) "Here .mo files in same directory as package.mo should be loaded as sub-packages" ;
+        mofiles = Util.sort(mofiles, Util.strcmpBool);
         within_1 = Absyn.joinPaths(within_, Absyn.IDENT(pack));
         p = loadSubpackageFiles(mofiles, mp, Absyn.WITHIN(within_1), oldp);
       then
@@ -365,6 +366,7 @@ algorithm
     case (pack,mp,Absyn.TOP(),oldp)
       equation
         mofiles = System.moFiles(mp) "Here .mo files in same directory as package.mo should be loaded as sub-packages" ;
+        mofiles = Util.sort(mofiles, Util.strcmpBool);
         p = loadSubpackageFiles(mofiles, mp, Absyn.WITHIN(Absyn.IDENT(pack)), oldp);
       then
         p;

diff --git a/Compiler/ConnectionGraph.mo b/Compiler/ConnectionGraph.mo
@@ -401,8 +401,6 @@ end addConnection;
 
 protected import Exp;
 protected import Debug;
-protected import Print;
-protected import System;
 protected import DAEDump;
 
 protected function canonical

diff --git a/Compiler/Static.mo b/Compiler/Static.mo
@@ -74,8 +74,6 @@ public import SCode;
 public import SCodeUtil;
 public import Values;
 
-protected import DAEDump;
-
 public type Ident = String;
 
 public

diff --git a/Compiler/Util.mo b/Compiler/Util.mo
@@ -74,7 +74,6 @@ protected import System;
 protected import Print;
 protected import Debug;
 protected import OptManager;
-protected import DAELow;
 
 public constant String derivativeNamePrefix="$DER";
 public constant String pointStr = "$P";