--- parser3/src/classes/reflection.C 2024/12/11 02:52:50 1.96 +++ parser3/src/classes/reflection.C 2026/02/25 18:22:40 1.101 @@ -11,7 +11,7 @@ #include "pa_varray.h" #include "pa_vobject.h" -volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.96 2024/12/11 02:52:50 moko Exp $"; +volatile const char * IDENT_REFLECTION_C="$Id: reflection.C,v 1.101 2026/02/25 18:22:40 moko Exp $"; static const String class_type_methoded("methoded"); @@ -126,7 +126,7 @@ static void _create(Request& r, MethodPa static void _classes(Request& r, MethodParams&) { VHash& result=*new VHash; - for(HashString::Iterator i(r.classes()); i; i.next()){ + for(OrderedHashString::Iterator i(r.classes()); i; i.next()){ result.hash().put(i.key(), i.value()->get_methods().count()>0 ? new VString(class_type_methoded) : VVoid::get() ); } r.write(result); @@ -161,7 +161,7 @@ static void _class_name(Request& r, Meth } static void _class_by_name(Request& r, MethodParams& params) { - const String& class_name=params.as_string(0, "class_name must be string"); + const String& class_name=params.as_string(0, "class name must be string"); r.write(r.get_class_ref(class_name)); } @@ -361,13 +361,13 @@ static void _method_info(Request& r, Met // parser code const String* filespec = r.get_method_filespec(method); if( filespec ) - hash->put("file", new VString(*filespec)); + HASH_PUT_CSTR(*hash, "file", new VString(*filespec)); hash->put(method_max_params, new VInt(method->params_count + (method->named_params ? 1 : 0))); if(method->params_names) for(size_t i=0; iparams_names->count(); i++) - hash->put(pa_uitoa(i), new VString(*method->params_names->get(i))); + hash->put(String::Body::uitoa(i), new VString(*method->params_names->get(i))); if(method->extra_params) hash->put(method_extra_param, new VString(*method->extra_params)); @@ -376,7 +376,7 @@ static void _method_info(Request& r, Met VArray& named_params=*new VArray(named_count); ArrayValue &array=named_params.array(); - for(int i=0; inamed_params)[i]; array+=new VString(fname); } @@ -475,29 +475,22 @@ static void _mixin(Request& r, MethodPar if(params.count()>1) if(HashStringValue* options=params.as_hash(1, "mixin options")) { - int valid_options=0; for(HashStringValue::Iterator i(*options); i; i.next() ){ String::Body key=i.key(); Value* value=i.value(); if(key == "to") { vtarget=value; - valid_options++; } else if(key == "name") { name=&value->as_string(); - valid_options++; } else if(key == "methods") { copy_methods=r.process(*value).as_bool(); - valid_options++; } else if(key == "fields") { copy_fields=r.process(*value).as_bool(); - valid_options++; } else if(key == "overwrite") { overwrite=r.process(*value).as_bool(); - valid_options++; - } + } else + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } if(!vtarget) @@ -538,6 +531,37 @@ static void _mixin(Request& r, MethodPar } } +static void _override(Request& r, MethodParams& params) { + Junction *j=params[0].get_junction(); + const Method* method=j ? j->method : 0; + if(!method) + throw Exception(PARSER_RUNTIME, 0, "param must be method junction"); + + const String *name=method->name; + Value* vtarget=0; + if(params.count()>1) + if(HashStringValue* options=params.as_hash(1, "override options")) { + for(HashStringValue::Iterator i(*options); i; i.next() ){ + if(i.key() == "to") { + vtarget=i.value(); + } else if(i.key() == "name") { + name=&i.value()->as_string(); + } else + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + } + + if(!vtarget) + vtarget=&r.get_method_frame()->caller()->self(); + + VClass* target=dynamic_cast(vtarget->get_class()); + + if(!target) + throw Exception(PARSER_RUNTIME, 0, "destination must be parser object or class"); + + target->set_method(*name, new Method(*method)); +} + String::Language get_untaint_lang(const String& lang_name); // op.C static void _tainting(Request& r, MethodParams& params) { @@ -581,28 +605,20 @@ static void _stack(Request& r, MethodPar if(params.count()>0) if(HashStringValue* options=params.as_hash(0, "stack options")) { - int valid_options=0; for(HashStringValue::Iterator i(*options); i; i.next() ){ String::Body key=i.key(); Value* value=i.value(); - if(key == "args") { show_args=r.process(*value).as_bool(); - valid_options++; } else if(key == "locals") { show_locals=r.process(*value).as_bool(); - valid_options++; } else if(key == "limit") { limit=r.process(*value).as_int(); - valid_options++; } else if(key == "offset") { offset=r.process(*value).as_int(); - valid_options++; - } + } else + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } limit+=offset; @@ -625,8 +641,8 @@ static void _stack(Request& r, MethodPar if(!method.native_code){ Operation::Origin origin=r.get_method_origin(&method); if(origin.file_no){ - current->put("file", new VString(*r.get_used_filespec(origin.file_no))); - current->put("line", new VInt(origin.line)); // no +1 as declaration before first command + HASH_PUT_CSTR(*current, "file", new VString(*r.get_used_filespec(origin.file_no))); + HASH_PUT_CSTR(*current, "line", new VInt(origin.line)); // no +1 as declaration before first command } if(show_args || show_locals){ @@ -645,7 +661,7 @@ static void _stack(Request& r, MethodPar args->put(*method.extra_params, caller->get_element(*method.extra_params)); if(show_args) - current->put("args", &vargs); + HASH_PUT_CSTR(*current, "args", &vargs); if(show_locals){ VHash& vlocals=*new VHash; @@ -660,12 +676,12 @@ static void _stack(Request& r, MethodPar } } - current->put("locals", &vlocals); + HASH_PUT_CSTR(*current, "locals", &vlocals); } } } - result->put(pa_uitoa(index), &vcurrent); + result->put(String::Body::uitoa(index), &vcurrent); } caller=caller->caller(); index++; @@ -745,6 +761,9 @@ MReflection::MReflection(): Methoded("re // ^reflection:mixin[object or class or junction;options] add_native_method("mixin", Method::CT_STATIC, _mixin, 1, 2); + // ^reflection:override[method junction[;$.to[class] $.name[another_name]]] + add_native_method("override", Method::CT_STATIC, _override, 1, 2); + // ^reflection:tainting[[language or 'tainted' or 'optimized';]string] add_native_method("tainting", Method::CT_STATIC, _tainting, 1, 2);