Thread: [Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.3, 1.4 CBM.pm, 1.6, 1.7 CBM_wrap.cxx, 1.6, 1.7
Brought to you by:
xfred
From: Frederic T. <xf...@us...> - 2007-01-17 19:21:25
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20575 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Log Message: XML handling wrappers added. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CBM.pm 15 Jan 2007 20:44:06 -0000 1.6 --- CBM.pm 17 Jan 2007 19:21:17 -0000 1.7 *************** *** 106,109 **** --- 106,197 ---- + ############# Class : CBM::CBMXMLAttribute ############## + + package CBM::CBMXMLAttribute; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_CBMXMLAttribute(@_); + bless $self, $pkg if defined($self); + } + + *Name = *CBMc::CBMXMLAttribute_Name; + *Value = *CBMc::CBMXMLAttribute_Value; + *setValue = *CBMc::CBMXMLAttribute_setValue; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_CBMXMLAttribute($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::CBMXMLNode ############## + + package CBM::CBMXMLNode; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_CBMXMLNode(@_); + bless $self, $pkg if defined($self); + } + + *Name = *CBMc::CBMXMLNode_Name; + *Value = *CBMc::CBMXMLNode_Value; + *setValue = *CBMc::CBMXMLNode_setValue; + *childNumber = *CBMc::CBMXMLNode_childNumber; + *getChild = *CBMc::CBMXMLNode_getChild; + *attributeNumber = *CBMc::CBMXMLNode_attributeNumber; + *getAttribute = *CBMc::CBMXMLNode_getAttribute; + *addNode = *CBMc::CBMXMLNode_addNode; + *add = *CBMc::CBMXMLNode_add; + *addAttribute = *CBMc::CBMXMLNode_addAttribute; + *str = *CBMc::CBMXMLNode_str; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_CBMXMLNode($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::CBMSystemUnix ############## Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CBM_wrap.cxx 15 Jan 2007 20:44:06 -0000 1.6 --- CBM_wrap.cxx 17 Jan 2007 19:21:17 -0000 1.7 *************** *** 1388,1397 **** #define SWIGTYPE_p_CBMSystemLinux swig_types[6] #define SWIGTYPE_p_CBMSystemUnix swig_types[7] ! #define SWIGTYPE_p_char swig_types[8] ! #define SWIGTYPE_p_std__string swig_types[9] ! #define SWIGTYPE_p_std__vectorTstd__string_t swig_types[10] ! #define SWIGTYPE_p_time_t swig_types[11] ! static swig_type_info *swig_types[13]; ! static swig_module_info swig_module = {swig_types, 12, 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) [...1410 lines suppressed...] + {"CBMc::CBMXMLNode_childNumber", _wrap_CBMXMLNode_childNumber}, + {"CBMc::CBMXMLNode_getChild", _wrap_CBMXMLNode_getChild}, + {"CBMc::CBMXMLNode_attributeNumber", _wrap_CBMXMLNode_attributeNumber}, + {"CBMc::CBMXMLNode_getAttribute", _wrap_CBMXMLNode_getAttribute}, + {"CBMc::CBMXMLNode_addNode", _wrap_CBMXMLNode_addNode}, + {"CBMc::CBMXMLNode_add", _wrap_CBMXMLNode_add}, + {"CBMc::CBMXMLNode_addAttribute", _wrap_CBMXMLNode_addAttribute}, + {"CBMc::CBMXMLNode_str", _wrap_CBMXMLNode_str}, + {"CBMc::delete_CBMXMLNode", _wrap_delete_CBMXMLNode}, {"CBMc::CBMSystemUnix_copy", _wrap_CBMSystemUnix_copy}, {"CBMc::CBMSystemUnix_mkdir", _wrap_CBMSystemUnix_mkdir}, *************** *** 7284,7287 **** --- 8645,8650 ---- } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_CBMSystem, (void*) "CBM::CBMSystem"); + SWIG_TypeClientData(SWIGTYPE_p_CBMXMLAttribute, (void*) "CBM::CBMXMLAttribute"); + SWIG_TypeClientData(SWIGTYPE_p_CBMXMLNode, (void*) "CBM::CBMXMLNode"); SWIG_TypeClientData(SWIGTYPE_p_CBMSystemUnix, (void*) "CBM::CBMSystemUnix"); SWIG_TypeClientData(SWIGTYPE_p_CBMSystemLinux, (void*) "CBM::CBMSystemLinux"); Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CBM.i 4 Jan 2007 19:37:29 -0000 1.3 --- CBM.i 17 Jan 2007 19:21:17 -0000 1.4 *************** *** 7,10 **** --- 7,15 ---- %} + %module CBMXML + %{ + #include "System/XML.h" + %} + %module CBMSystem %{ *************** *** 40,43 **** --- 45,49 ---- %include "libcompbenchmarks.h" %include "System/System.h" + %include "System/XML.h" %include "System/System-Unix.h" %include "System/System-Linux.h" |