Skip to content

Commit

Permalink
Modifications pour que tout compile de Python 2.3 à Python 2.5.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nlehuen
nlehuen committed Oct 6, 2006
1 parent b092e10 commit a44bf93
Show file tree
Hide file tree
Showing 10 changed files with 187 additions and 187 deletions.
2 changes: 1 addition & 1 deletion c++/hello.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class stringserializer {
}
};

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; }
Expand Down
12 changes: 6 additions & 6 deletions include/fundamentals.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,19 @@ class node_info {
};

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;
};

Expand Down
52 changes: 26 additions & 26 deletions include/tst.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ class tst {
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;
Expand Down Expand Up @@ -107,8 +107,8 @@ class tst {
}

#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


Expand All @@ -123,11 +123,11 @@ class tst {
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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand All @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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é)
Expand Down Expand Up @@ -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é)
Expand Down
8 changes: 4 additions & 4 deletions java/javaTST.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ class ObjectTST : public tst<jchar,jobject,ObjectMemoryStorage> {
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);
Expand Down Expand Up @@ -180,9 +180,9 @@ class LongTST : public tst<jchar,jlong,java_long_memory_storage> {
}
};

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);
Expand Down
Loading

0 comments on commit a44bf93

Please sign in to comment.