Changeset c566d35 in tol

Timestamp:

Aug 4, 2010, 11:45:43 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

1a564aa

Parents:

21dc548

Message:

Refs #956
Refs #957
DefMethod must return an instance of BUserCode
Calling lt_dlinit
Prefixing messages

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

File:

• tol/LoadDynLib/LoadDynLib.cpp (modified) (5 diffs)

tol/LoadDynLib/LoadDynLib.cpp

@@ -29 +29 @@
 #endif
 
+#include "tol_LoadDynLib.h"
 #include <tol/tol_bnameblock.h>
 #include <tol/tol_blanguag.h>
@@ -38 +39 @@
 typedef void* (*get_nb_t)(void);
 
+static int  lt_dlinit_ =  lt_dlinit();
 
 //--------------------------------------------------------------------
-BExternalOperator* NewExternalOperator(
+TOL_API BUserCode* NewMethod(
+  BNameBlock& nb,
+  const BText& file,
   const BText& name,
   BGrammar* gra,
@@ -49 +53 @@
   const BText& args,
   const BText& desc,
-  BOperClassify* cl       )
+  BOperClassify* cl)
 //--------------------------------------------------------------------
 {
-  return(new BExternalOperator(
-    name,gra,grammars,evaluator,min,max,args,desc,cl));
+  BExternalOperator* opr = new BExternalOperator(
+    "",gra,grammars,evaluator,min,max,args,desc,cl);
+  opr->PutCppFile(file),   
+  opr->PutName(name);
+  BCode code;
+  BUserCode* uCode = new BContensCode("", code, desc);
+  uCode->Contens().PutOperator(opr);
+  uCode->PutName(name);
+  uCode->PutDescription(desc);
+  nb.AddElement(uCode,true);
+  return(uCode);
 }
 
@@ -98 +111 @@
     libraryName = Text(Car(Cdr(arg)));
   }
+//Std(BText("\nTRACE BLoadDynLib::Evaluator 1 libraryPath=")+libraryPath);
+//Std(BText("\nTRACE BLoadDynLib::Evaluator 2 libraryName=")+libraryName);
   BUserNameBlock* unb = NULL;
-  //VBR: Jorge, inserta aquí el código que enlaza con la dll y pon
-  //el resultado en unb para devolverlo
 
   lt_dlhandle handleLib;
@@ -106 +119 @@
   // abro la DynLib
   handleLib = lt_dlopen( libraryPath );
-  if ( !handleLib ) {
+  if ( !handleLib ) 
+  {
+  //Std(BText("\nTRACE BLoadDynLib::Evaluator 3 lt_dlerror='")+lt_dlerror()+"'");
     BText reason( lt_dlerror( ) );
-    Error( reason );
-  } else {
+    Error(BText("[LoadDynLib] lt_dlerror:'")+reason+"'");
+  } 
+  else 
+  {
     // si OK, pido el nameblock
     BText functionName( "GetDynLibNameBlock" );
     functionName += libraryName;
-  
+  //Std(BText("\nTRACE BLoadDynLib::Evaluator 4 functionName=")+functionName);
     get_nb_t getNameBlock =
       reinterpret_cast<get_nb_t>( lt_dlsym( handleLib, functionName ) );
-    if ( !getNameBlock ) {
+    if ( !getNameBlock ) 
+    {
+    //Std(BText("\nTRACE BLoadDynLib::Evaluator 5 lt_dlerror='")+lt_dlerror()+"'");
       BText reason( lt_dlerror( ) );
-      Error( reason );
-    } else {
+      Error(BText("[LoadDynLib] lt_dlerror:'")+reason+"'");
+    } 
+    else 
+    {
+    //Std(BText("\nTRACE BLoadDynLib::Evaluator 6"));
       unb = reinterpret_cast<BUserNameBlock*>((*getNameBlock)());
-      if ( !unb ) {
-        Error( "No se pudo convertir a NameBlock: dynamic_cast<BUserNameBlock*>" );
+      if ( !unb ) 
+      {
+      //Std(BText("\nTRACE BLoadDynLib::Evaluator 7"));
+        Error(BText("[LoadDynLib]")+
+              "No se pudo convertir a NameBlock: dynamic_cast<BUserNameBlock*>" );
       }
     }
   }
+//Std(BText("\nTRACE BLoadDynLib::Evaluator 8"));
   //Al final hay que destruir la lista de argumentos antes de salir
   DESTROY(arg);