Changeset 528d8ead in OpenModelica

Timestamp:

2020-04-29T11:42:24+02:00 (4 years ago)

Author:

Martin Sjölund <martin.sjolund@…>

Parents:

7ab7997

git-author:

Martin Sjölund <martin.sjolund@…> (04/29/20 09:53:35)

git-committer:

Martin Sjölund <martin.sjolund@…> (04/29/20 11:42:24)

Message:

Make package.order errors into warnings

If for some reason the package.order handling fails, default to the same
order as if there was no package.order file.

Files:

• OMCompiler/Compiler/FrontEnd/ClassLoader.mo (modified) (3 diffs)
• OMCompiler/Compiler/Util/Error.mo (modified) (2 diffs)
• testsuite/flattening/modelica/mosfiles/TestLoadModel.mos (modified) (1 diff)

OMCompiler/Compiler/FrontEnd/ClassLoader.mo

@@ -452 +452 @@
 
     case (Absyn.CLASS(body=Absyn.PARTS(classParts=cp),info=info),_,_,_)
-      equation
-        if (System.regularFileExists(filename)) then
-          contents = System.readFile(filename);
-          namesToFind = System.strtok(contents, "\n");
-          namesToFind = List.removeOnTrue("",stringEqual,List.map(namesToFind,System.trimWhitespace));
-          duplicates = List.sortedDuplicates(List.sort(namesToFind,Util.strcmpBool),stringEq);
-          duplicatesStr = stringDelimitList(duplicates, ", ");
+      algorithm
+        try
+          true := System.regularFileExists(filename);
+          contents := System.readFile(filename);
+          namesToFind := System.strtok(contents, "\n");
+          namesToFind := List.removeOnTrue("",stringEqual,List.map(namesToFind,System.trimWhitespace));
+          duplicates := List.sortedDuplicates(List.sort(namesToFind,Util.strcmpBool),stringEq);
+          duplicatesStr := stringDelimitList(duplicates, ", ");
           Error.assertionOrAddSourceMessage(listEmpty(duplicates),Error.PACKAGE_ORDER_DUPLICATES,{duplicatesStr},SOURCEINFO(filename,true,0,0,0,0,0.0));
 
           if encrypted then
             // get all the .moc files in the directory!
-            mofiles = List.map(System.mocFiles(mp), Util.removeLast4Char);
+            mofiles := List.map(System.mocFiles(mp), Util.removeLast4Char);
           else
             // get all the .mo files in the directory!
-            mofiles = List.map(System.moFiles(mp), Util.removeLast3Char);
+            mofiles := List.map(System.moFiles(mp), Util.removeLast3Char);
           end if;
           // get all the subdirs
-          subdirs = System.subDirectories(mp);
-          subdirs = List.filter2OnTrue(subdirs, existPackage, mp, encrypted);
+          subdirs := System.subDirectories(mp);
+          subdirs := List.filter2OnTrue(subdirs, existPackage, mp, encrypted);
           // build a list
-          intersection = List.intersectionOnTrue(subdirs,mofiles,stringEq);
-          differencesStr = stringDelimitList(List.map1(intersection, getBothPackageAndFilename, mp), ", ");
+          intersection := List.intersectionOnTrue(subdirs,mofiles,stringEq);
+          differencesStr := stringDelimitList(List.map1(intersection, getBothPackageAndFilename, mp), ", ");
           Error.assertionOrAddSourceMessage(listEmpty(intersection),Error.PACKAGE_DUPLICATE_CHILDREN,{differencesStr},SOURCEINFO(filename,true,0,0,0,0,0.0));
-          mofiles = listAppend(subdirs,mofiles);
+          mofiles := listAppend(subdirs,mofiles);
           // check if all are present in the package.order
-          differences = List.setDifference(mofiles, namesToFind);
-          (po1) = getPackageContentNamesinParts(namesToFind,cp,{});
-          (po1,differences) = List.map3Fold(po1,checkPackageOrderFilesExist,mp,info,encrypted,differences);
+          differences := List.setDifference(mofiles, namesToFind);
+          (po1) := getPackageContentNamesinParts(namesToFind,cp,{});
+          (po1,differences) := List.map3Fold(po1,checkPackageOrderFilesExist,mp,info,encrypted,differences);
 
           // issue a warning if not all are present
