Changeset 716b74a in tol

Timestamp:

Jan 19, 2011, 3:04:39 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

ee8167a

Parents:

8916937

Message:

Refs #1056
Refs #1066
Cint_not_linked_message specifies the function called
New system constant Cint_IsLinked if true just if libcint is linked.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3070 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/contrib/cint/tolCint.cpp (modified) (20 diffs)

tol/contrib/cint/tolCint.cpp

@@ -24 +24 @@
 #include <contrib/cint/tolCint.h>
 
+#include <tol/tol_bdir.h>
 #include <tol/tol_blanguag.h>
 #include <tol/tol_bdatgra.h>
@@ -117 +118 @@
 
 //--------------------------------------------------------------------
-void Cint_not_linked_message (void)
-//--------------------------------------------------------------------
-{
-  Error("Cannot use CINT due to libcint.dll is not linked.");
+void Cint_not_linked_message (const char* function)
+//--------------------------------------------------------------------
+{
+  Error(BText("Cannot use CINT function ")+function+
+  " due to libcint.dll is not linked.");
 }
 
@@ -129 +131 @@
   if(!G__scratch_all_ptr) 
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_scratch_all"); 
     return; 
   } 
@@ -141 +143 @@
   if(!G__lasterror_filename_ptr) 
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_lasterror_filename"); 
     return(NULL); 
   } 
@@ -153 +155 @@
   if(!G__lasterror_linenum_ptr) 
   { 
+    Cint_not_linked_message("Cint_lasterror_linenum"); 
     return(0); 
   } 
@@ -164 +167 @@
   if(!G__init_cint_ptr) 
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_init_cint"); 
     return(-1); 
   } 
@@ -176 +179 @@
   if(!G__set_errmsgcallback_ptr) 
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_set_errmsgcallback"); 
     return; 
   } 
@@ -188 +191 @@
   if(!G__setautoconsole_ptr)
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_setautoconsole"); 
     return; 
   } 
@@ -200 +203 @@
   if(!G__SetCINTSYSDIR_ptr)
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_SetCINTSYSDIR"); 
     return; 
   } 
@@ -212 +215 @@
   if(!G__loadfile_ptr)
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_loadfile"); 
     return(0); 
   } 
@@ -224 +227 @@
   if(!G__unloadfile_ptr)
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_unloadfile"); 
     return(0); 
   } 
@@ -237 +240 @@
   if(!G__exec_tempfile_ptr)
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_exec_tempfile"); 
     return(gv); 
   } 
@@ -250 +253 @@
   if(!G__exec_text_ptr)
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_exec_text"); 
     return(gv); 
   } 
@@ -262 +265 @@
   if(!G__int_ptr)
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_int"); 
     return(0); 
   } 
@@ -274 +277 @@
   if(!G__double_ptr)
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_double"); 
     return(BDat::Unknown().Value()); 
   } 
@@ -287 +290 @@
   if(!G__calc_ptr)
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_calc"); 
     return(gv ); 
   } 
@@ -299 +302 @@
   if(!G__deletevariable_ptr)
   { 
-    Cint_not_linked_message(); 
+    Cint_not_linked_message("Cint_deletevariable"); 
     return(0); 
   } 
@@ -351 +354 @@
   {
     Cint_is_initialized() = true; 
-    if(!Cint_dynamic_linkage()) { return(false); }
+    int linked = Cint_dynamic_linkage();
+    if(!linked) { return(false); }
     BText order = "cint";
     if(filePath.HasName()) { order += BText(" ")+filePath; }
@@ -391 +395 @@
 
 //--------------------------------------------------------------------
+int Cint_initialize_tol_variables()
+//--------------------------------------------------------------------
+{
+  int linked = Cint_dynamic_linkage();
+  BSystemDat* linked_ = new BSystemDat("Cint_IsLinked", linked,
+          I2("Is true if optional libcint library has been linked succesfully.",
+             "Es cierto si la librería opcional libcint ha sido enlazada correctamente"));
+  return(linked);
+}
+
+//--------------------------------------------------------------------
   DeclareContensClass(BDat, BDatTemporary, BDatCint_SetCINTSYSDIR);
   DefExtOpr(1, BDatCint_SetCINTSYSDIR, "Cint.SetCINTSYSDIR", 1, 1, "Text",
@@ -402 +417 @@
 {
   if(CheckNonDeclarativeAction("Cint.SetCINTSYSDIR")) { return; }
-  BText& filePath = Text(Arg(1));
-  Cint_SetCINTSYSDIR(filePath);
-  contens_ = 1;
+  BText& dirPath = Text(Arg(1));
+  bool ok = G__SetCINTSYSDIR_ptr!=NULL;
+
+  if(!BDir::CheckIsDir(dirPath))
+  {
+    Error(BText("[Cint.SetCINTSYSDIR]")+" Not found path "+dirPath);
+    ok = false;
+  }
+  contens_ = ok;
+  if(ok)
+  {
+    Cint_SetCINTSYSDIR(dirPath);
+  }
 }