--- parser3/src/classes/classes.C	2003/02/17 16:44:56	1.18.2.5
+++ parser3/src/classes/classes.C	2023/09/26 20:49:05	1.32
@@ -1,25 +1,24 @@
 /** @file
 	Parser: @b Methoded and Methoded_array classes.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
-static const char* IDENT_CLASSES_C="$Date: 2003/02/17 16:44:56 $";
-
 #include "classes.h"
 #include "pa_request.h"
 
+volatile const char * IDENT_CLASSES_C="$Id: classes.C,v 1.32 2023/09/26 20:49:05 moko Exp $" IDENT_CLASSES_H;
+
 // Methoded
 
 void Methoded::register_directly_used(Request& r) {
-	if(used_directly()) {
-		r.classes().put(name(), MethodedPtr(this));
+	if(used_directly())
+		r.put_class(this);
 
-		// prevent system classes from modification [calling add_method]
-		// ^process[$string:CLASS]{@method} prohibited from now on...
-		this->lock();
-	}
+	// prevent system classes from modification [calling set_method]
+	// ^process[$string:CLASS]{@method} prohibited from now on...
+	this->lock();
 }
 
 // Methoded_array
@@ -27,9 +26,9 @@ void Methoded::register_directly_used(Re
 // global variable
 
 Methoded_array& methoded_array() {
-	static Methoded_arrayPtr result(0);
+	static Methoded_array* result=0;
 	if(!result)
-		result=Methoded_arrayPtr(new Methoded_array);
+		result=new Methoded_array;
 
 	return *result;
 }
@@ -41,24 +40,21 @@ Methoded_array::Methoded_array() {
 }
 
 static void configure_admin_one(Methoded_array::element_type methoded, Request *r) {
-	if(methoded)
-		methoded->configure_admin(*r);
+	methoded->configure_admin(*r);
 }
 void Methoded_array::configure_admin(Request& r) {
 	for_each(configure_admin_one, &r);
 }
 
 static void configure_user_one(Methoded_array::element_type methoded, Request *r) {
-	if(methoded)
-		methoded->configure_user(*r);
+	methoded->configure_user(*r);
 }
 void Methoded_array::configure_user(Request& r) {
 	for_each(configure_user_one, &r);
 }
 
 static void register_one(Methoded_array::element_type methoded, Request *r) {
-	if(methoded)
-		methoded->register_directly_used(*r);
+	methoded->register_directly_used(*r);
 }
 void Methoded_array::register_directly_used(Request& r) {
 	for_each(register_one, &r);