handling singular error from libraries (#721)

oscar-system · Oct 28, 2023 · 6304657 · 6304657
1 parent 0374f71
commit 6304657
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/deps/src/caller.cpp b/deps/src/caller.cpp
@@ -304,7 +304,15 @@ jl_value_t * call_singular_library_procedure(std::string                   s,
   {
     inerror = 0;
     errorreported = 0;
-    jl_error("Could not call function");
+    if (err==2) jl_error("Could not call function");
+    else if(err==1)
+    {
+      std::stringstream ss;
+      for (auto & si : singular_error_log)
+        ss << si << std::endl;
+      singular_error_log.clear();
+      jl_error(ss.str().c_str());
+    }
   }
   if (ret->next != NULL)
   {

diff --git a/deps/src/caller.h b/deps/src/caller.h
@@ -4,5 +4,6 @@
 #include "includes.h"
 
 void singular_define_caller(jlcxx::Module &);
+extern std::vector<std::string> singular_error_log;
 
 #endif
diff --git a/deps/src/singular.cpp b/deps/src/singular.cpp
@@ -9,7 +9,7 @@
 static std::string              singular_return;
 static std::string              singular_error;
 static std::string              singular_warning;
-static std::vector<std::string> singular_error_log;
+std::vector<std::string> singular_error_log;
 
 // Internal singular interpreter variable
 extern int inerror;