Added new API parseEncryptedPackage

adeas31 · OpenModelica-Hudson · commit a385b605db56 · 2019-02-23T11:47:17.000+01:00
Works similar to `parseFile`. Added support for creating .mol packages without encryption which means they only contains the .mo files and also updated `loadEncryptedPackage` to be able to load such packages. Belonging to [master]: - OpenModelica/OpenModelica#98 - #2940
diff --git a/Compiler/FrontEnd/ModelicaBuiltin.mo b/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -1156,6 +1156,16 @@ external "builtin";
 annotation(preferredView="text");
 end loadFiles;
 
+function parseEncryptedPackage
+  input String fileName;
+  input String workdir = "<default>" "The output directory for imported encrypted files. <default> will put the files to current working directory.";
+  output TypeName names[:];
+external "builtin";
+annotation(Documentation(info="<html>
+<p>Parses the given encrypted package and returns the names of the parsed classes.</p>
+</html>"), preferredView="text");
+end parseEncryptedPackage;
+
 function loadEncryptedPackage
   input String fileName;
   input String workdir = "<default>" "The output directory for imported encrypted files. <default> will put the files to current working directory.";
@@ -2473,6 +2483,7 @@ end buildModelFMU;
 
 function buildEncryptedPackage
   input TypeName className "the class that should encrypted";
+  input Boolean encrypt = true;
   output Boolean success;
   output String commandOutput "Output of the packagetool executable";
 external "builtin";
diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo
@@ -1434,6 +1434,45 @@ algorithm
         // System.GC_enable();
       then (cache,Values.BOOL(false));
 
+    case (cache,_,"parseEncryptedPackage",Values.STRING(filename)::Values.STRING(workdir)::_,_)
+      equation
+        if (System.regularFileExists(filename)) then
+          if (Util.endsWith(filename, ".mol")) then
+            workdir = if System.directoryExists(workdir) then workdir else System.pwd();
+            if (0 == System.systemCall("unzip -q -o -d \"" + workdir + "\" \"" +  filename + "\"")) then
+              s1 = System.basename(filename);
+              s2 = Util.removeLast4Char(s1);
+              // possible .moc files to look for
+              filename1 = workdir + "/" + s2 + "/" + s2 + ".moc";
+              filename2 = workdir + "/" + s2 + "/package.moc";
+              filename_1 = if System.regularFileExists(filename1) then filename1 else filename2;
+              // possible .mo files to look for
+              str1 = workdir + "/" + s2 + "/" + s2 + ".mo";
+              str2 = workdir + "/" + s2 + "/package.mo";
+              str = if System.regularFileExists(str1) then str1 else str2;
+              // check if .mol contains .moc or .mo files
+              filename_1 = if System.regularFileExists(filename_1) then filename_1 else str;
+              if (System.regularFileExists(filename_1)) then
+                // clear the errors before!
+                Error.clearMessages() "Clear messages";
+                Print.clearErrorBuf() "Clear error buffer";
+                filename_1 = Util.testsuiteFriendlyPath(filename_1);
+                (paths) = Interactive.parseFile(filename_1, "UTF-8");
+                vals = List.map(paths,ValuesUtil.makeCodeTypeName);
+              else
+                Error.addMessage(Error.ENCRYPTED_FILE_NOT_FOUND_ERROR, {filename1, filename2});
+              end if;
+            else
+              Error.addMessage(Error.UNABLE_TO_UNZIP_FILE, {filename});
+            end if;
+          else
+            Error.addMessage(Error.EXPECTED_ENCRYPTED_PACKAGE, {filename});
+          end if;
+        else
+          Error.addMessage(Error.FILE_NOT_FOUND_ERROR, {filename});
+        end if;
+      then (cache,ValuesUtil.makeArray(vals));
+
     case (_,_,"loadEncryptedPackage",Values.STRING(filename)::Values.STRING(workdir)::_,_)
       equation
         b = false;
diff --git a/Compiler/Script/CevalScriptBackend.mo b/Compiler/Script/CevalScriptBackend.mo
@@ -1317,11 +1317,11 @@ algorithm
     case (cache,_,"buildModelFMU", _,_)
       then (cache,Values.STRING(""));
 
-    case (cache,env,"buildEncryptedPackage", {Values.CODE(Absyn.C_TYPENAME(className))},_)
+    case (cache,env,"buildEncryptedPackage", {Values.CODE(Absyn.C_TYPENAME(className)),Values.BOOL(b)},_)
       algorithm
         p := SymbolTable.getAbsyn();
-        (b, str) := buildEncryptedPackage(className, p);
-      then (cache,Values.TUPLE({Values.BOOL(b),Values.STRING(str)}));
+        (b1, str) := buildEncryptedPackage(className, b, p);
+      then (cache,Values.TUPLE({Values.BOOL(b1),Values.STRING(str)}));
 
     case (cache,_,"buildEncryptedPackage",_,_)
       then (cache,Values.TUPLE({Values.BOOL(false),Values.STRING("")}));
@@ -3559,6 +3559,7 @@ end buildModelFMU;
 
 protected function buildEncryptedPackage
   input Absyn.Path className "path for the model";
+  input Boolean encrypt;
   input Absyn.Program inProgram;
   output Boolean success;
   output String commandOutput;
@@ -3577,7 +3578,7 @@ algorithm
     str2 := stringAppendList({omhome,pd,"lib",pd,"omc",pd,"SEMLA",pd,"packagetool",str1});
     if System.regularFileExists(str2) then
       // create the list of arguments for packagetool
-      str3 := "-librarypath \"" + System.dirname(fileName) + "\" -version \"1.0\" -language \"3.2\" -encrypt \"true\"";
+      str3 := "-librarypath \"" + System.dirname(fileName) + "\" -version \"1.0\" -language \"3.2\" -encrypt \"" + boolString(encrypt) + "\"";
       call := stringAppendList({str2," ",str3});
       logFile := "packagetool.log";
       // remove the logFile if it already exists.
diff --git a/Compiler/Script/Interactive.mo b/Compiler/Script/Interactive.mo
@@ -17379,12 +17379,26 @@ public function parseFile
   output list<Absyn.Path> topClassNamesQualified "The names of the classes from file, qualified!";
 protected
   Absyn.Program parsed;
+  String dir,filename;
+  Boolean lveStarted;
+  Option<Integer> lveInstance = NONE();
 algorithm
   if not System.regularFileExists(fileName) then
     topClassNamesQualified := {};
     return;
   end if;
-  parsed := Parser.parse(fileName,encoding);
+  (dir,filename) := Util.getAbsoluteDirectoryAndFile(fileName);
+  if filename == "package.moc" then
+    (lveStarted, lveInstance) := Parser.startLibraryVendorExecutable(dir);
+    if not lveStarted then
+      topClassNamesQualified := {};
+      return;
+    end if;
+  end if;
+  parsed := Parser.parse(fileName,encoding,dir,lveInstance);
+  if (lveStarted) then
+    Parser.stopLibraryVendorExecutable(lveInstance);
+  end if;
   parsed := MetaUtil.createMetaClassesInProgram(parsed);
   topClassNamesQualified := getTopQualifiedClassnames(parsed);
   if updateProgram then
diff --git a/Parser/parse.c b/Parser/parse.c
@@ -383,7 +383,7 @@ static void* parseString(const char* data, const char* interactiveFilename, int
 #elif defined(ANTLR_C_VERSION_3_4)
   input  = antlr3StringStreamNew((pANTLR3_UINT8)data, ANTLR3_ENC_8BIT, strlen(data), fName);
 #else
-  #error "Neiter ANTLR_C_VERSION_3_2 or ANTLR_C_VERSION_3_4 is defined. Could not find the ANTLR 3.x C runtime!"
+  #error "Neither ANTLR_C_VERSION_3_2 or ANTLR_C_VERSION_3_4 is defined. Could not find the ANTLR 3.x C runtime!"
 #endif
   if ( input == NULL ) {
     fprintf(stderr, "Unable to open file %s\n", members.filename_C); fflush(stderr);
@@ -446,7 +446,7 @@ static void* parseFile(const char* fileName, const char* infoName, int flags, co
 #elif defined(ANTLR_C_VERSION_3_4)
   input  = antlr3FileStreamNew(fName, ANTLR3_ENC_8BIT);
 #else
-  #error "Neiter ANTLR_C_VERSION_3_2 or ANTLR_C_VERSION_3_4 is defined. Could not find the ANTLR 3.x C runtime!"
+  #error "Neither ANTLR_C_VERSION_3_2 or ANTLR_C_VERSION_3_4 is defined. Could not find the ANTLR 3.x C runtime!"
 #endif
   if ( input == NULL ) {
     return NULL;
