- Added checks for loading mo-files in same directory as package.mo

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12469 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 10, 2012 · 2337987 · 2337987
1 parent 105ea3b
commit 2337987
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Compiler/FrontEnd/Absyn.mo b/Compiler/FrontEnd/Absyn.mo
@@ -5333,6 +5333,7 @@ algorithm
       Path p1,p2;
     case (TOP(),TOP()) then true;
     case (WITHIN(p1),WITHIN(p2)) then pathEqual(p1,p2);
+    else false;
   end match;
 end withinEqual;
 

diff --git a/Compiler/FrontEnd/ClassLoader.mo b/Compiler/FrontEnd/ClassLoader.mo
@@ -341,7 +341,7 @@ algorithm
       equation
         pd = System.pathDelimiter();
         f_1 = stringAppendList({mp,pd,f});
-        Absyn.PROGRAM(cls,_,_) = Parser.parse(f_1,encoding);
+        Absyn.PROGRAM(classes=cls) = parsePackageFile(f,encoding,within_,System.substring(f,1,stringLength(f)-3 /* .mo */));
         p_1 = Interactive.updateProgram(Absyn.PROGRAM(cls,within_,ts), Absyn.PROGRAM(oldc,Absyn.TOP(),ts));
         p_2 = loadSubpackageFiles(fs, mp, encoding, within_, p_1);
       then