--- parser3/src/classes/reflection.C	2013/03/14 03:14:42	1.29
+++ parser3/src/classes/reflection.C	2016/03/31 21:46:20	1.40
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b reflection parser class.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -9,7 +9,7 @@
 #include "pa_request.h"
 #include "pa_vbool.h"
 
-volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.29 2013/03/14 03:14:42 misha Exp $";
+volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.40 2016/03/31 21:46:20 moko Exp $";
 
 static const String class_type_methoded("methoded");
 
@@ -26,6 +26,8 @@ static const String method_min_params("m
 static const String method_max_params("max_params");
 static const String method_extra_param("extra_param");
 
+static const String def_class("class");
+
 // class
 
 class MReflection: public Methoded {
@@ -35,7 +37,7 @@ public:
 
 // global variable
 
-DECLARE_CLASS_VAR(reflection, new MReflection, 0);
+DECLARE_CLASS_VAR(reflection, new MReflection);
 
 // methods
 
@@ -158,6 +160,13 @@ static void _class_name(Request& r, Meth
 	r.write_no_lang(*get_class_name(&params[0]));
 }
 
+static void _class_by_name(Request& r, MethodParams& params) {
+	const String& class_name=params.as_string(0, "class_name must be string");
+	Value* class_value=r.get_class(class_name);
+	if(!class_value)
+		throw Exception(PARSER_RUNTIME, &class_name, "class is undefined");
+	r.write_no_lang(*class_value);
+}
 
 static void _base(Request& r, MethodParams& params) {
 	if(VStateless_class* lclass=params[0].get_class())
@@ -185,6 +194,16 @@ static void store_method_info(
 	result->put(key, new VString(method->native_code?method_type_native:method_type_parser));
 }
 
+static void _def(Request& r, MethodParams& params) {
+	const String& type=params.as_string(0, "type must be string");
+	if(type == def_class) {
+		const String& name=params.as_string(1, "name must be string");
+		r.write_no_lang(VBool::get(r.get_class(name)!=0));
+	} else {
+		throw Exception(PARSER_RUNTIME, &type, "is invalid type, must be '%s'", def_class.cstr());
+	}
+}
+
 static void _methods(Request& r, MethodParams& params) {
 	const String& class_name=params.as_string(0, "class_name must be string");
 	Value* class_value=r.get_class(class_name);
@@ -276,6 +295,8 @@ static void _method_info(Request& r, Met
 		case Method::CT_STATIC:
 			call_type=new VString(method_call_type_static);
 			break;
+		case Method::CT_ANY:
+			break;
 	}
 	if(call_type)
 		hash->put(method_call_type, call_type);
@@ -312,6 +333,23 @@ static void _dynamical(Request& r, Metho
 	}
 }
 
+static void _is(Request& r, MethodParams& params) {
+	const String& name=params.as_string(0, "element name must be string");
+	const String& type=params.as_string(1, "class name must be string");
+	Value *context=params.count()==3 ? &(params.as_no_junction(2, "context must not be code")) : r.get_method_frame()->caller();
+	Value *value=context ? context->get_element(name) : 0;
+
+	if(value) {
+		if(type == "code" || type == "method") {
+			Junction *junction=value->get_junction();
+			r.write_no_lang(VBool::get(junction && ((junction->code==0) ^ (type == "code"))) );
+		} else {
+			r.write_no_lang(VBool::get( value->is(type.cstr()) ));
+		}
+	} else
+		r.write_no_lang(VBool::get(type == "void"));
+}
+
 static void _copy(Request& r, MethodParams& params) {
 	HashStringValue* src=params.as_no_junction(0, "source must not be code").get_hash();
 
@@ -330,7 +368,7 @@ static void _uid(Request& r, MethodParam
 	char local_buf[MAX_NUMBER];
 	int size=snprintf(local_buf, sizeof(local_buf), "%p", &obj);
 
-	r.write_pass_lang(*new String(pa_strdup(local_buf, (size_t)size), String::L_CLEAN, size));
+	r.write_pass_lang(*new String(String::C(pa_strdup(local_buf, (size_t)size), size)));
 }
 
 static void _delete(Request&, MethodParams& params) {
@@ -355,12 +393,18 @@ MReflection::MReflection(): Methoded("re
 	// ^reflection:class_name[object]
 	add_native_method("class_name", Method::CT_STATIC, _class_name, 1, 1);
 
+	// ^reflection:class_by_name[class_name]
+	add_native_method("class_by_name", Method::CT_STATIC, _class_by_name, 1, 1);
+
 	// ^reflection:base_class[object]
 	add_native_method("base", Method::CT_STATIC, _base, 1, 1);
 
 	// ^reflection:base_class_name[object]
 	add_native_method("base_name", Method::CT_STATIC, _base_name, 1, 1);
 
+	// ^reflection:def[class|...;name]
+	add_native_method("def", Method::CT_STATIC, _def, 2, 2);
+
 	// ^reflection:methods[class_name]
 	add_native_method("methods", Method::CT_STATIC, _methods, 1, 1);
 
@@ -379,6 +423,9 @@ MReflection::MReflection(): Methoded("re
 	// ^reflection:dynamical[[object or class, caller if absent]]
 	add_native_method("dynamical", Method::CT_STATIC, _dynamical, 0, 1);
 
+	// ^reflection:is[element_name;class_name|code|method[;context]]
+	add_native_method("is", Method::CT_STATIC, _is, 2, 3);
+
 	// ^reflection:copy[src;dst]
 	add_native_method("copy", Method::CT_STATIC, _copy, 2, 2);