-          differencesStr = stringDelimitList(differences, "\n\t");
+          differencesStr := stringDelimitList(differences, "\n\t");
           Error.assertionOrAddSourceMessage(listEmpty(differences),Error.PACKAGE_ORDER_FILE_NOT_COMPLETE,{differencesStr},SOURCEINFO(filename,true,0,0,0,0,0.0));
 
-          po2 = List.map(differences, makeClassLoad);
-
-          po = listAppend(po2, po1);
+          po2 := List.map(differences, makeClassLoad);
+
+          po := listAppend(po2, po1);
         else // file not found
-          mofiles = List.map(System.moFiles(mp), Util.removeLast3Char) "Here .mo files in same directory as package.mo should be loaded as sub-packages";
-          subdirs = System.subDirectories(mp);
-          subdirs = List.filter2OnTrue(subdirs, existPackage, mp, encrypted);
-          mofiles = List.sort(listAppend(subdirs,mofiles), Util.strcmpBool);
+          mofiles := List.map(System.moFiles(mp), Util.removeLast3Char) "Here .mo files in same directory as package.mo should be loaded as sub-packages";
+          subdirs := System.subDirectories(mp);
+          subdirs := List.filter2OnTrue(subdirs, existPackage, mp, encrypted);
+          mofiles := List.sort(listAppend(subdirs,mofiles), Util.strcmpBool);
           // Look for duplicates
-          intersection = List.sortedDuplicates(mofiles,stringEq);
-          differencesStr = stringDelimitList(List.map1(intersection, getBothPackageAndFilename, mp), ", ");
+          intersection := List.sortedDuplicates(mofiles,stringEq);
+          differencesStr := stringDelimitList(List.map1(intersection, getBothPackageAndFilename, mp), ", ");
           Error.assertionOrAddSourceMessage(listEmpty(intersection),Error.PACKAGE_DUPLICATE_CHILDREN,{differencesStr},info);
 
-          po = listAppend(List.map(cp, makeClassPart),List.map(mofiles, makeClassLoad));
-        end if;
+          po := listAppend(List.map(cp, makeClassPart),List.map(mofiles, makeClassLoad));
+        end try;
       then
         po;
@@ -653 +654 @@
         Error.assertionOrAddSourceMessage(not listMember(load,po), Error.PACKAGE_MO_NOT_IN_ORDER, {name2}, info);
         Error.addSourceMessage(Error.FOUND_ELEMENT_NOT_IN_ORDER_FILE, {name2}, info);
-      then fail();
+        (outOrder,names) = getPackageContentNamesinElts(name2 :: inNamesToSort, inElts, po, pub);
+      then (outOrder,names);
 
     case ({},Absyn.ELEMENTITEM(Absyn.ELEMENT(specification=Absyn.COMPONENTS(components=Absyn.COMPONENTITEM(component=Absyn.COMPONENT(name=name2))::_),info=info))::_,_,_)
@@ -660 +662 @@
         Error.assertionOrAddSourceMessage(not listMember(load,po), Error.PACKAGE_MO_NOT_IN_ORDER, {name2}, info);
         Error.addSourceMessage(Error.FOUND_ELEMENT_NOT_IN_ORDER_FILE, {name2}, info);
-      then fail();
+        (outOrder,names) = getPackageContentNamesinElts(name2 :: inNamesToSort, inElts, po, pub);
+      then (outOrder,names);
 
     case (namesToSort,ei::elts,_,_)

OMCompiler/Compiler/Util/Error.mo

@@ -547 +547 @@
 public constant ErrorTypes.Message LIBRARY_UNEXPECTED_NAME = ErrorTypes.MESSAGE(236, ErrorTypes.SCRIPTING(), ErrorTypes.ERROR(),
   Gettext.gettext("Expected the package to have name %s, but got %s."));
