[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.6, 1.7 CBM.pm, 1.11, 1.12 CBM_wrap.cxx, 1.11, 1.
Brought to you by:
xfred
Menu
▾
▴
[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.6, 1.7 CBM.pm, 1.11, 1.12 CBM_wrap.cxx, 1.11, 1.12
|
From: Frederic T. <xf...@us...> - 2007-01-23 18:56:33
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6103 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Log Message: libcompbenchmarks moved in a separate directory. libxml2 support. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CBM.pm 22 Jan 2007 18:17:20 -0000 1.11 --- CBM.pm 23 Jan 2007 18:56:28 -0000 1.12 *************** *** 254,257 **** --- 254,295 ---- + ############# Class : CBM::XMLReader ############## + + package CBM::XMLReader; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_XMLReader(@_); + bless $self, $pkg if defined($self); + } + + *read = *CBMc::XMLReader_read; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_XMLReader($self); + delete $OWNER{$self}; + } + } + + sub DISOWN { + my $self = shift; + my $ptr = tied(%$self); + delete $OWNER{$ptr}; + } + + sub ACQUIRE { + my $self = shift; + my $ptr = tied(%$self); + $OWNER{$ptr} = 1; + } + + ############# Class : CBM::System ############## *************** *** 402,405 **** --- 440,444 ---- *UO_verbose = *CBMc::UO_verbose; *UO_fatal = *CBMc::UO_fatal; + *H_XMLREADER = *CBMc::H_XMLREADER; my %__cbmSystem_hash; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CBM_wrap.cxx 22 Jan 2007 18:17:20 -0000 1.11 --- CBM_wrap.cxx 23 Jan 2007 18:56:28 -0000 1.12 *************** *** 1388,1399 **** #define SWIGTYPE_p_CBM__XMLAttribute swig_types[6] #define SWIGTYPE_p_CBM__XMLNode swig_types[7] ! #define SWIGTYPE_p_Compiler swig_types[8] ! #define SWIGTYPE_p_CompilerOptions swig_types[9] ! #define SWIGTYPE_p_char swig_types[10] ! #define SWIGTYPE_p_std__string swig_types[11] ! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[12] ! #define SWIGTYPE_p_time_t swig_types[13] ! static swig_type_info *swig_types[15]; ! static swig_module_info swig_module = {swig_types, 14, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) --- 1388,1400 ---- #define SWIGTYPE_p_CBM__XMLAttribute swig_types[6] #define SWIGTYPE_p_CBM__XMLNode swig_types[7] ! #define SWIGTYPE_p_CBM__XMLReader swig_types[8] ! #define SWIGTYPE_p_Compiler swig_types[9] ! #define SWIGTYPE_p_CompilerOptions swig_types[10] ! #define SWIGTYPE_p_char swig_types[11] ! #define SWIGTYPE_p_std__string swig_types[12] ! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[13] ! #define SWIGTYPE_p_time_t swig_types[14] ! static swig_type_info *swig_types[16]; ! static swig_module_info swig_module = {swig_types, 15, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) *************** *** 1470,1473 **** --- 1471,1475 ---- #include "Compiler/Compiler.h" #include "Base/XML.h" + #include "Base/XMLReader.h" using namespace CBM; *************** *** 5718,5721 **** --- 5720,5811 ---- + XS(_wrap_new_XMLReader) { + { + CBM::XMLReader *result = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 0) || (items > 0)) { + SWIG_croak("Usage: new_XMLReader();"); + } + result = (CBM::XMLReader *)new CBM::XMLReader(); + + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__XMLReader, SWIG_OWNER | SWIG_SHADOW); argvi++ ; + XSRETURN(argvi); + fail: + SWIG_croak_null(); + } + } + + + XS(_wrap_XMLReader_read) { + { + CBM::XMLReader *arg1 = (CBM::XMLReader *) 0 ; + std::string arg2 ; + CBM::XMLNode *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 2) || (items > 2)) { + SWIG_croak("Usage: XMLReader_read(self,filename);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__XMLReader, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XMLReader_read" "', argument " "1"" of type '" "CBM::XMLReader *""'"); + } + arg1 = reinterpret_cast<CBM::XMLReader * >(argp1); + { + std::string *ptr = (std::string *)0; + int res = SWIG_AsPtr_std_string SWIG_PERL_CALL_ARGS_2(ST(1), &ptr); + if (!SWIG_IsOK(res) || !ptr) { + SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "XMLReader_read" "', argument " "2"" of type '" "std::string""'"); + } + arg2 = *ptr; + if (SWIG_IsNewObj(res)) delete ptr; + } + result = (CBM::XMLNode *)(arg1)->read(arg2); + + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CBM__XMLNode, 0 | SWIG_SHADOW); argvi++ ; + + + XSRETURN(argvi); + fail: + + + SWIG_croak_null(); + } + } + + + XS(_wrap_delete_XMLReader) { + { + CBM::XMLReader *arg1 = (CBM::XMLReader *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: delete_XMLReader(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CBM__XMLReader, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_XMLReader" "', argument " "1"" of type '" "CBM::XMLReader *""'"); + } + arg1 = reinterpret_cast<CBM::XMLReader * >(argp1); + delete arg1; + + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } + } + + XS(_wrap_System_init) { { *************** *** 7661,7664 **** --- 7751,7755 ---- static swig_type_info _swigt__p_CBM__XMLAttribute = {"_p_CBM__XMLAttribute", "CBM::XMLAttribute *", 0, 0, (void*)"CBM::XMLAttribute", 0}; static swig_type_info _swigt__p_CBM__XMLNode = {"_p_CBM__XMLNode", "CBM::XMLNode *", 0, 0, (void*)"CBM::XMLNode", 0}; + static swig_type_info _swigt__p_CBM__XMLReader = {"_p_CBM__XMLReader", "CBM::XMLReader *", 0, 0, (void*)"CBM::XMLReader", 0}; static swig_type_info _swigt__p_Compiler = {"_p_Compiler", "Compiler *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_CompilerOptions = {"_p_CompilerOptions", "CompilerOptions *", 0, 0, (void*)0, 0}; *************** *** 7677,7680 **** --- 7768,7772 ---- &_swigt__p_CBM__XMLAttribute, &_swigt__p_CBM__XMLNode, + &_swigt__p_CBM__XMLReader, &_swigt__p_Compiler, &_swigt__p_CompilerOptions, *************** *** 7693,7696 **** --- 7785,7789 ---- static swig_cast_info _swigc__p_CBM__XMLAttribute[] = { {&_swigt__p_CBM__XMLAttribute, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_CBM__XMLNode[] = { {&_swigt__p_CBM__XMLNode, 0, 0, 0},{0, 0, 0, 0}}; + static swig_cast_info _swigc__p_CBM__XMLReader[] = { {&_swigt__p_CBM__XMLReader, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_Compiler[] = { {&_swigt__p_Compiler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_CompilerOptions[] = { {&_swigt__p_CompilerOptions, 0, 0, 0},{0, 0, 0, 0}}; *************** *** 7709,7712 **** --- 7802,7806 ---- _swigc__p_CBM__XMLAttribute, _swigc__p_CBM__XMLNode, + _swigc__p_CBM__XMLReader, _swigc__p_Compiler, _swigc__p_CompilerOptions, *************** *** 7800,7803 **** --- 7894,7900 ---- {"CBMc::XMLNode_str", _wrap_XMLNode_str}, {"CBMc::delete_XMLNode", _wrap_delete_XMLNode}, + {"CBMc::new_XMLReader", _wrap_new_XMLReader}, + {"CBMc::XMLReader_read", _wrap_XMLReader_read}, + {"CBMc::delete_XMLReader", _wrap_delete_XMLReader}, {"CBMc::System_init", _wrap_System_init}, {"CBMc::System_hostid", _wrap_System_hostid}, *************** *** 8172,8175 **** --- 8269,8278 ---- SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLNode, (void*) "CBM::XMLNode"); /*@SWIG:%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "H_XMLREADER", TRUE | 0x2); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(1))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLReader, (void*) "CBM::XMLReader"); + /*@SWIG:%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "System_Root", TRUE | 0x2); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast<int >(CBM::System::Root))); Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CBM.i 22 Jan 2007 18:17:20 -0000 1.6 --- CBM.i 23 Jan 2007 18:56:28 -0000 1.7 *************** *** 10,13 **** --- 10,14 ---- #include "Compiler/Compiler.h" #include "Base/XML.h" + #include "Base/XMLReader.h" using namespace CBM; %} *************** *** 17,20 **** --- 18,22 ---- %include "Benchmark/Benchmark.h" %include "Base/XML.h" + %include "Base/XMLReader.h" %include "System/System.h" %include "Compiler/Compiler.h" |
