--- parser3/src/classes/classes.C	2003/02/17 09:56:14	1.18.2.4
+++ parser3/src/classes/classes.C	2009/08/11 10:50:50	1.24
@@ -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-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_CLASSES_C="$Date: 2003/02/17 09:56:14 $";
+static const char * const IDENT_CLASSES_C="$Date: 2009/08/11 10:50:50 $";
 
 #include "classes.h"
 #include "pa_request.h"
@@ -14,19 +14,25 @@ static const char* IDENT_CLASSES_C="$Dat
 
 void Methoded::register_directly_used(Request& r) {
 	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();
+		r.classes().put(name(), this);
 	}
+
+	// prevent system classes from modification [calling set_method]
+	// ^process[$string:CLASS]{@method} prohibited from now on...
+	this->lock();
 }
 
 // Methoded_array
 
 // global variable
 
-Methoded_array methoded_array;
+Methoded_array& methoded_array() {
+	static Methoded_array* result=0;
+	if(!result)
+		result=new Methoded_array;
+
+	return *result;
+}
 
 // methods
 
@@ -35,28 +41,25 @@ Methoded_array::Methoded_array() {
 }
 
 static void configure_admin_one(Methoded_array::element_type methoded, Request *r) {
-	//[ptr porting]why check? if(methoded)
+	if(methoded)
 		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) {
-	//[ptr porting]why check? if(methoded)
+	if(methoded)
 		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) {
-	//[ptr porting]why check? if(methoded)
+	if(methoded)
 		methoded->register_directly_used(*r);
 }
-
 void Methoded_array::register_directly_used(Request& r) {
 	for_each(register_one, &r);
 }