-public constant ErrorTypes.Message PACKAGE_MO_NOT_IN_ORDER = ErrorTypes.MESSAGE(237, ErrorTypes.GRAMMAR(), ErrorTypes.ERROR(),
+public constant ErrorTypes.Message PACKAGE_MO_NOT_IN_ORDER = ErrorTypes.MESSAGE(237, ErrorTypes.GRAMMAR(), ErrorTypes.WARNING(),
   Gettext.gettext("Elements in the package.mo-file need to be in the same relative order as the package.order file. Got element named %s but it was already added because it was not the next element in the list at that time."));
 public constant ErrorTypes.Message LIBRARY_EXPECTED_PARTS = ErrorTypes.MESSAGE(238, ErrorTypes.GRAMMAR(), ErrorTypes.ERROR(),
   Gettext.gettext("%s is a package.mo-file and needs to be based on class parts (i.e. not class extends, derived class, or enumeration)."));
-public constant ErrorTypes.Message PACKAGE_ORDER_FILE_NOT_FOUND = ErrorTypes.MESSAGE(239, ErrorTypes.GRAMMAR(), ErrorTypes.ERROR(),
+public constant ErrorTypes.Message PACKAGE_ORDER_FILE_NOT_FOUND = ErrorTypes.MESSAGE(239, ErrorTypes.GRAMMAR(), ErrorTypes.WARNING(),
   Gettext.gettext("%1 was referenced in the package.order file, but was not found in package.mo, %1/package.mo or %1.mo."));
-public constant ErrorTypes.Message FOUND_ELEMENT_NOT_IN_ORDER_FILE = ErrorTypes.MESSAGE(240, ErrorTypes.GRAMMAR(), ErrorTypes.ERROR(),
+public constant ErrorTypes.Message FOUND_ELEMENT_NOT_IN_ORDER_FILE = ErrorTypes.MESSAGE(240, ErrorTypes.GRAMMAR(), ErrorTypes.WARNING(),
   Gettext.gettext("Got element %1 that was not referenced in the package.order file."));
-public constant ErrorTypes.Message ORDER_FILE_COMPONENTS = ErrorTypes.MESSAGE(241, ErrorTypes.GRAMMAR(), ErrorTypes.ERROR(),
+public constant ErrorTypes.Message ORDER_FILE_COMPONENTS = ErrorTypes.MESSAGE(241, ErrorTypes.GRAMMAR(), ErrorTypes.WARNING(),
   Gettext.gettext("Components referenced in the package.order file must be moved in full chunks. Either split the constants to different lines or make them subsequent in the package.order file."));
 public constant ErrorTypes.Message GUARD_EXPRESSION_TYPE_MISMATCH = ErrorTypes.MESSAGE(242, ErrorTypes.GRAMMAR(), ErrorTypes.ERROR(),
@@ -567 +567 @@
 public constant ErrorTypes.Message EXP_TYPE_MISMATCH = ErrorTypes.MESSAGE(246, ErrorTypes.TRANSLATION(), ErrorTypes.ERROR(),
   Gettext.gettext("Expression '%1' has type %3, expected type %2."));
-public constant ErrorTypes.Message PACKAGE_ORDER_DUPLICATES = ErrorTypes.MESSAGE(247, ErrorTypes.TRANSLATION(), ErrorTypes.ERROR(),
+public constant ErrorTypes.Message PACKAGE_ORDER_DUPLICATES = ErrorTypes.MESSAGE(247, ErrorTypes.TRANSLATION(), ErrorTypes.WARNING(),
   Gettext.gettext("Found duplicate names in package.order file: %s."));
 public constant ErrorTypes.Message ERRONEOUS_TYPE_ERROR = ErrorTypes.MESSAGE(248, ErrorTypes.TRANSLATION(), ErrorTypes.ERROR(),

testsuite/flattening/modelica/mosfiles/TestLoadModel.mos

@@ -95 +95 @@
 // true
 // "3.5 beta1"
-// false
-// "[TestLibrary//Modelica 3.5 beta1/package.order:0:0-0:0:readonly] Error: Found duplicate names in package.order file: A.
-// Error: Failed to load package Modelica (3.5 beta1) using MODELICAPATH TestLibrary/.
+// true
+// "[TestLibrary//Modelica 3.5 beta1/package.order:0:0-0:0:readonly] Warning: Found duplicate names in package.order file: A.
 // "
 // "CustomSort"