Changeset a4ff0a0 in tol

Timestamp:

Aug 3, 2010, 10:10:22 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d8f2e4f

Parents:

ae1a7e1d

Message:

Refs #956
Using ad-hoc implementations of new to avoid problems with deleting memory in a dll created with another one
New optional argument libraryName

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

File:

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

tol/LoadDynLib/LoadDynLib.cpp

@@ -38 +38 @@
 typedef void* (*get_nb_t)(void);
 
+
+//--------------------------------------------------------------------
+BExternalOperator* NewExternalOperator(
+  const BText& name,
+  BGrammar* gra,
+  const BText& grammars,
+  BEvaluator evaluator,
+  BInt min,
+  BInt max,
+  const BText& args,
+  const BText& desc,
+  BOperClassify* cl       )
+//--------------------------------------------------------------------
+{
+  return(new BExternalOperator(
+    name,gra,grammars,evaluator,min,max,args,desc,cl));
+}
+
+//--------------------------------------------------------------------
+BGraContensP<BNameBlock>* NewUserNameBlock()
+//--------------------------------------------------------------------
+{
+  return(new BGraContensP<BNameBlock>("", new BNameBlock));
+}
+
 //--------------------------------------------------------------------
 class BLoadDynLib: public BExternalOperator
@@ -44 +69 @@
   BLoadDynLib() : BExternalOperator
   (
-    "LoadDynLib",GraNameBlock(),"Text", NIL,1,1,
-    "(Text libraryPath)",
+    "LoadDynLib",GraNameBlock(),"Text", NIL,1,2,
+    "(Text libraryPath [, Text libraryName])",
     I2("Returns a NameBlock that contains methods and members written "
     "in C + + in a precompiled library for dynamic linking. Once "
@@ -69 +94 @@
   BText& libraryPath = Text(Car(arg));
   BText libraryName = GetFilePrefix(libraryPath);  
+  if(Cdr(arg))
+  {
+    libraryName = Text(Car(Cdr(arg)));
+  }
   BUserNameBlock* unb = NULL;
   //VBR: Jorge, inserta aquí el código que enlaza con la dll y pon