Index: tol/btol/bgrammar/spfuninst.cpp =================================================================== --- tol/btol/bgrammar/spfuninst.cpp (revision d471a9fd936ffc86abcd2fbc4ef266c0b10567c8) +++ tol/btol/bgrammar/spfuninst.cpp (revision 330e6f8d395c1882db764d6ccbd167bf65e95d78) @@ -51,5 +51,6 @@ #include #include -#include +#include + BTraceInit("spfuninst.cpp"); @@ -1650,5 +1651,5 @@ BText ups = BParser::Unparse(tre, " "); //Std(ups+"\n"); - if(ups=="a::fun(?)::b") + if(ups=="cD::C2B") printf(""); //Std(BText("\nEvMember branch1='")+BParser::Unparse(branch1," ")+"'\n"); @@ -1830,7 +1831,7 @@ if(gra==GraReal()) { - BDat cnt = G__double(G__calc(name)); + BDat cnt = Cint_double(Cint_calc(name)); /* - g = G__calc(name); + g = Cint_calc(name); bool ok = true; switch (g.type) @@ -1855,7 +1856,7 @@ int rows = -1, columns = -1; double* buffer = NULL; - rows = G__int(G__calc(name+".rows_")); - columns = G__int(G__calc(name+".columns_")); - buffer = (double*)G__int(G__calc(BText("(int)(")+name+".buffer_)")); + rows = Cint_int(Cint_calc(name+".rows_")); + columns = Cint_int(Cint_calc(name+".columns_")); + buffer = (double*)Cint_int(Cint_calc(BText("(int)(")+name+".buffer_)")); if(rows>0 && columns>0 && buffer!=NULL) { @@ -1868,6 +1869,6 @@ int length = -1; char* buffer = NULL; - length = G__int(G__calc(name+".length_")); - buffer = (char*)G__int(G__calc(BText("(int)(")+name+".buffer_)")); + length = Cint_int(Cint_calc(name+".length_")); + buffer = (char*)Cint_int(Cint_calc(BText("(int)(")+name+".buffer_)")); if(length>0 && buffer!=NULL) { Index: tol/contrib/cint/tolCint.cpp =================================================================== --- tol/contrib/cint/tolCint.cpp (revision d471a9fd936ffc86abcd2fbc4ef266c0b10567c8) +++ tol/contrib/cint/tolCint.cpp (revision 330e6f8d395c1882db764d6ccbd167bf65e95d78) @@ -22,7 +22,5 @@ */ -#if defined(_MSC_VER) -#include -#endif +#include #include @@ -32,25 +30,268 @@ #include #include - -//#pragma pack(16) -#include -#include -//#pragma pack(4) - -/* - -G__scratch_all() - -*/ - -//#define DO_TRACE_CINT_DECIMAL; -#ifdef DO_TRACE_CINT_DECIMAL -#define TRACE_CINT_DECIMAL \ - G__exec_text(BText(" double x = 2.1112; printf(\"")+__FILE__+":"+__LINE__+" [x=%.15lg]\n\",x); "); -#else -#define TRACE_CINT_DECIMAL -#endif - - +#include + +typedef void (*G__scratch_all_t) (void); +typedef char* (*G__lasterror_filename_t) (void); +typedef int (*G__lasterror_linenum_t) (void); +typedef int (*G__init_cint_t) (G__CONST char* command); +typedef void (*G__set_errmsgcallback_t) (void* p); +typedef void (*G__setautoconsole_t) (int autoconsole); +typedef void (*G__SetCINTSYSDIR_t) (char* cintsysdir); +typedef int (*G__loadfile_t) (G__CONST char* filename); +typedef int (*G__unloadfile_t) (G__CONST char* filename); +typedef G__value (*G__exec_tempfile_t) (G__CONST char *file); +typedef G__value (*G__exec_text_t) (G__CONST char *unnamedmacro); +typedef long (*G__int_t) (G__value buf); +typedef double (*G__double_t) (G__value buf); +typedef G__value (*G__calc_t) (G__CONST char *expr); +typedef int (*G__deletevariable_t) (G__CONST char* varname); + +static G__scratch_all_t G__scratch_all_ptr = NULL; +static G__lasterror_filename_t G__lasterror_filename_ptr = NULL; +static G__lasterror_linenum_t G__lasterror_linenum_ptr = NULL; +static G__init_cint_t G__init_cint_ptr = NULL; +static G__set_errmsgcallback_t G__set_errmsgcallback_ptr = NULL; +static G__setautoconsole_t G__setautoconsole_ptr = NULL; +static G__SetCINTSYSDIR_t G__SetCINTSYSDIR_ptr = NULL; +static G__loadfile_t G__loadfile_ptr = NULL; +static G__unloadfile_t G__unloadfile_ptr = NULL; +static G__exec_tempfile_t G__exec_tempfile_ptr = NULL; +static G__exec_text_t G__exec_text_ptr = NULL; +static G__int_t G__int_ptr = NULL; +static G__double_t G__double_ptr = NULL; +static G__calc_t G__calc_ptr = NULL; +static G__deletevariable_t G__deletevariable_ptr = NULL; + +//-------------------------------------------------------------------- +int Cint_dynamic_linkage (void) +//-------------------------------------------------------------------- +{ + BText libraryName = "libcint"; + BText libraryPath = ""; + #ifdef UNIX + libraryPath = libraryName+".so"; + #else + libraryPath = libraryName+".dll"; + #endif + + lt_dlhandle handleLib; + + // abro la DynLib + handleLib = lt_dlopen( libraryPath ); + if ( !handleLib ) + { + //Std(BText("\nTRACE BLoadDynLib::Evaluator 3 lt_dlerror='")+lt_dlerror()+"'"); + BText reason( lt_dlerror( ) ); + Warning(BText("[Cint_dynamic_linkage(\"")+libraryPath+"\")]"+" \n" + " lt_dlopen error:'"+reason+"'"); + return(false); + } + G__scratch_all_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__scratch_all" ) ); + G__lasterror_filename_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__lasterror_filename" ) ); + G__lasterror_linenum_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__lasterror_linenum" ) ); + G__init_cint_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__init_cint" ) ); + G__set_errmsgcallback_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__set_errmsgcallback" ) ); + G__setautoconsole_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__setautoconsole" ) ); + G__SetCINTSYSDIR_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__SetCINTSYSDIR" ) ); + G__loadfile_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__loadfile" ) ); + G__unloadfile_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__unloadfile" ) ); + G__exec_tempfile_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__exec_tempfile" ) ); + G__exec_text_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__exec_text" ) ); + G__int_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__int" ) ); + G__double_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__double" ) ); + G__calc_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__calc" ) ); + G__deletevariable_ptr = reinterpret_cast( lt_dlsym( handleLib, "G__deletevariable" ) ); + return(true); +} + +//-------------------------------------------------------------------- +void Cint_not_linked_message (void) +//-------------------------------------------------------------------- +{ + Error("Cannot use CINT due to libcint.dll is not linked."); +} + +//-------------------------------------------------------------------- +void Cint_scratch_all (void) +//-------------------------------------------------------------------- +{ + if(!G__scratch_all_ptr) + { + Cint_not_linked_message(); + return; + } + (*G__scratch_all_ptr)(); +} + +//-------------------------------------------------------------------- +char* Cint_lasterror_filename (void) +//-------------------------------------------------------------------- +{ + if(!G__lasterror_filename_ptr) + { + Cint_not_linked_message(); + return(NULL); + } + return((*G__lasterror_filename_ptr)()); +} + +//-------------------------------------------------------------------- +int Cint_lasterror_linenum (void) +//-------------------------------------------------------------------- +{ + if(!G__lasterror_linenum_ptr) + { + return(0); + } + return((*G__lasterror_linenum_ptr)()); +} + +//-------------------------------------------------------------------- +int Cint_init_cint (G__CONST char* command) +//-------------------------------------------------------------------- +{ + if(!G__init_cint_ptr) + { + Cint_not_linked_message(); + return(-1); + } + return((*G__init_cint_ptr)(command)); +} + +//-------------------------------------------------------------------- +void Cint_set_errmsgcallback (void* p) +//-------------------------------------------------------------------- +{ + if(!G__set_errmsgcallback_ptr) + { + Cint_not_linked_message(); + return; + } + (*G__set_errmsgcallback_ptr) (p); +} + +//-------------------------------------------------------------------- +void Cint_setautoconsole (int autoconsole) +//-------------------------------------------------------------------- +{ + if(!G__setautoconsole_ptr) + { + Cint_not_linked_message(); + return; + } + (*G__setautoconsole_ptr) (autoconsole); +} + +//-------------------------------------------------------------------- +void Cint_SetCINTSYSDIR (char* cintsysdir) +//-------------------------------------------------------------------- +{ + if(!G__SetCINTSYSDIR_ptr) + { + Cint_not_linked_message(); + return; + } + (*G__SetCINTSYSDIR_ptr) (cintsysdir); +} + +//-------------------------------------------------------------------- +int Cint_loadfile (G__CONST char* filename) +//-------------------------------------------------------------------- +{ + if(!G__loadfile_ptr) + { + Cint_not_linked_message(); + return(0); + } + return((*G__loadfile_ptr) (filename)); +} + +//-------------------------------------------------------------------- +int Cint_unloadfile (G__CONST char* filename) +//-------------------------------------------------------------------- +{ + if(!G__unloadfile_ptr) + { + Cint_not_linked_message(); + return(0); + } + return((*G__unloadfile_ptr) (filename)); +} + +//-------------------------------------------------------------------- +G__value Cint_exec_tempfile (G__CONST char *file) +//-------------------------------------------------------------------- +{ + static G__value gv; + if(!G__exec_tempfile_ptr) + { + Cint_not_linked_message(); + return(gv); + } + return((*G__exec_tempfile_ptr) (file)); +} + +//-------------------------------------------------------------------- +G__value Cint_exec_text (G__CONST char *unnamedmacro) +//-------------------------------------------------------------------- +{ + static G__value gv; + if(!G__exec_text_ptr) + { + Cint_not_linked_message(); + return(gv); + } + return((*G__exec_text_ptr) (unnamedmacro)); +} + +//-------------------------------------------------------------------- +long Cint_int (G__value buf) +//-------------------------------------------------------------------- +{ + if(!G__int_ptr) + { + Cint_not_linked_message(); + return(0); + } + return((*G__int_ptr) (buf)); +} + +//-------------------------------------------------------------------- +double Cint_double (G__value buf) +//-------------------------------------------------------------------- +{ + if(!G__double_ptr) + { + Cint_not_linked_message(); + return(BDat::Unknown().Value()); + } + return((*G__double_ptr) (buf)); +} + +//-------------------------------------------------------------------- +G__value Cint_calc (G__CONST char *expr) +//-------------------------------------------------------------------- +{ + static G__value gv; + if(!G__calc_ptr) + { + Cint_not_linked_message(); + return(gv ); + } + return((*G__calc_ptr) (expr)); +} + +//-------------------------------------------------------------------- +int Cint_deletevariable (G__CONST char* varname) +//-------------------------------------------------------------------- +{ + if(!G__deletevariable_ptr) + { + Cint_not_linked_message(); + return(0); + } + return((*G__deletevariable_ptr) (varname)); +} //-------------------------------------------------------------------- @@ -70,6 +311,6 @@ //-------------------------------------------------------------------- { - BText filename = G__lasterror_filename(); - BText linenum = G__lasterror_linenum(); + BText filename = Cint_lasterror_filename(); + BText linenum = Cint_lasterror_linenum(); BText locInfo = ""; if(filename.HasName()) @@ -100,7 +341,8 @@ { Cint_is_initialized() = true; + if(!Cint_dynamic_linkage()) { return(false); } BText order = "cint"; if(filePath.HasName()) { order += BText(" ")+filePath; } - int G__init_cint_ = G__init_cint(order); + int G__init_cint_ = Cint_init_cint(order); switch(G__init_cint_) { case G__INIT_CINT_SUCCESS_MAIN: @@ -115,6 +357,6 @@ Error("Cint initialization failed G__INIT_CINT_FAILURE.\n"); } - G__set_errmsgcallback(reinterpret_cast(Cint_errmsgcallback)); - G__setautoconsole(1); + Cint_set_errmsgcallback(reinterpret_cast(Cint_errmsgcallback)); + Cint_setautoconsole(1); TRACE_CINT_DECIMAL; return(G__init_cint_); @@ -123,5 +365,5 @@ //-------------------------------------------------------------------- -int Cint_scratch_all() +int Cint_scratch_all_safe() //-------------------------------------------------------------------- { @@ -133,5 +375,6 @@ { Cint_is_initialized() = false; - return(Cint_scratch_all()); + Cint_scratch_all(); + return(true); } } @@ -150,5 +393,5 @@ if(CheckNonDeclarativeAction("Cint.SetCINTSYSDIR")) { return; } BText& filePath = Text(Arg(1)); - G__SetCINTSYSDIR(filePath); + Cint_SetCINTSYSDIR(filePath); contens_ = 1; } @@ -188,5 +431,5 @@ { if(CheckNonDeclarativeAction("Cint.scratch_all")) { return; } - contens_ = Cint_scratch_all(); + contens_ = Cint_scratch_all_safe(); } @@ -207,5 +450,5 @@ if(CheckNonDeclarativeAction("Cint.loadfile")) { return; } BText& filePath = Text(Arg(1)); - contens_ = G__loadfile(filePath.String()); + contens_ = Cint_loadfile(filePath.String()); } @@ -223,5 +466,5 @@ if(CheckNonDeclarativeAction("Cint.unloadfile")) { return; } BText& filePath = Text(Arg(1)); - contens_ = G__unloadfile(filePath.String()); + contens_ = Cint_unloadfile(filePath.String()); } @@ -247,5 +490,5 @@ if(CheckNonDeclarativeAction("Cint.exec_tempfile")) { return; } BText& filePath = Text(Arg(1)); - G__exec_tempfile(filePath.String()); + Cint_exec_tempfile(filePath.String()); contens_ = true; } @@ -274,5 +517,5 @@ if(CheckNonDeclarativeAction("Cint.exec_text")) { return; } BText& expression = Text(Arg(1)); - G__exec_text(expression); + Cint_exec_text(expression); contens_ = true; } @@ -299,7 +542,7 @@ if(CheckNonDeclarativeAction("Cint.calc")) { return; } BText& expression = Text(Arg(1)); - contens_ = G__double(G__calc(expression)); + contens_ = Cint_double(Cint_calc(expression)); /* - G__value g = G__calc(expression); + G__value g = Cint_calc(expression); switch (g.type) { @@ -430,5 +673,5 @@ }; //Std(BText("\nTRACE [Cint.import_from_tol] expression=[\n")+expression+"\n]\n"); - G__exec_text(expression); + Cint_exec_text(expression); } @@ -479,5 +722,5 @@ { BText pns = prefix_+var->Name()+sufix_; - contens_ += G__deletevariable(pns); + contens_ += Cint_deletevariable(pns); } } Index: tol/contrib/cint/tolCint.h =================================================================== --- tol/contrib/cint/tolCint.h (revision 330e6f8d395c1882db764d6ccbd167bf65e95d78) +++ tol/contrib/cint/tolCint.h (revision 330e6f8d395c1882db764d6ccbd167bf65e95d78) @@ -0,0 +1,67 @@ +/* tolCint.h: API for CINT, a interpreter to C and C++. + + http://root.cern.ch/drupal/content/cint + http://root.cern.ch/viewvc/trunk/cint/doc/ref.txt + + Copyright (C) 2010 - Bayes Decision, SL (Spain [EU]) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. + */ + +#ifndef TOL_CINT_H +#define TOL_CINT_H + +#if defined(_MSC_VER) +#include +#endif + +#include + +//#pragma pack(16) +#include +#include +//#pragma pack(4) + + +//hooks to dynamic linked functions +void Cint_scratch_all (void); +char* Cint_lasterror_filename (void); +int Cint_lasterror_linenum (void); +int Cint_init_cint (G__CONST char* command); +void Cint_set_errmsgcallback (void* p); +void Cint_setautoconsole (int autoconsole); +void Cint_SetCINTSYSDIR (char* cintsysdir); +int Cint_loadfile (G__CONST char* filename); +int Cint_unloadfile (G__CONST char* filename); +G__value Cint_exec_tempfile (G__CONST char *file); +G__value Cint_exec_text (G__CONST char *unnamedmacro); +long Cint_int (G__value buf); +double Cint_double (G__value buf); +G__value Cint_calc (G__CONST char *expr); +int Cint_deletevariable (G__CONST char* varname); + +//TOL-CINT API initialization +int Cint_initialize(const BText& filePath); + +//#define DO_TRACE_CINT_DECIMAL; +#ifdef DO_TRACE_CINT_DECIMAL +#define TRACE_CINT_DECIMAL \ + Cint_exec_text(BText(" double x = 2.1112; printf(\"")+__FILE__+":"+__LINE__+" [x=%.15lg]\n\",x); "); +#else +#define TRACE_CINT_DECIMAL +#endif + +#endif /*TOL_CINT_H*/ Index: tol/init.cpp =================================================================== --- tol/init.cpp (revision d471a9fd936ffc86abcd2fbc4ef266c0b10567c8) +++ tol/init.cpp (revision 330e6f8d395c1882db764d6ccbd167bf65e95d78) @@ -66,6 +66,6 @@ #include #include - #include +#include @@ -124,15 +124,4 @@ static BText _tolSdkPath_ = ""; static BSystemText* tolSdkPath_ = NULL; - -int Cint_initialize(const BText& filePath); - -//#define DO_TRACE_CINT_DECIMAL; -#ifdef DO_TRACE_CINT_DECIMAL -#include -#define TRACE_CINT_DECIMAL \ - G__exec_text(BText(" double x = 2.1112; printf(\"")+__FILE__+":"+__LINE__+" [x=%.15lg]\n\",x); "); -#else -#define TRACE_CINT_DECIMAL -#endif Index: tol/win-VC8/tollib.vcproj =================================================================== --- tol/win-VC8/tollib.vcproj (revision d471a9fd936ffc86abcd2fbc4ef266c0b10567c8) +++ tol/win-VC8/tollib.vcproj (revision 330e6f8d395c1882db764d6ccbd167bf65e95d78) @@ -79,5 +79,5 @@