@@ -53,7 +53,7 @@ public: } }; -class donothing : public action<char,char*> { +class donothing : public tst_action<char,char*> { public: virtual void perform(const char* string,int string_length,int remaining_distance,char* data) {} virtual char* result() { return 0; } c++/hello.cxx @@ -109,19 +109,19 @@ public: }; template <typename charT,typename valueT,typename stringT> -class action { +class tst_action { public: - action() {} - virtual ~action() {} + tst_action() {} + virtual ~tst_action() {} virtual void perform(const stringT & string,int remaining_distance,valueT data)=0; virtual valueT result()=0; }; template <typename charT,typename valueT,typename stringT> -class filter { +class tst_filter { public: - filter() {} - virtual ~filter() {} + tst_filter() {} + virtual ~tst_filter() {} virtual valueT perform(const stringT & string,int remaining_distance,valueT data)=0; }; include/fundamentals.h @@ -69,14 +69,14 @@ public: storage->pack(root); } - valueT walk(filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const; - valueT walk(filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform,const stringT & string) const; - valueT close_match(const stringT & string,int maximum_distance,filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const; - valueT prefix_match(const stringT & string,filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const; - valueT match(const stringT & string,filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const; + valueT walk(tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const; + valueT walk(tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform,const stringT & string) const; + valueT close_match(const stringT & string,int maximum_distance,tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const; + valueT prefix_match(const stringT & string,tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const; + valueT match(const stringT & string,tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const; valueT get(const stringT & string) const; - valueT get_or_build(const stringT & string,filter<charT,valueT,stringT>* factory); + valueT get_or_build(const stringT & string,tst_filter<charT,valueT,stringT>* factory); valueT put(const stringT & string,valueT data); void remove(const stringT & string); bool contains(const stringT & string) const; @@ -107,8 +107,8 @@ public: } #ifdef SCANNER - valueT scan(const stringT & string,action<charT,valueT,stringT>* to_perform); - valueT scan_with_stop_chars(const stringT & string,const stringT& stop_chars,action<charT,valueT,stringT>* to_perform) const; + valueT scan(const stringT & string,tst_action<charT,valueT,stringT>* to_perform); + valueT scan_with_stop_chars(const stringT & string,const stringT& stop_chars,tst_action<charT,valueT,stringT>* to_perform) const; #endif @@ -123,11 +123,11 @@ private: valueT default_value; int root; - void walk_recurse(tst_node<charT,valueT>* current_node,stringT & current_key,filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const; - void close_match_recurse(tst_node<charT,valueT>* current_node,stringT & current_key,const stringT & string,const size_t position, const int distance, const int remaining_distance,filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const; - void match_recurse(tst_node<charT,valueT>* current_node,stringT & current_key,const stringT & string,size_t position, filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform,bool advance) const; - void match_joker_recurse(tst_node<charT,valueT>* current_node,stringT & current_key,const stringT & string,size_t position, filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform,bool advance) const; - void match_star_recurse(tst_node<charT,valueT>* current_node,stringT & current_key,const stringT & string,size_t position, filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform,bool advance) const; + void walk_recurse(tst_node<charT,valueT>* current_node,stringT & current_key,tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const; + void close_match_recurse(tst_node<charT,valueT>* current_node,stringT & current_key,const stringT & string,const size_t position, const int distance, const int remaining_distance,tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const; + void match_recurse(tst_node<charT,valueT>* current_node,stringT & current_key,const stringT & string,size_t position, tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform,bool advance) const; + void match_joker_recurse(tst_node<charT,valueT>* current_node,stringT & current_key,const stringT & string,size_t position, tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform,bool advance) const; + void match_star_recurse(tst_node<charT,valueT>* current_node,stringT & current_key,const stringT & string,size_t position, tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform,bool advance) const; int build_node(node_info<charT,valueT>* current_node,const stringT & string,size_t current_position); void remove_node(int* current_index,const stringT & string,const size_t position); @@ -194,7 +194,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, } template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - valueT tst<charT,valueT,storageT,serializerT,stringT>::get_or_build(const stringT & string,filter<charT,valueT,stringT>* factory) { + valueT tst<charT,valueT,storageT,serializerT,stringT>::get_or_build(const stringT & string,tst_filter<charT,valueT,stringT>* factory) { node_info<charT,valueT> root_info; root_info.index=root; root_info.node=storage->get(root); @@ -590,7 +590,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, /**************************** close_match *************************************/ template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - valueT tst<charT,valueT,storageT,serializerT,stringT>::close_match(const stringT & string, int maximum_distance,filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const { + valueT tst<charT,valueT,storageT,serializerT,stringT>::close_match(const stringT & string, int maximum_distance,tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const { stringT key; close_match_recurse(storage->get(root),key,string,0,maximum_distance,maximum_distance,filter,to_perform); if(to_perform) { @@ -602,7 +602,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, } template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - void tst<charT,valueT,storageT,serializerT,stringT>::close_match_recurse(tst_node<charT,valueT>* current_node,stringT& current_key,const stringT & string, const size_t position, const int distance, const int remaining_distance,filter<charT,valueT,stringT>* filter, action<charT,valueT,stringT>* to_perform) const { + void tst<charT,valueT,storageT,serializerT,stringT>::close_match_recurse(tst_node<charT,valueT>* current_node,stringT& current_key,const stringT & string, const size_t position, const int distance, const int remaining_distance,tst_filter<charT,valueT,stringT>* filter, tst_action<charT,valueT,stringT>* to_perform) const { // LEFT int other_index=current_node->left; @@ -669,7 +669,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, /**************************** match *************************************/ template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - valueT tst<charT,valueT,storageT,serializerT,stringT>::match(const stringT & string,filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const { + valueT tst<charT,valueT,storageT,serializerT,stringT>::match(const stringT & string,tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const { stringT key; match_recurse(storage->get(root),key,string,0,filter,to_perform,false); if(to_perform) { @@ -681,7 +681,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, } template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - void tst<charT,valueT,storageT,serializerT,stringT>::match_recurse(tst_node<charT,valueT>* current_node,stringT& current_key,const stringT & string, size_t position,filter<charT,valueT,stringT>* filter, action<charT,valueT,stringT>* to_perform, bool advance) const { + void tst<charT,valueT,storageT,serializerT,stringT>::match_recurse(tst_node<charT,valueT>* current_node,stringT& current_key,const stringT & string, size_t position,tst_filter<charT,valueT,stringT>* filter, tst_action<charT,valueT,stringT>* to_perform, bool advance) const { stringT this_key(current_key); while(true) { @@ -757,7 +757,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, } template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - void tst<charT,valueT,storageT,serializerT,stringT>::match_joker_recurse(tst_node<charT,valueT>* current_node,stringT& current_key,const stringT & string, size_t position,filter<charT,valueT,stringT>* filter, action<charT,valueT,stringT>* to_perform,bool advance) const { + void tst<charT,valueT,storageT,serializerT,stringT>::match_joker_recurse(tst_node<charT,valueT>* current_node,stringT& current_key,const stringT & string, size_t position,tst_filter<charT,valueT,stringT>* filter, tst_action<charT,valueT,stringT>* to_perform,bool advance) const { int other_index; if(advance) { @@ -806,7 +806,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, } template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - void tst<charT,valueT,storageT,serializerT,stringT>::match_star_recurse(tst_node<charT,valueT>* current_node,stringT& current_key,const stringT & string, size_t position,filter<charT,valueT,stringT>* filter, action<charT,valueT,stringT>* to_perform,bool advance) const { + void tst<charT,valueT,storageT,serializerT,stringT>::match_star_recurse(tst_node<charT,valueT>* current_node,stringT& current_key,const stringT & string, size_t position,tst_filter<charT,valueT,stringT>* filter, tst_action<charT,valueT,stringT>* to_perform,bool advance) const { int other_index; if(advance) { @@ -875,7 +875,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, /**************************** walk *************************************/ template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - valueT tst<charT,valueT,storageT,serializerT,stringT>::walk(filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const { + valueT tst<charT,valueT,storageT,serializerT,stringT>::walk(tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const { stringT key; walk_recurse(storage->get(root),key,filter,to_perform); if(to_perform) { @@ -887,7 +887,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, } template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - valueT tst<charT,valueT,storageT,serializerT,stringT>::walk(filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform,const stringT & string) const { + valueT tst<charT,valueT,storageT,serializerT,stringT>::walk(tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform,const stringT & string) const { int index = root; int best_node = UNDEFINED_INDEX; tst_node<charT,valueT>* start = find_node(&index,&best_node,string); @@ -919,7 +919,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, } template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - void tst<charT,valueT,storageT,serializerT,stringT>::walk_recurse(tst_node<charT,valueT>* current_node,stringT& current_key,filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const { + void tst<charT,valueT,storageT,serializerT,stringT>::walk_recurse(tst_node<charT,valueT>* current_node,stringT& current_key,tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const { int other_index; other_index=current_node->left; @@ -957,7 +957,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, /**************************** prefix_match *************************************/ template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - valueT tst<charT,valueT,storageT,serializerT,stringT>::prefix_match(const stringT & string,filter<charT,valueT,stringT>* filter,action<charT,valueT,stringT>* to_perform) const { + valueT tst<charT,valueT,storageT,serializerT,stringT>::prefix_match(const stringT & string,tst_filter<charT,valueT,stringT>* filter,tst_action<charT,valueT,stringT>* to_perform) const { stringT current_key; size_t position=0; @@ -1023,7 +1023,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, #ifdef SCANNER template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - valueT tst<charT,valueT,storageT,serializerT,stringT>::scan(const stringT & string,action<charT,valueT,stringT>* to_perform) { + valueT tst<charT,valueT,storageT,serializerT,stringT>::scan(const stringT & string,tst_action<charT,valueT,stringT>* to_perform) { // Le premier caractère de la chaine ne correspondant pas à un match size_t si_non_match_start=0; // Le noeud pour lequel on a enregistré un match (noeud avec un objet associé) @@ -1200,7 +1200,7 @@ template<typename charT,typename valueT,typename storageT,typename serializerT, } template<typename charT,typename valueT,typename storageT,typename serializerT, typename stringT> - valueT tst<charT,valueT,storageT,serializerT,stringT>::scan_with_stop_chars(const stringT & string,const stringT& stop_chars,action<charT,valueT,stringT>* to_perform) const { + valueT tst<charT,valueT,storageT,serializerT,stringT>::scan_with_stop_chars(const stringT & string,const stringT& stop_chars,tst_action<charT,valueT,stringT>* to_perform) const { // Le premier caractère de la chaine ne correspondant pas à un match size_t si_non_match_start=0; // Le noeud pour lequel on a enregistré un match (noeud avec un objet associé) include/tst.h @@ -71,9 +71,9 @@ private: JNIEnv* jenv; }; -class ObjectAction : public action<jchar,jobject> { +class ObjectAction : public tst_action<jchar,jobject> { public: - ObjectAction(jobject target,char *perform,char* result,JNIEnv* jenv) : action<jchar,jobject>() { + ObjectAction(jobject target,char *perform,char* result,JNIEnv* jenv) : tst_action<jchar,jobject>() { this->jenv=jenv; this->target=jenv->NewGlobalRef(target); jclass clazz = jenv->GetObjectClass(this->target); @@ -180,9 +180,9 @@ public: } }; -class LongAction : public action<jchar,jlong> { +class LongAction : public tst_action<jchar,jlong> { public: - LongAction(jobject target,char *perform,char* result,JNIEnv* jenv) : action<jchar,jlong>() { + LongAction(jobject target,char *perform,char* result,JNIEnv* jenv) : tst_action<jchar,jlong>() { this->jenv=jenv; this->target=jenv->NewGlobalRef(target); jclass clazz = jenv->GetObjectClass(this->target); java/javaTST.h @@ -413,14 +413,14 @@ JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectTST_1walk(JNIEnv *j jobject jresult = 0 ; tst<jchar,jobject,ObjectMemoryStorage > *arg1 = (tst<jchar,jobject,ObjectMemoryStorage > *) 0 ; filter<jchar,jobject > *arg2 = (filter<jchar,jobject > *) 0 ; - action<jchar,jobject > *arg3 = (action<jchar,jobject > *) 0 ; + tst_action<jchar,jobject > *arg3 = (tst_action<jchar,jobject > *) 0 ; jobject result; (void)jenv; (void)jcls; arg1 = *(tst<jchar,jobject,ObjectMemoryStorage > **)&jarg1; arg2 = *(filter<jchar,jobject > **)&jarg2; - arg3 = *(action<jchar,jobject > **)&jarg3; + arg3 = *(tst_action<jchar,jobject > **)&jarg3; result = (arg1)->walk(arg2,arg3); jresult = result; @@ -435,7 +435,7 @@ JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectTST_1almost(JNIEnv int arg3 ; int arg4 ; filter<jchar,jobject > *arg5 = (filter<jchar,jobject > *) 0 ; - action<jchar,jobject > *arg6 = (action<jchar,jobject > *) 0 ; + tst_action<jchar,jobject > *arg6 = (tst_action<jchar,jobject > *) 0 ; jobject result; (void)jenv; @@ -451,7 +451,7 @@ JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectTST_1almost(JNIEnv } arg4 = (int)jarg4; arg5 = *(filter<jchar,jobject > **)&jarg5; - arg6 = *(action<jchar,jobject > **)&jarg6; + arg6 = *(tst_action<jchar,jobject > **)&jarg6; result = (arg1)->almost(arg2,arg3,arg4,arg5,arg6); jresult = result; @@ -468,7 +468,7 @@ JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectTST_1common_1prefix jchar *arg2 = (jchar *) 0 ; int arg3 ; filter<jchar,jobject > *arg4 = (filter<jchar,jobject > *) 0 ; - action<jchar,jobject > *arg5 = (action<jchar,jobject > *) 0 ; + tst_action<jchar,jobject > *arg5 = (tst_action<jchar,jobject > *) 0 ; jobject result; (void)jenv; @@ -483,7 +483,7 @@ JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectTST_1common_1prefix } } arg4 = *(filter<jchar,jobject > **)&jarg4; - arg5 = *(action<jchar,jobject > **)&jarg5; + arg5 = *(tst_action<jchar,jobject > **)&jarg5; result = (arg1)->common_prefix(arg2,arg3,arg4,arg5); jresult = result; @@ -641,7 +641,7 @@ JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectTST_1scan(JNIEnv *j tst<jchar,jobject,ObjectMemoryStorage > *arg1 = (tst<jchar,jobject,ObjectMemoryStorage > *) 0 ; jchar *arg2 = (jchar *) 0 ; int arg3 ; - action<jchar,jobject > *arg4 = (action<jchar,jobject > *) 0 ; + tst_action<jchar,jobject > *arg4 = (tst_action<jchar,jobject > *) 0 ; jobject result; (void)jenv; @@ -655,7 +655,7 @@ JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectTST_1scan(JNIEnv *j arg3 = jenv->GetStringLength((jstring)jarg2); } } - arg4 = *(action<jchar,jobject > **)&jarg4; + arg4 = *(tst_action<jchar,jobject > **)&jarg4; result = (arg1)->scan(arg2,arg3,arg4); jresult = result; @@ -673,7 +673,7 @@ JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectTST_1scan_1with_1st int arg3 ; jchar *arg4 = (jchar *) 0 ; int arg5 ; - action<jchar,jobject > *arg6 = (action<jchar,jobject > *) 0 ; + tst_action<jchar,jobject > *arg6 = (tst_action<jchar,jobject > *) 0 ; jobject result; (void)jenv; @@ -695,7 +695,7 @@ JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectTST_1scan_1with_1st arg5 = jenv->GetStringLength((jstring)jarg4); } } - arg6 = *(action<jchar,jobject > **)&jarg6; + arg6 = *(tst_action<jchar,jobject > **)&jarg6; result = (arg1)->scan_with_stop_chars(arg2,arg3,arg4,arg5,arg6); jresult = result; @@ -710,18 +710,18 @@ JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectTST_1scan_1with_1st JNIEXPORT void JNICALL Java_com_lehuen_tst_tstJNI_delete_1_1ObjectAction(JNIEnv *jenv, jclass jcls, jlong jarg1) { - action<jchar,jobject > *arg1 = (action<jchar,jobject > *) 0 ; + tst_action<jchar,jobject > *arg1 = (tst_action<jchar,jobject > *) 0 ; (void)jenv; (void)jcls; - arg1 = *(action<jchar,jobject > **)&jarg1; + arg1 = *(tst_action<jchar,jobject > **)&jarg1; delete arg1; } JNIEXPORT void JNICALL Java_com_lehuen_tst_tstJNI__1ObjectAction_1perform(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2, jint jarg4, jobject jarg5) { - action<jchar,jobject > *arg1 = (action<jchar,jobject > *) 0 ; + tst_action<jchar,jobject > *arg1 = (tst_action<jchar,jobject > *) 0 ; jchar *arg2 = (jchar *) 0 ; int arg3 ; int arg4 ; @@ -729,7 +729,7 @@ JNIEXPORT void JNICALL Java_com_lehuen_tst_tstJNI__1ObjectAction_1perform(JNIEnv (void)jenv; (void)jcls; - arg1 = *(action<jchar,jobject > **)&jarg1; + arg1 = *(tst_action<jchar,jobject > **)&jarg1; { arg2 = 0; if (jarg2) { @@ -750,12 +750,12 @@ JNIEXPORT void JNICALL Java_com_lehuen_tst_tstJNI__1ObjectAction_1perform(JNIEnv JNIEXPORT jobject JNICALL Java_com_lehuen_tst_tstJNI__1ObjectAction_1result(JNIEnv *jenv, jclass jcls, jlong jarg1) { jobject jresult = 0 ; - action<jchar,jobject > *arg1 = (action<jchar,jobject > *) 0 ; + tst_action<jchar,jobject > *arg1 = (tst_action<jchar,jobject > *) 0 ; jobject result; (void)jenv; (void)jcls; - arg1 = *(action<jchar,jobject > **)&jarg1; + arg1 = *(tst_action<jchar,jobject > **)&jarg1; result = (arg1)->result(); jresult = result; @@ -1054,14 +1054,14 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongTST_1walk(JNIEnv *jenv, jlong jresult = 0 ; tst<jchar,jlong,java_long_memory_storage > *arg1 = (tst<jchar,jlong,java_long_memory_storage > *) 0 ; filter<jchar,jlong > *arg2 = (filter<jchar,jlong > *) 0 ; - action<jchar,jlong > *arg3 = (action<jchar,jlong > *) 0 ; + tst_action<jchar,jlong > *arg3 = (tst_action<jchar,jlong > *) 0 ; jlong result; (void)jenv; (void)jcls; arg1 = *(tst<jchar,jlong,java_long_memory_storage > **)&jarg1; arg2 = *(filter<jchar,jlong > **)&jarg2; - arg3 = *(action<jchar,jlong > **)&jarg3; + arg3 = *(tst_action<jchar,jlong > **)&jarg3; result = (arg1)->walk(arg2,arg3); jresult = result; @@ -1076,7 +1076,7 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongTST_1almost(JNIEnv *jen int arg3 ; int arg4 ; filter<jchar,jlong > *arg5 = (filter<jchar,jlong > *) 0 ; - action<jchar,jlong > *arg6 = (action<jchar,jlong > *) 0 ; + tst_action<jchar,jlong > *arg6 = (tst_action<jchar,jlong > *) 0 ; jlong result; (void)jenv; @@ -1092,7 +1092,7 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongTST_1almost(JNIEnv *jen } arg4 = (int)jarg4; arg5 = *(filter<jchar,jlong > **)&jarg5; - arg6 = *(action<jchar,jlong > **)&jarg6; + arg6 = *(tst_action<jchar,jlong > **)&jarg6; result = (arg1)->almost(arg2,arg3,arg4,arg5,arg6); jresult = result; @@ -1109,7 +1109,7 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongTST_1common_1prefix(JNI jchar *arg2 = (jchar *) 0 ; int arg3 ; filter<jchar,jlong > *arg4 = (filter<jchar,jlong > *) 0 ; - action<jchar,jlong > *arg5 = (action<jchar,jlong > *) 0 ; + tst_action<jchar,jlong > *arg5 = (tst_action<jchar,jlong > *) 0 ; jlong result; (void)jenv; @@ -1124,7 +1124,7 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongTST_1common_1prefix(JNI } } arg4 = *(filter<jchar,jlong > **)&jarg4; - arg5 = *(action<jchar,jlong > **)&jarg5; + arg5 = *(tst_action<jchar,jlong > **)&jarg5; result = (arg1)->common_prefix(arg2,arg3,arg4,arg5); jresult = result; @@ -1282,7 +1282,7 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongTST_1scan(JNIEnv *jenv, tst<jchar,jlong,java_long_memory_storage > *arg1 = (tst<jchar,jlong,java_long_memory_storage > *) 0 ; jchar *arg2 = (jchar *) 0 ; int arg3 ; - action<jchar,jlong > *arg4 = (action<jchar,jlong > *) 0 ; + tst_action<jchar,jlong > *arg4 = (tst_action<jchar,jlong > *) 0 ; jlong result; (void)jenv; @@ -1296,7 +1296,7 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongTST_1scan(JNIEnv *jenv, arg3 = jenv->GetStringLength((jstring)jarg2); } } - arg4 = *(action<jchar,jlong > **)&jarg4; + arg4 = *(tst_action<jchar,jlong > **)&jarg4; result = (arg1)->scan(arg2,arg3,arg4); jresult = result; @@ -1314,7 +1314,7 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongTST_1scan_1with_1stop_1 int arg3 ; jchar *arg4 = (jchar *) 0 ; int arg5 ; - action<jchar,jlong > *arg6 = (action<jchar,jlong > *) 0 ; + tst_action<jchar,jlong > *arg6 = (tst_action<jchar,jlong > *) 0 ; jlong result; (void)jenv; @@ -1336,7 +1336,7 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongTST_1scan_1with_1stop_1 arg5 = jenv->GetStringLength((jstring)jarg4); } } - arg6 = *(action<jchar,jlong > **)&jarg6; + arg6 = *(tst_action<jchar,jlong > **)&jarg6; result = (arg1)->scan_with_stop_chars(arg2,arg3,arg4,arg5,arg6); jresult = result; @@ -1351,18 +1351,18 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongTST_1scan_1with_1stop_1 JNIEXPORT void JNICALL Java_com_lehuen_tst_tstJNI_delete_1_1LongAction(JNIEnv *jenv, jclass jcls, jlong jarg1) { - action<jchar,jlong > *arg1 = (action<jchar,jlong > *) 0 ; + tst_action<jchar,jlong > *arg1 = (tst_action<jchar,jlong > *) 0 ; (void)jenv; (void)jcls; - arg1 = *(action<jchar,jlong > **)&jarg1; + arg1 = *(tst_action<jchar,jlong > **)&jarg1; delete arg1; } JNIEXPORT void JNICALL Java_com_lehuen_tst_tstJNI__1LongAction_1perform(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2, jint jarg4, jlong jarg5) { - action<jchar,jlong > *arg1 = (action<jchar,jlong > *) 0 ; + tst_action<jchar,jlong > *arg1 = (tst_action<jchar,jlong > *) 0 ; jchar *arg2 = (jchar *) 0 ; int arg3 ; int arg4 ; @@ -1370,7 +1370,7 @@ JNIEXPORT void JNICALL Java_com_lehuen_tst_tstJNI__1LongAction_1perform(JNIEnv * (void)jenv; (void)jcls; - arg1 = *(action<jchar,jlong > **)&jarg1; + arg1 = *(tst_action<jchar,jlong > **)&jarg1; { arg2 = 0; if (jarg2) { @@ -1391,12 +1391,12 @@ JNIEXPORT void JNICALL Java_com_lehuen_tst_tstJNI__1LongAction_1perform(JNIEnv * JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI__1LongAction_1result(JNIEnv *jenv, jclass jcls, jlong jarg1) { jlong jresult = 0 ; - action<jchar,jlong > *arg1 = (action<jchar,jlong > *) 0 ; + tst_action<jchar,jlong > *arg1 = (tst_action<jchar,jlong > *) 0 ; jlong result; (void)jenv; (void)jcls; - arg1 = *(action<jchar,jlong > **)&jarg1; + arg1 = *(tst_action<jchar,jlong > **)&jarg1; result = (arg1)->result(); jresult = result; @@ -2057,7 +2057,7 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI_SWIGObjectActionUpcast(JNIEnv jlong baseptr = 0; (void)jenv; (void)jcls; - *(action<jchar,jobject > **)&baseptr = *(ObjectAction **)&jarg1; + *(tst_action<jchar,jobject > **)&baseptr = *(ObjectAction **)&jarg1; return baseptr; } @@ -2089,7 +2089,7 @@ JNIEXPORT jlong JNICALL Java_com_lehuen_tst_tstJNI_SWIGLongActionUpcast(JNIEnv * jlong baseptr = 0; (void)jenv; (void)jcls; - *(action<jchar,jlong > **)&baseptr = *(LongAction **)&jarg1; + *(tst_action<jchar,jlong > **)&baseptr = *(LongAction **)&jarg1; return baseptr; } java/tstjava_wrap.cxx @@ -33,7 +33,7 @@ typedef qad_string<char> string_type; -class CallableAction : public action<char,PythonReference,string_type > { +class CallableAction : public tst_action<char,PythonReference,string_type > { public: CallableAction(PythonReference perform,PythonReference result) : _perform(perform), _result(result) { } @@ -62,7 +62,7 @@ private: PythonReference _perform,_result; }; -class CallableFilter : public filter<char,PythonReference,string_type > { +class CallableFilter : public tst_filter<char,PythonReference,string_type > { public: CallableFilter(PythonReference _callable) : callable(_callable) { } @@ -79,7 +79,7 @@ private: PythonReference callable; }; -class DictAction : public action<char,PythonReference,string_type > { +class DictAction : public tst_action<char,PythonReference,string_type > { public: DictAction() : dict(PyDict_New(),0) { } @@ -110,7 +110,7 @@ private: PythonReference dict; }; -class ListAction : public action<char,PythonReference,string_type > { +class ListAction : public tst_action<char,PythonReference,string_type > { public: ListAction() : list(PyList_New(0),0) { } @@ -130,7 +130,7 @@ private: PythonReference list; }; -class TupleListAction : public action<char,PythonReference,string_type > { +class TupleListAction : public tst_action<char,PythonReference,string_type > { public: TupleListAction() : list(PyList_New(0),0){ } python/pythonTST.h @@ -3061,8 +3061,8 @@ fail: SWIGINTERN PyObject *_wrap__TST_walk__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *arg1 = (tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *) 0 ; - filter<char,PythonReference,string_type > *arg2 = (filter<char,PythonReference,string_type > *) 0 ; - action<char,PythonReference,string_type > *arg3 = (action<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg2 = (tst_filter<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg3 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -3079,14 +3079,14 @@ SWIGINTERN PyObject *_wrap__TST_walk__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int arg1 = reinterpret_cast< tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > * >(argp1); res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "_TST_walk" "', argument " "2"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "_TST_walk" "', argument " "2"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg2 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp2); + arg2 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp2); res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_walk" "', argument " "3"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_walk" "', argument " "3"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg3 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp3); + arg3 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp3); { try { result = ((tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > const *)arg1)->walk(arg2,arg3); @@ -3107,8 +3107,8 @@ fail: SWIGINTERN PyObject *_wrap__TST_walk__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *arg1 = (tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *) 0 ; - filter<char,PythonReference,string_type > *arg2 = (filter<char,PythonReference,string_type > *) 0 ; - action<char,PythonReference,string_type > *arg3 = (action<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg2 = (tst_filter<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg3 = (tst_action<char,PythonReference,string_type > *) 0 ; string_type *arg4 = 0 ; PythonReference result; void *argp1 = 0 ; @@ -3126,14 +3126,14 @@ SWIGINTERN PyObject *_wrap__TST_walk__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int arg1 = reinterpret_cast< tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > * >(argp1); res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "_TST_walk" "', argument " "2"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "_TST_walk" "', argument " "2"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg2 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp2); + arg2 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp2); res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_walk" "', argument " "3"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_walk" "', argument " "3"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg3 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp3); + arg3 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp3); { char* buffer; int size; @@ -3187,8 +3187,8 @@ SWIGINTERN PyObject *_wrap__TST_close_match(PyObject *SWIGUNUSEDPARM(self), PyOb tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *arg1 = (tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *) 0 ; string_type *arg2 = 0 ; int arg3 ; - filter<char,PythonReference,string_type > *arg4 = (filter<char,PythonReference,string_type > *) 0 ; - action<char,PythonReference,string_type > *arg5 = (action<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg4 = (tst_filter<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg5 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -3219,14 +3219,14 @@ SWIGINTERN PyObject *_wrap__TST_close_match(PyObject *SWIGUNUSEDPARM(self), PyOb arg3 = static_cast< int >(val3); res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "_TST_close_match" "', argument " "4"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "_TST_close_match" "', argument " "4"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg4 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp4); + arg4 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp4); res5 = SWIG_ConvertPtr(swig_obj[4], &argp5,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "_TST_close_match" "', argument " "5"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "_TST_close_match" "', argument " "5"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg5 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp5); + arg5 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp5); { try { result = ((tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > const *)arg1)->close_match((string_type const &)*arg2,arg3,arg4,arg5); @@ -3254,8 +3254,8 @@ SWIGINTERN PyObject *_wrap__TST_prefix_match(PyObject *SWIGUNUSEDPARM(self), PyO PyObject *resultobj = 0; tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *arg1 = (tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *) 0 ; string_type *arg2 = 0 ; - filter<char,PythonReference,string_type > *arg3 = (filter<char,PythonReference,string_type > *) 0 ; - action<char,PythonReference,string_type > *arg4 = (action<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg3 = (tst_filter<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg4 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -3279,14 +3279,14 @@ SWIGINTERN PyObject *_wrap__TST_prefix_match(PyObject *SWIGUNUSEDPARM(self), PyO } res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_prefix_match" "', argument " "3"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_prefix_match" "', argument " "3"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg3 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp3); + arg3 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp3); res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "_TST_prefix_match" "', argument " "4"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "_TST_prefix_match" "', argument " "4"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg4 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp4); + arg4 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp4); { try { result = ((tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > const *)arg1)->prefix_match((string_type const &)*arg2,arg3,arg4); @@ -3314,8 +3314,8 @@ SWIGINTERN PyObject *_wrap__TST_match(PyObject *SWIGUNUSEDPARM(self), PyObject * PyObject *resultobj = 0; tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *arg1 = (tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *) 0 ; string_type *arg2 = 0 ; - filter<char,PythonReference,string_type > *arg3 = (filter<char,PythonReference,string_type > *) 0 ; - action<char,PythonReference,string_type > *arg4 = (action<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg3 = (tst_filter<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg4 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -3339,14 +3339,14 @@ SWIGINTERN PyObject *_wrap__TST_match(PyObject *SWIGUNUSEDPARM(self), PyObject * } res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_match" "', argument " "3"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_match" "', argument " "3"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg3 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp3); + arg3 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp3); res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "_TST_match" "', argument " "4"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "_TST_match" "', argument " "4"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg4 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp4); + arg4 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp4); { try { result = ((tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > const *)arg1)->match((string_type const &)*arg2,arg3,arg4); @@ -3418,7 +3418,7 @@ SWIGINTERN PyObject *_wrap__TST_get_or_build(PyObject *SWIGUNUSEDPARM(self), PyO PyObject *resultobj = 0; tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *arg1 = (tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *) 0 ; string_type *arg2 = 0 ; - filter<char,PythonReference,string_type > *arg3 = (filter<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg3 = (tst_filter<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -3440,9 +3440,9 @@ SWIGINTERN PyObject *_wrap__TST_get_or_build(PyObject *SWIGUNUSEDPARM(self), PyO } res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_get_or_build" "', argument " "3"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_get_or_build" "', argument " "3"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg3 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp3); + arg3 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp3); { try { result = (arg1)->get_or_build((string_type const &)*arg2,arg3); @@ -3879,7 +3879,7 @@ SWIGINTERN PyObject *_wrap__TST_scan(PyObject *SWIGUNUSEDPARM(self), PyObject *a PyObject *resultobj = 0; tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *arg1 = (tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *) 0 ; string_type *arg2 = 0 ; - action<char,PythonReference,string_type > *arg3 = (action<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg3 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -3901,9 +3901,9 @@ SWIGINTERN PyObject *_wrap__TST_scan(PyObject *SWIGUNUSEDPARM(self), PyObject *a } res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_scan" "', argument " "3"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "_TST_scan" "', argument " "3"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg3 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp3); + arg3 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp3); { try { result = (arg1)->scan((string_type const &)*arg2,arg3); @@ -3932,7 +3932,7 @@ SWIGINTERN PyObject *_wrap__TST_scan_with_stop_chars(PyObject *SWIGUNUSEDPARM(se tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *arg1 = (tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *) 0 ; string_type *arg2 = 0 ; string_type *arg3 = 0 ; - action<char,PythonReference,string_type > *arg4 = (action<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg4 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -3960,9 +3960,9 @@ SWIGINTERN PyObject *_wrap__TST_scan_with_stop_chars(PyObject *SWIGUNUSEDPARM(se } res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "_TST_scan_with_stop_chars" "', argument " "4"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "_TST_scan_with_stop_chars" "', argument " "4"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg4 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp4); + arg4 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp4); { try { result = ((tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > const *)arg1)->scan_with_stop_chars((string_type const &)*arg2,(string_type const &)*arg3,arg4); @@ -4005,7 +4005,7 @@ SWIGINTERN PyObject *_TST_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *arg SWIGINTERN PyObject *_wrap_delete__Action(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - action<char,PythonReference,string_type > *arg1 = (action<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg1 = (tst_action<char,PythonReference,string_type > *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -4014,9 +4014,9 @@ SWIGINTERN PyObject *_wrap_delete__Action(PyObject *SWIGUNUSEDPARM(self), PyObje swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete__Action" "', argument " "1"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete__Action" "', argument " "1"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg1 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp1); + arg1 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp1); { try { delete arg1; @@ -4034,7 +4034,7 @@ fail: SWIGINTERN PyObject *_wrap__Action_perform(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - action<char,PythonReference,string_type > *arg1 = (action<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg1 = (tst_action<char,PythonReference,string_type > *) 0 ; string_type *arg2 = 0 ; int arg3 ; PythonReference arg4 ; @@ -4047,9 +4047,9 @@ SWIGINTERN PyObject *_wrap__Action_perform(PyObject *SWIGUNUSEDPARM(self), PyObj if (!SWIG_Python_UnpackTuple(args,"_Action_perform",4,4,swig_obj)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "_Action_perform" "', argument " "1"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "_Action_perform" "', argument " "1"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg1 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp1); + arg1 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp1); { char* buffer; int size; @@ -4087,7 +4087,7 @@ fail: SWIGINTERN PyObject *_wrap__Action_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - action<char,PythonReference,string_type > *arg1 = (action<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg1 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -4097,9 +4097,9 @@ SWIGINTERN PyObject *_wrap__Action_result(PyObject *SWIGUNUSEDPARM(self), PyObje swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "_Action_result" "', argument " "1"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "_Action_result" "', argument " "1"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg1 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp1); + arg1 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp1); { try { result = (arg1)->result(); @@ -4126,7 +4126,7 @@ SWIGINTERN PyObject *_Action_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObje SWIGINTERN PyObject *_wrap_delete__Filter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - filter<char,PythonReference,string_type > *arg1 = (filter<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg1 = (tst_filter<char,PythonReference,string_type > *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -4135,9 +4135,9 @@ SWIGINTERN PyObject *_wrap_delete__Filter(PyObject *SWIGUNUSEDPARM(self), PyObje swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, SWIG_POINTER_DISOWN | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete__Filter" "', argument " "1"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete__Filter" "', argument " "1"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg1 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp1); + arg1 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp1); { try { delete arg1; @@ -4155,7 +4155,7 @@ fail: SWIGINTERN PyObject *_wrap__Filter_perform(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; - filter<char,PythonReference,string_type > *arg1 = (filter<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg1 = (tst_filter<char,PythonReference,string_type > *) 0 ; string_type *arg2 = 0 ; int arg3 ; PythonReference arg4 ; @@ -4169,9 +4169,9 @@ SWIGINTERN PyObject *_wrap__Filter_perform(PyObject *SWIGUNUSEDPARM(self), PyObj if (!SWIG_Python_UnpackTuple(args,"_Filter_perform",4,4,swig_obj)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "_Filter_perform" "', argument " "1"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "_Filter_perform" "', argument " "1"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg1 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp1); + arg1 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp1); { char* buffer; int size; @@ -5264,8 +5264,8 @@ fail: SWIGINTERN PyObject *_wrap_TST_walk__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; TST *arg1 = (TST *) 0 ; - filter<char,PythonReference,string_type > *arg2 = (filter<char,PythonReference,string_type > *) 0 ; - action<char,PythonReference,string_type > *arg3 = (action<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg2 = (tst_filter<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg3 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -5282,14 +5282,14 @@ SWIGINTERN PyObject *_wrap_TST_walk__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int arg1 = reinterpret_cast< TST * >(argp1); res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TST_walk" "', argument " "2"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TST_walk" "', argument " "2"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg2 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp2); + arg2 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp2); res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TST_walk" "', argument " "3"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TST_walk" "', argument " "3"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg3 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp3); + arg3 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp3); { try { result = ((TST const *)arg1)->walk(arg2,arg3); @@ -5310,8 +5310,8 @@ fail: SWIGINTERN PyObject *_wrap_TST_walk__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; TST *arg1 = (TST *) 0 ; - filter<char,PythonReference,string_type > *arg2 = (filter<char,PythonReference,string_type > *) 0 ; - action<char,PythonReference,string_type > *arg3 = (action<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg2 = (tst_filter<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg3 = (tst_action<char,PythonReference,string_type > *) 0 ; string_type *arg4 = 0 ; PythonReference result; void *argp1 = 0 ; @@ -5329,14 +5329,14 @@ SWIGINTERN PyObject *_wrap_TST_walk__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int arg1 = reinterpret_cast< TST * >(argp1); res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TST_walk" "', argument " "2"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TST_walk" "', argument " "2"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg2 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp2); + arg2 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp2); res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TST_walk" "', argument " "3"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TST_walk" "', argument " "3"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg3 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp3); + arg3 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp3); { char* buffer; int size; @@ -5390,8 +5390,8 @@ SWIGINTERN PyObject *_wrap_TST_close_match(PyObject *SWIGUNUSEDPARM(self), PyObj TST *arg1 = (TST *) 0 ; string_type *arg2 = 0 ; int arg3 ; - filter<char,PythonReference,string_type > *arg4 = (filter<char,PythonReference,string_type > *) 0 ; - action<char,PythonReference,string_type > *arg5 = (action<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg4 = (tst_filter<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg5 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -5422,14 +5422,14 @@ SWIGINTERN PyObject *_wrap_TST_close_match(PyObject *SWIGUNUSEDPARM(self), PyObj arg3 = static_cast< int >(val3); res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "TST_close_match" "', argument " "4"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "TST_close_match" "', argument " "4"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg4 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp4); + arg4 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp4); res5 = SWIG_ConvertPtr(swig_obj[4], &argp5,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "TST_close_match" "', argument " "5"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "TST_close_match" "', argument " "5"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg5 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp5); + arg5 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp5); { try { result = ((TST const *)arg1)->close_match((string_type const &)*arg2,arg3,arg4,arg5); @@ -5457,8 +5457,8 @@ SWIGINTERN PyObject *_wrap_TST_match(PyObject *SWIGUNUSEDPARM(self), PyObject *a PyObject *resultobj = 0; TST *arg1 = (TST *) 0 ; string_type *arg2 = 0 ; - filter<char,PythonReference,string_type > *arg3 = (filter<char,PythonReference,string_type > *) 0 ; - action<char,PythonReference,string_type > *arg4 = (action<char,PythonReference,string_type > *) 0 ; + tst_filter<char,PythonReference,string_type > *arg3 = (tst_filter<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg4 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -5482,14 +5482,14 @@ SWIGINTERN PyObject *_wrap_TST_match(PyObject *SWIGUNUSEDPARM(self), PyObject *a } res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_filterTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TST_match" "', argument " "3"" of type '" "filter<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TST_match" "', argument " "3"" of type '" "tst_filter<char,PythonReference,string_type > *""'"); } - arg3 = reinterpret_cast< filter<char,PythonReference,string_type > * >(argp3); + arg3 = reinterpret_cast< tst_filter<char,PythonReference,string_type > * >(argp3); res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "TST_match" "', argument " "4"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "TST_match" "', argument " "4"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg4 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp4); + arg4 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp4); { try { result = ((TST const *)arg1)->match((string_type const &)*arg2,arg3,arg4); @@ -5517,7 +5517,7 @@ SWIGINTERN PyObject *_wrap_TST_scan(PyObject *SWIGUNUSEDPARM(self), PyObject *ar PyObject *resultobj = 0; TST *arg1 = (TST *) 0 ; string_type *arg2 = 0 ; - action<char,PythonReference,string_type > *arg3 = (action<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg3 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -5539,9 +5539,9 @@ SWIGINTERN PyObject *_wrap_TST_scan(PyObject *SWIGUNUSEDPARM(self), PyObject *ar } res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TST_scan" "', argument " "3"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TST_scan" "', argument " "3"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg3 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp3); + arg3 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp3); { try { result = (arg1)->scan((string_type const &)*arg2,arg3); @@ -5570,7 +5570,7 @@ SWIGINTERN PyObject *_wrap_TST_scan_with_stop_chars(PyObject *SWIGUNUSEDPARM(sel TST *arg1 = (TST *) 0 ; string_type *arg2 = 0 ; string_type *arg3 = 0 ; - action<char,PythonReference,string_type > *arg4 = (action<char,PythonReference,string_type > *) 0 ; + tst_action<char,PythonReference,string_type > *arg4 = (tst_action<char,PythonReference,string_type > *) 0 ; PythonReference result; void *argp1 = 0 ; int res1 = 0 ; @@ -5598,9 +5598,9 @@ SWIGINTERN PyObject *_wrap_TST_scan_with_stop_chars(PyObject *SWIGUNUSEDPARM(sel } res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_actionTchar_PythonReference_string_type_t, 0 | 0 ); if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "TST_scan_with_stop_chars" "', argument " "4"" of type '" "action<char,PythonReference,string_type > *""'"); + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "TST_scan_with_stop_chars" "', argument " "4"" of type '" "tst_action<char,PythonReference,string_type > *""'"); } - arg4 = reinterpret_cast< action<char,PythonReference,string_type > * >(argp4); + arg4 = reinterpret_cast< tst_action<char,PythonReference,string_type > * >(argp4); { try { result = ((TST const *)arg1)->scan_with_stop_chars((string_type const &)*arg2,(string_type const &)*arg3,arg4); @@ -6184,19 +6184,19 @@ static PyMethodDef SwigMethods[] = { /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ static void *_p_CallableFilterTo_p_filterTchar_PythonReference_string_type_t(void *x) { - return (void *)((filter<char,PythonReference,string_type > *) ((CallableFilter *) x)); + return (void *)((tst_filter<char,PythonReference,string_type > *) ((CallableFilter *) x)); } static void *_p_DictActionTo_p_actionTchar_PythonReference_string_type_t(void *x) { - return (void *)((action<char,PythonReference,string_type > *) ((DictAction *) x)); + return (void *)((tst_action<char,PythonReference,string_type > *) ((DictAction *) x)); } static void *_p_ListActionTo_p_actionTchar_PythonReference_string_type_t(void *x) { - return (void *)((action<char,PythonReference,string_type > *) ((ListAction *) x)); + return (void *)((tst_action<char,PythonReference,string_type > *) ((ListAction *) x)); } static void *_p_TupleListActionTo_p_actionTchar_PythonReference_string_type_t(void *x) { - return (void *)((action<char,PythonReference,string_type > *) ((TupleListAction *) x)); + return (void *)((tst_action<char,PythonReference,string_type > *) ((TupleListAction *) x)); } static void *_p_CallableActionTo_p_actionTchar_PythonReference_string_type_t(void *x) { - return (void *)((action<char,PythonReference,string_type > *) ((CallableAction *) x)); + return (void *)((tst_action<char,PythonReference,string_type > *) ((CallableAction *) x)); } static void *_p_TSTTo_p_tstTchar_PythonReference_memory_storageTchar_PythonReference_t_ObjectSerializer_string_type_t(void *x) { return (void *)((tst<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *) ((TST *) x)); @@ -6212,10 +6212,10 @@ static swig_type_info _swigt__p_TSTException = {"_p_TSTException", "TSTException static swig_type_info _swigt__p_TSTIteratorTlexical_iteratorTchar_PythonReference_memory_storageTchar_PythonReference_t_ObjectSerializer_string_type_t_t = {"_p_TSTIteratorTlexical_iteratorTchar_PythonReference_memory_storageTchar_PythonReference_t_ObjectSerializer_string_type_t_t", "TSTIterator<lexical_iterator<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,qad_string<char > > > *|TSTIterator<lexical_iterator<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_TSTIteratorTmatch_iteratorTchar_PythonReference_memory_storageTchar_PythonReference_t_ObjectSerializer_string_type_t_t = {"_p_TSTIteratorTmatch_iteratorTchar_PythonReference_memory_storageTchar_PythonReference_t_ObjectSerializer_string_type_t_t", "TSTIterator<match_iterator<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,qad_string<char > > > *|TSTIterator<match_iterator<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_TupleListAction = {"_p_TupleListAction", "TupleListAction *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_actionTchar_PythonReference_string_type_t = {"_p_actionTchar_PythonReference_string_type_t", "action<char,PythonReference,string_type > *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_actionTchar_PythonReference_string_type_t = {"_p_actionTchar_PythonReference_string_type_t", "tst_action<char,PythonReference,string_type > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_character_type = {"_p_character_type", "character_type *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_filterTchar_PythonReference_string_type_t = {"_p_filterTchar_PythonReference_string_type_t", "filter<char,PythonReference,string_type > *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_filterTchar_PythonReference_string_type_t = {"_p_filterTchar_PythonReference_string_type_t", "tst_filter<char,PythonReference,string_type > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_lexical_iteratorTchar_PythonReference_memory_storageTchar_PythonReference_t_ObjectSerializer_qad_stringTchar_t_t = {"_p_lexical_iteratorTchar_PythonReference_memory_storageTchar_PythonReference_t_ObjectSerializer_qad_stringTchar_t_t", "lexical_iterator<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,qad_string<char > > *|lexical_iterator<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_match_iteratorTchar_PythonReference_memory_storageTchar_PythonReference_t_ObjectSerializer_qad_stringTchar_t_t = {"_p_match_iteratorTchar_PythonReference_memory_storageTchar_PythonReference_t_ObjectSerializer_qad_stringTchar_t_t", "match_iterator<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,qad_string<char > > *|match_iterator<char,PythonReference,memory_storage<char,PythonReference >,ObjectSerializer,string_type > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_qad_stringTchar_t = {"_p_qad_stringTchar_t", "qad_string<char > *", 0, 0, (void*)0, 0}; python/tst_wrap.cxx @@ -32,7 +32,7 @@ using namespace boost::python; /********************* ACTION & FILTER ***********************************/ template <class S, class T, class string_type> -class NullAction : public action<S,T,string_type>, public wrapper< action<S,T,string_type> > { +class NullAction : public tst_action<S,T,string_type>, public wrapper< tst_action<S,T,string_type> > { public: void perform(const typename string_type & string,int remaining_distance,T data) { } @@ -44,7 +44,7 @@ class NullAction : public action<S,T,string_type>, public wrapper< action<S,T,st }; template <class S,class T, class string_type> -class DictAction : public action<S,T,string_type>, public wrapper< action<S,T,string_type> > { +class DictAction : public tst_action<S,T,string_type>, public wrapper< tst_action<S,T,string_type> > { public: void perform(const typename string_type & string,int remaining_distance,T data) { object r = result_dict.get(string); @@ -62,7 +62,7 @@ class DictAction : public action<S,T,string_type>, public wrapper< action<S,T,st }; template <class S,class T, class string_type> -class TupleListAction : public action<S,T,string_type>, public wrapper< action<S,T,string_type> > { +class TupleListAction : public tst_action<S,T,string_type>, public wrapper< tst_action<S,T,string_type> > { public: void perform(const typename string_type & string,int remaining_distance,T data) { result_list.append(make_tuple(string,remaining_distance,data)); @@ -77,7 +77,7 @@ class TupleListAction : public action<S,T,string_type>, public wrapper< action<S }; template <class S,class T, class string_type> -class ListAction : public action<S,T,string_type>, public wrapper< action<S,T,string_type> > { +class ListAction : public tst_action<S,T,string_type>, public wrapper< tst_action<S,T,string_type> > { public: void perform(const typename string_type & string,int remaining_distance,T data) { result_list.append(data); @@ -92,7 +92,7 @@ class ListAction : public action<S,T,string_type>, public wrapper< action<S,T,st }; template <class S,class T, class string_type> -class CallableAction : public action<S,T,string_type>, public wrapper< action<S,T,string_type> > { +class CallableAction : public tst_action<S,T,string_type>, public wrapper< tst_action<S,T,string_type> > { public: CallableAction(object perform, object result) : _perform(perform), @@ -252,11 +252,11 @@ class TST : public tst<char,object,memory_storage<char,object>,ObjectSerializer, // in.close(); } - object walk1(filter<char,object,std::basic_string<char> >* filter,action<char,object,std::basic_string<char> >* to_perform) const { + object walk1(filter<char,object,std::basic_string<char> >* filter,tst_action<char,object,std::basic_string<char> >* to_perform) const { return walk(filter,to_perform); } - object walk2(filter<char,object,std::basic_string<char> >* filter,action<char,object,std::basic_string<char> >* to_perform,const std::basic_string<char>& string) const { + object walk2(filter<char,object,std::basic_string<char> >* filter,tst_action<char,object,std::basic_string<char> >* to_perform,const std::basic_string<char>& string) const { return walk(filter,to_perform,string); } @@ -329,23 +329,23 @@ BOOST_PYTHON_MODULE(tst) .def("close_match_iterator",&TST::close_match_iterator) ; - class_< NullAction<char,object,std::basic_string<char> >, boost::noncopyable >("NullAction") + class_< Nulltst_action<char,object,std::basic_string<char> >, boost::noncopyable >("NullAction") ; - class_< DictAction<char,object,std::basic_string<char> >, boost::noncopyable >("DictAction") - .def("result", &DictAction<char,object,std::basic_string<char> >::result) + class_< Dicttst_action<char,object,std::basic_string<char> >, boost::noncopyable >("DictAction") + .def("result", &Dicttst_action<char,object,std::basic_string<char> >::result) ; - class_< TupleListAction<char,object,std::basic_string<char> >, boost::noncopyable >("TupleListAction") - .def("result", &TupleListAction<char,object,std::basic_string<char> >::result) + class_< TupleListtst_action<char,object,std::basic_string<char> >, boost::noncopyable >("TupleListAction") + .def("result", &TupleListtst_action<char,object,std::basic_string<char> >::result) ; - class_< ListAction<char,object,std::basic_string<char> >, boost::noncopyable >("ListAction") - .def("result", &ListAction<char,object,std::basic_string<char> >::result) + class_< Listtst_action<char,object,std::basic_string<char> >, boost::noncopyable >("ListAction") + .def("result", &Listtst_action<char,object,std::basic_string<char> >::result) ; - class_< CallableAction<char,object,std::basic_string<char> >, boost::noncopyable >("CallableAction",init<object,object>()) - .def("result", &CallableAction<char,object,std::basic_string<char> >::result) + class_< Callabletst_action<char,object,std::basic_string<char> >, boost::noncopyable >("CallableAction",init<object,object>()) + .def("result", &Callabletst_action<char,object,std::basic_string<char> >::result) ; class_< NullFilter<char,object,std::basic_string<char> >, boost::noncopyable >("NullFilter") python/with_boost/tst.cpp @@ -193,7 +193,7 @@ class textindex { typedef boost::basic_regex < character_type > regex_type; typedef boost::regex_iterator<typename string_type::const_iterator> regex_type_iterator; - class collector : public action< typename character_type, typename documents_scores_pointer, typename string_type> { + class collector : public tst_action< typename character_type, typename documents_scores_pointer, typename string_type> { public: collector(collector* _intersect=0) : intersect(_intersect), entries(new documents_scores_type(0)) { } @@ -223,7 +223,7 @@ class textindex { documents_scores_pointer entries; }; - class eraser : public action< typename character_type, typename documents_scores_pointer, typename string_type > { + class eraser : public tst_action< typename character_type, typename documents_scores_pointer, typename string_type > { public: eraser(document_id_type _document_id) : document_id(_document_id) { } @@ -240,7 +240,7 @@ class textindex { document_id_type document_id; }; - class cleaner : public action< typename character_type, typename documents_scores_pointer, typename string_type > { + class cleaner : public tst_action< typename character_type, typename documents_scores_pointer, typename string_type > { public: typedef boost::shared_ptr< std::vector< typename string_type > > result_type; @@ -265,7 +265,7 @@ class textindex { typename result_type empty_words; }; - class documents_scores_type_factory : public filter< character_type, documents_scores_pointer, typename string_type > { + class documents_scores_type_factory : public tst_filter< character_type, documents_scores_pointer, typename string_type > { public: virtual documents_scores_pointer perform(const typename string_type& string, int remaining_distance, typename documents_scores_pointer data) { return typename documents_scores_pointer(new documents_scores_type(0)); textindex/textindex.h textindex/textindex.pyd b092e109d5b2e5a3cade2cb2cbd99cdff84472f3 Nicolas Lehuen nicolas@lehuen.com http://github.com/nlehuen/pytst/commit/a44bf9387e16b5ac20bc77f10aa9869874353a7f a44bf9387e16b5ac20bc77f10aa9869874353a7f 2006-10-06T16:21:29-07:00 2006-10-06T16:21:29-07:00 Modifications pour que tout compile de Python 2.3 à Python 2.5. bd5aef8f7597975c7ce75cbf55a9e8e5e629cbd8 Nicolas Lehuen nicolas@lehuen.com