--- parser3/src/classes/classes.C 2003/01/21 15:51:06 1.18 +++ parser3/src/classes/classes.C 2003/02/17 09:56:14 1.18.2.4 @@ -1,11 +1,11 @@ /** @file Parser: @b Methoded and Methoded_array classes. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_CLASSES_C="$Date: 2003/01/21 15:51:06 $"; +static const char* IDENT_CLASSES_C="$Date: 2003/02/17 09:56:14 $"; #include "classes.h" #include "pa_request.h" @@ -13,54 +13,50 @@ static const char* IDENT_CLASSES_C="$Dat // Methoded void Methoded::register_directly_used(Request& r) { - if(used_directly()) - r.classes().put(name(), this); + if(used_directly()) { + r.classes().put(name(), MethodedPtr(this)); + + // prevent system classes from modification [calling add_method] + // ^process[$string:CLASS]{@method} prohibited from now on... + this->lock(); + } } // Methoded_array // global variable -Methoded_array *methoded_array; +Methoded_array methoded_array; // methods -Methoded_array::Methoded_array(Pool& apool) : Array(apool) { +Methoded_array::Methoded_array() { # include "classes.inc" } -static void configure_admin_one(Array::Item *value, void *info) { - Request& r=*static_cast(info); - if(Methoded *methoded=static_cast(value)) - methoded->configure_admin(r); +static void configure_admin_one(Methoded_array::element_type methoded, Request *r) { + //[ptr porting]why check? if(methoded) + methoded->configure_admin(*r); } void Methoded_array::configure_admin(Request& r) { for_each(configure_admin_one, &r); } -static void configure_user_one(Array::Item *value, void *info) { - Request& r=*static_cast(info); - if(Methoded *methoded=static_cast(value)) - methoded->configure_user(r); +static void configure_user_one(Methoded_array::element_type methoded, Request *r) { + //[ptr porting]why check? if(methoded) + methoded->configure_user(*r); } void Methoded_array::configure_user(Request& r) { for_each(configure_user_one, &r); } -static void register_one(Array::Item *value, void *info) { - Request& r=*static_cast(info); - if(Methoded *methoded=static_cast(value)) - methoded->register_directly_used(r); +static void register_one(Methoded_array::element_type methoded, Request *r) { + //[ptr porting]why check? if(methoded) + methoded->register_directly_used(*r); } void Methoded_array::register_directly_used(Request& r) { for_each(register_one, &r); } - -// creator - -void init_methoded_array(Pool& pool) { - methoded_array=new(pool) Methoded_array(pool); -}