Changeset 437a0af in tol

Timestamp:

Jan 5, 2011, 2:18:37 PM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

beb3a50

Parents:

6562295

Message:

closes #1051

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

Location:

tol

Files:

• TestUseTol.cpp (modified) (2 diffs)
• bbasic/out.cpp (modified) (4 diffs)
• bbasic/tol_bout.h (modified) (3 diffs)

tol/TestUseTol.cpp

@@ -13 +13 @@
 #include <string.h>
 
-void Tol_HciWriter( const BText & str )
+void Tol_HciWriterEx( const BText & str, void *data )
 {
-  std::cout << str.String();
+  const char *name = (const char*)data;
+  
+  std::cout << name << ": " << str.String();
 }
 
@@ -128 +130 @@
   int lang = 1;
   char *vmode = NULL;
-  BOut::PutHciWriter( Tol_HciWriter );
+  const char *name = "Tester";
+  BOut::PutHciWriterEx( Tol_HciWriterEx, (void*)name );
   InitTolKernel( lang, vmode );
   std::cout << "\n";

tol/bbasic/out.cpp

@@ -92 +92 @@
 //--------------------------------------------------------------------
 BTraceInit("out.cpp");
-BHciWriter BOut::hciWriter_;
-BHciWriter BOut::logHciWriter_;
+BHciWriter BOut::hciWriter_=NULL;
+BHciWriter BOut::logHciWriter_=NULL;
+BHciWriterEx BOut::hciWriterEx_=NULL;
+BHciWriterEx BOut::logHciWriterEx_=NULL;
+void*      BOut::hciWriterExData_=NULL;
+void*      BOut::logHciWriterExData_=NULL;
 BBool      BOut::initialized_;
 BBool      BOut::enabled_;
@@ -145 +149 @@
     BOut::hciWriter_   = NIL;
     BOut::logHciWriter_ = NIL;
+    BOut::hciWriterEx_   = NIL;
+    BOut::logHciWriterEx_ = NIL;
+    BOut::hciWriterExData_   = NIL;
+    BOut::logHciWriterExData_ = NIL;
     BOut::errorOpenTag_    = "<E>\nERROR: ";
     BOut::errorCloseTag_   = "</E>\n";
@@ -524 +532 @@
 {
   if(!BOut::IsEnabled()) { return; }
-  if(hciWriter_)    { (*hciWriter_)(txt); }
+  if(hciWriter_) {
+    (*hciWriter_)(txt);
+  } else if( hciWriterEx_ ) {
+    (*hciWriterEx_)( txt, hciWriterExData_ );    
+  }
 }
 
@@ -535 +547 @@
 //--------------------------------------------------------------------
 {
-  if(logHciWriter_) { (*logHciWriter_)(txt); } 
-  else              { Std(txt); }
+  if( logHciWriter_ ) {
+    (*logHciWriter_)(txt);
+  } else if ( logHciWriterEx_ ) {
+    (*logHciWriterEx_)( txt, logHciWriterExData_ );
+  } else {
+    Std( txt );
+  }
 }
 

tol/bbasic/tol_bout.h

@@ -46 +46 @@
 //! pointer to user defined function
 typedef void (*BHciWriter)(const BText&);
+typedef void (*BHciWriterEx)(const BText&, void*);
 
 
@@ -97 +98 @@
   static BHciWriter hciWriter_;
   static BHciWriter logHciWriter_;
+  static BHciWriterEx hciWriterEx_;
+  static void       *hciWriterExData_;
+  static BHciWriterEx logHciWriterEx_;
+  static void       *logHciWriterExData_;
 
   static BText errorOpenTag_; static BText errorCloseTag_;
@@ -131 +136 @@
   static       void   PutHciWriter(BHciWriter h) { 
       hciWriter_=h; 
+      hciWriterEx_=NULL; 
+  }
+  static       void   PutHciWriterEx(BHciWriterEx h, void *ClientData) { 
+      hciWriter_=NULL; 
+      hciWriterEx_=h;
+      hciWriterExData_ = ClientData;
   }
   static       void   PutLogHciWriter(BHciWriter h) { 
       logHciWriter_=h; 
+      logHciWriterEx_=NULL; 
+  }
+  static       void   PutLogHciWriterEx(BHciWriterEx h, void *ClientData) { 
+      logHciWriter_=NULL; 
+      logHciWriterEx_=h;
+      logHciWriterExData_ = ClientData;
   }