From f8db8a3faa30b71dca33ced38be16d3f93f43e8a Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 19 Mar 2017 00:36:26 +0100 Subject: Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261. --- editor/doc/doc_data.cpp | 840 +++++++++++++++++++++++------------------------- editor/doc/doc_data.h | 32 +- editor/doc/doc_dump.cpp | 269 ++++++++-------- editor/doc/doc_dump.h | 4 +- 4 files changed, 539 insertions(+), 606 deletions(-) (limited to 'editor/doc') diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 587db381a..28975fe2e 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -26,20 +26,19 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "version.h" #include "doc_data.h" +#include "version.h" #include "global_constants.h" #include "globals.h" -#include "script_language.h" -#include "io/marshalls.h" #include "io/compression.h" +#include "io/marshalls.h" #include "scene/resources/theme.h" +#include "script_language.h" -void DocData::merge_from(const DocData& p_data) { - - for( Map::Element *E=class_list.front();E;E=E->next()) { +void DocData::merge_from(const DocData &p_data) { + for (Map::Element *E = class_list.front(); E; E = E->next()) { ClassDoc &c = E->get(); @@ -48,25 +47,26 @@ void DocData::merge_from(const DocData& p_data) { const ClassDoc &cf = p_data.class_list[c.name]; - c.description=cf.description; - c.brief_description=cf.brief_description; + c.description = cf.description; + c.brief_description = cf.brief_description; - for(int i=0;i arg_used; arg_used.resize(arg_count); - for (int l = 0; l < arg_count; ++l) arg_used[l] = false; + for (int l = 0; l < arg_count; ++l) + arg_used[l] = false; // also there is no guarantee that argument ordering will match, so we // have to check one by one so we make sure we have an exact match for (int k = 0; k < arg_count; ++k) { @@ -85,195 +85,188 @@ void DocData::merge_from(const DocData& p_data) { const MethodDoc &mf = cf.methods[j]; - m.description=mf.description; + m.description = mf.description; break; } } - - for(int i=0;i classes; ObjectTypeDB::get_type_list(&classes); classes.sort_custom(); - while(classes.size()) { + while (classes.size()) { - String name=classes.front()->get(); - String cname=name; + String name = classes.front()->get(); + String cname = name; if (cname.begins_with("_")) //proxy class - cname=cname.substr(1,name.length()); + cname = cname.substr(1, name.length()); - class_list[cname]=ClassDoc(); - ClassDoc& c = class_list[cname]; - c.name=cname; - c.inherits=ObjectTypeDB::type_inherits_from(name); - c.category=ObjectTypeDB::get_category(name); + class_list[cname] = ClassDoc(); + ClassDoc &c = class_list[cname]; + c.name = cname; + c.inherits = ObjectTypeDB::type_inherits_from(name); + c.category = ObjectTypeDB::get_category(name); List method_list; - ObjectTypeDB::get_method_list(name,&method_list,true); + ObjectTypeDB::get_method_list(name, &method_list, true); method_list.sort(); + for (List::Element *E = method_list.front(); E; E = E->next()) { - for(List::Element *E=method_list.front();E;E=E->next()) { - - if (E->get().name=="" || (E->get().name[0]=='_' && !(E->get().flags&METHOD_FLAG_VIRTUAL))) + if (E->get().name == "" || (E->get().name[0] == '_' && !(E->get().flags & METHOD_FLAG_VIRTUAL))) continue; //hiden, dont count MethodDoc method; - method.name=E->get().name; + method.name = E->get().name; - MethodBind *m = ObjectTypeDB::get_method(name,E->get().name); + MethodBind *m = ObjectTypeDB::get_method(name, E->get().name); - - if (E->get().flags&METHOD_FLAG_VIRTUAL) - method.qualifiers="virtual"; - if (E->get().flags&METHOD_FLAG_CONST) { - if (method.qualifiers!="") - method.qualifiers+=" "; - method.qualifiers+="const"; + if (E->get().flags & METHOD_FLAG_VIRTUAL) + method.qualifiers = "virtual"; + if (E->get().flags & METHOD_FLAG_CONST) { + if (method.qualifiers != "") + method.qualifiers += " "; + method.qualifiers += "const"; } - for(int i=-1;iget().arguments.size();i++) { + for (int i = -1; i < E->get().arguments.size(); i++) { PropertyInfo arginfo; - if (i==-1) { - + if (i == -1) { - arginfo=E->get().return_val; + arginfo = E->get().return_val; #ifdef DEBUG_METHODS_ENABLED - if (m && m->get_return_type()!=StringName()) - method.return_type=m->get_return_type(); - else if (method.name.find(":")!=-1) { - method.return_type=method.name.get_slice(":",1); - method.name=method.name.get_slice(":",0); + if (m && m->get_return_type() != StringName()) + method.return_type = m->get_return_type(); + else if (method.name.find(":") != -1) { + method.return_type = method.name.get_slice(":", 1); + method.name = method.name.get_slice(":", 0); - } else if (arginfo.type!=Variant::NIL) // { + } else if (arginfo.type != Variant::NIL) // { #endif - method.return_type=(arginfo.hint==PROPERTY_HINT_RESOURCE_TYPE)?arginfo.hint_string:Variant::get_type_name(arginfo.type); -// } + method.return_type = (arginfo.hint == PROPERTY_HINT_RESOURCE_TYPE) ? arginfo.hint_string : Variant::get_type_name(arginfo.type); + // } } else { ArgumentDoc argument; - arginfo=E->get().arguments[i]; + arginfo = E->get().arguments[i]; String type_name; - if (arginfo.name.find(":")!=-1) { - type_name=arginfo.name.get_slice(":",1); - arginfo.name=arginfo.name.get_slice(":",0); + if (arginfo.name.find(":") != -1) { + type_name = arginfo.name.get_slice(":", 1); + arginfo.name = arginfo.name.get_slice(":", 0); - } else if (arginfo.hint==PROPERTY_HINT_RESOURCE_TYPE) { - type_name=arginfo.hint_string; - } else if (arginfo.type==Variant::NIL) - type_name="Variant"; + } else if (arginfo.hint == PROPERTY_HINT_RESOURCE_TYPE) { + type_name = arginfo.hint_string; + } else if (arginfo.type == Variant::NIL) + type_name = "Variant"; else - type_name=Variant::get_type_name(arginfo.type); + type_name = Variant::get_type_name(arginfo.type); - if (arginfo.type==Variant::OBJECT) { + if (arginfo.type == Variant::OBJECT) { //print_line("validate: "+cname+"::"+method.name); } if (m && m->has_default_argument(i)) { - Variant default_arg=m->get_default_argument(i); - String default_arg_text=m->get_default_argument(i); + Variant default_arg = m->get_default_argument(i); + String default_arg_text = m->get_default_argument(i); - switch(default_arg.get_type()) { + switch (default_arg.get_type()) { case Variant::NIL: - default_arg_text="NULL"; + default_arg_text = "NULL"; break; // atomic types case Variant::BOOL: if (bool(default_arg)) - default_arg_text="true"; + default_arg_text = "true"; else - default_arg_text="false"; + default_arg_text = "false"; break; case Variant::INT: case Variant::REAL: //keep it break; - case Variant::STRING: // 15 - case Variant::NODE_PATH: // 15 - default_arg_text="\""+default_arg_text+"\""; + case Variant::STRING: // 15 + case Variant::NODE_PATH: // 15 + default_arg_text = "\"" + default_arg_text + "\""; break; case Variant::TRANSFORM: - if (default_arg.operator Transform()==Transform()) { - default_arg_text=""; + if (default_arg.operator Transform() == Transform()) { + default_arg_text = ""; } - default_arg_text=Variant::get_type_name(default_arg.get_type())+"("+default_arg_text+")"; + default_arg_text = Variant::get_type_name(default_arg.get_type()) + "(" + default_arg_text + ")"; break; case Variant::_AABB: //sorry naming convention fail :( not like it's used often // 10 @@ -282,48 +275,46 @@ void DocData::generate(bool p_basic_types) { case Variant::RAW_ARRAY: case Variant::INT_ARRAY: case Variant::REAL_ARRAY: - case Variant::STRING_ARRAY: //25 + case Variant::STRING_ARRAY: //25 case Variant::VECTOR2_ARRAY: case Variant::VECTOR3_ARRAY: case Variant::COLOR_ARRAY: - default_arg_text=Variant::get_type_name(default_arg.get_type())+"("+default_arg_text+")"; + default_arg_text = Variant::get_type_name(default_arg.get_type()) + "(" + default_arg_text + ")"; break; - case Variant::VECTOR2: // 5 + case Variant::VECTOR2: // 5 case Variant::RECT2: case Variant::VECTOR3: case Variant::QUAT: case Variant::MATRIX3: - default_arg_text=Variant::get_type_name(default_arg.get_type())+default_arg_text; + default_arg_text = Variant::get_type_name(default_arg.get_type()) + default_arg_text; break; case Variant::OBJECT: if (default_arg.is_zero()) { - default_arg_text="NULL"; + default_arg_text = "NULL"; break; } case Variant::INPUT_EVENT: - case Variant::DICTIONARY: // 20 + case Variant::DICTIONARY: // 20 case Variant::ARRAY: case Variant::_RID: case Variant::IMAGE: - //case Variant::RESOURCE: + //case Variant::RESOURCE: - default_arg_text=Variant::get_type_name(default_arg.get_type())+"()"; + default_arg_text = Variant::get_type_name(default_arg.get_type()) + "()"; break; default: {} - } - - argument.type=type_name; - argument.name=arginfo.name; - argument.default_value=default_arg_text; + argument.type = type_name; + argument.name = arginfo.name; + argument.default_value = default_arg_text; } else { - argument.type=type_name; - argument.name=arginfo.name; + argument.type = type_name; + argument.name = arginfo.name; } - if (arginfo.type==Variant::OBJECT) { + if (arginfo.type == Variant::OBJECT) { //print_line("validate: "+cname+"::"+method.name); } @@ -331,7 +322,7 @@ void DocData::generate(bool p_basic_types) { method.arguments.push_back(argument); } -/* + /* String hint; switch(arginfo.hint) { case PROPERTY_HINT_DIR: hint="A directory."; break; @@ -345,46 +336,41 @@ void DocData::generate(bool p_basic_types) { if (hint!="") _write_string(f,4,hint); */ - - } c.methods.push_back(method); } List signal_list; - ObjectTypeDB::get_signal_list(name,&signal_list,true); + ObjectTypeDB::get_signal_list(name, &signal_list, true); if (signal_list.size()) { - - for(List::Element *EV=signal_list.front();EV;EV=EV->next()) { + for (List::Element *EV = signal_list.front(); EV; EV = EV->next()) { MethodDoc signal; - signal.name=EV->get().name; - for(int i=0;iget().arguments.size();i++) { + signal.name = EV->get().name; + for (int i = 0; i < EV->get().arguments.size(); i++) { - PropertyInfo arginfo=EV->get().arguments[i]; + PropertyInfo arginfo = EV->get().arguments[i]; ArgumentDoc argument; - argument.name=arginfo.name; - argument.type=Variant::get_type_name(arginfo.type); + argument.name = arginfo.name; + argument.type = Variant::get_type_name(arginfo.type); signal.arguments.push_back(argument); } c.signals.push_back(signal); } - - } List constant_list; ObjectTypeDB::get_integer_constant_list(name, &constant_list, true); - for(List::Element *E=constant_list.front();E;E=E->next()) { + for (List::Element *E = constant_list.front(); E; E = E->next()) { ConstantDoc constant; - constant.name=E->get(); - constant.value=itos(ObjectTypeDB::get_integer_constant(name, E->get())); + constant.name = E->get(); + constant.value = itos(ObjectTypeDB::get_integer_constant(name, E->get())); c.constants.push_back(constant); } @@ -392,187 +378,179 @@ void DocData::generate(bool p_basic_types) { { List l; - Theme::get_default()->get_constant_list(cname,&l); - for (List::Element*E=l.front();E;E=E->next()) { + Theme::get_default()->get_constant_list(cname, &l); + for (List::Element *E = l.front(); E; E = E->next()) { PropertyDoc pd; - pd.name=E->get(); - pd.type="int"; + pd.name = E->get(); + pd.type = "int"; c.theme_properties.push_back(pd); } l.clear(); - Theme::get_default()->get_color_list(cname,&l); - for (List::Element*E=l.front();E;E=E->next()) { + Theme::get_default()->get_color_list(cname, &l); + for (List::Element *E = l.front(); E; E = E->next()) { PropertyDoc pd; - pd.name=E->get(); - pd.type="Color"; + pd.name = E->get(); + pd.type = "Color"; c.theme_properties.push_back(pd); } l.clear(); - Theme::get_default()->get_icon_list(cname,&l); - for (List::Element*E=l.front();E;E=E->next()) { + Theme::get_default()->get_icon_list(cname, &l); + for (List::Element *E = l.front(); E; E = E->next()) { PropertyDoc pd; - pd.name=E->get(); - pd.type="Texture"; + pd.name = E->get(); + pd.type = "Texture"; c.theme_properties.push_back(pd); } l.clear(); - Theme::get_default()->get_font_list(cname,&l); - for (List::Element*E=l.front();E;E=E->next()) { + Theme::get_default()->get_font_list(cname, &l); + for (List::Element *E = l.front(); E; E = E->next()) { PropertyDoc pd; - pd.name=E->get(); - pd.type="Font"; + pd.name = E->get(); + pd.type = "Font"; c.theme_properties.push_back(pd); } l.clear(); - Theme::get_default()->get_stylebox_list(cname,&l); - for (List::Element*E=l.front();E;E=E->next()) { + Theme::get_default()->get_stylebox_list(cname, &l); + for (List::Element *E = l.front(); E; E = E->next()) { PropertyDoc pd; - pd.name=E->get(); - pd.type="StyleBox"; + pd.name = E->get(); + pd.type = "StyleBox"; c.theme_properties.push_back(pd); } - } - classes.pop_front(); } - { //so it can be documented that it does not exist - class_list["Variant"]=ClassDoc(); - class_list["Variant"].name="Variant"; + class_list["Variant"] = ClassDoc(); + class_list["Variant"].name = "Variant"; } if (!p_basic_types) return; - for (int i=0;i method_list; v.get_method_list(&method_list); method_list.sort(); - Variant::get_constructor_list(Variant::Type(i),&method_list); + Variant::get_constructor_list(Variant::Type(i), &method_list); + for (List::Element *E = method_list.front(); E; E = E->next()) { - for(List::Element *E=method_list.front();E;E=E->next()) { - - MethodInfo &mi=E->get(); + MethodInfo &mi = E->get(); MethodDoc method; - method.name=mi.name; + method.name = mi.name; - for(int i=0;i=0) - arg.default_value=mi.default_arguments[defarg]; + if (defarg >= 0) + arg.default_value = mi.default_arguments[defarg]; method.arguments.push_back(arg); } - if (mi.return_val.type==Variant::NIL) { - if (mi.return_val.name!="") - method.return_type="var"; + if (mi.return_val.type == Variant::NIL) { + if (mi.return_val.name != "") + method.return_type = "var"; } else { - method.return_type=Variant::get_type_name(mi.return_val.type); + method.return_type = Variant::get_type_name(mi.return_val.type); } c.methods.push_back(method); } - List properties; v.get_property_list(&properties); - for(List::Element *E=properties.front();E;E=E->next()) { + for (List::Element *E = properties.front(); E; E = E->next()) { - PropertyInfo pi=E->get(); + PropertyInfo pi = E->get(); PropertyDoc property; - property.name=pi.name; - property.type=Variant::get_type_name(pi.type); + property.name = pi.name; + property.type = Variant::get_type_name(pi.type); c.properties.push_back(property); } List constants; - Variant::get_numeric_constants_for_type(Variant::Type(i),&constants); + Variant::get_numeric_constants_for_type(Variant::Type(i), &constants); - for(List::Element *E=constants.front();E;E=E->next()) { + for (List::Element *E = constants.front(); E; E = E->next()) { ConstantDoc constant; - constant.name=E->get(); - constant.value=itos(Variant::get_numeric_constant_value(Variant::Type(i),E->get())); + constant.name = E->get(); + constant.value = itos(Variant::get_numeric_constant_value(Variant::Type(i), E->get())); c.constants.push_back(constant); } } - } //built in constants and functions { - String cname="@Global Scope"; - class_list[cname]=ClassDoc(); - ClassDoc& c = class_list[cname]; - c.name=cname; - + String cname = "@Global Scope"; + class_list[cname] = ClassDoc(); + ClassDoc &c = class_list[cname]; + c.name = cname; - for(int i=0;iget_singletons(&singletons); //servers (this is kind of hackish) - for(List::Element *E=singletons.front();E;E=E->next()) { + for (List::Element *E = singletons.front(); E; E = E->next()) { PropertyDoc pd; - Globals::Singleton &s=E->get(); - pd.name=s.name; - pd.type=s.ptr->get_type(); - while (String(ObjectTypeDB::type_inherits_from(pd.type))!="Object") - pd.type=ObjectTypeDB::type_inherits_from(pd.type); + Globals::Singleton &s = E->get(); + pd.name = s.name; + pd.type = s.ptr->get_type(); + while (String(ObjectTypeDB::type_inherits_from(pd.type)) != "Object") + pd.type = ObjectTypeDB::type_inherits_from(pd.type); if (pd.type.begins_with("_")) - pd.type=pd.type.substr(1,pd.type.length()); + pd.type = pd.type.substr(1, pd.type.length()); c.properties.push_back(pd); - } - } //built in script reference { - - for(int i=0;iget_name(); - class_list[cname]=ClassDoc(); - ClassDoc& c = class_list[cname]; - c.name=cname; + String cname = "@" + lang->get_name(); + class_list[cname] = ClassDoc(); + ClassDoc &c = class_list[cname]; + c.name = cname; List minfo; lang->get_public_functions(&minfo); + for (List::Element *E = minfo.front(); E; E = E->next()) { - for(List::Element *E=minfo.front();E;E=E->next()) { - - MethodInfo &mi=E->get(); + MethodInfo &mi = E->get(); MethodDoc md; - md.name=mi.name; - if (mi.return_val.name!="") - md.return_type=mi.return_val.name; - else if (mi.name.find(":")!=-1) { - md.return_type=mi.name.get_slice(":",1); - md.name=mi.name.get_slice(":",0); + md.name = mi.name; + if (mi.return_val.name != "") + md.return_type = mi.return_val.name; + else if (mi.name.find(":") != -1) { + md.return_type = mi.name.get_slice(":", 1); + md.name = mi.name.get_slice(":", 0); } else - md.return_type=Variant::get_type_name(mi.return_val.type); + md.return_type = Variant::get_type_name(mi.return_val.type); - for(int i=0;i > cinfo; + List > cinfo; lang->get_public_constants(&cinfo); - - for(List >::Element *E=cinfo.front();E;E=E->next()) { + for (List >::Element *E = cinfo.front(); E; E = E->next()) { ConstantDoc cd; - cd.name=E->get().first; - cd.value=E->get().second; + cd.name = E->get().first; + cd.value = E->get().second; c.constants.push_back(cd); } } } - - } +static Error _parse_methods(Ref &parser, Vector &methods) { -static Error _parse_methods(Ref& parser,Vector& methods) { - - String section=parser->get_node_name(); - String element=section.substr(0,section.length()-1); + String section = parser->get_node_name(); + String element = section.substr(0, section.length() - 1); - while(parser->read()==OK) { + while (parser->read() == OK) { - if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { + if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { - if (parser->get_node_name()==element) { + if (parser->get_node_name() == element) { DocData::MethodDoc method; - ERR_FAIL_COND_V(!parser->has_attribute("name"),ERR_FILE_CORRUPT); - method.name=parser->get_attribute_value("name"); + ERR_FAIL_COND_V(!parser->has_attribute("name"), ERR_FILE_CORRUPT); + method.name = parser->get_attribute_value("name"); if (parser->has_attribute("qualifiers")) - method.qualifiers=parser->get_attribute_value("qualifiers"); - + method.qualifiers = parser->get_attribute_value("qualifiers"); - while(parser->read()==OK) { + while (parser->read() == OK) { - if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { + if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { - String name=parser->get_node_name(); - if (name=="return") { + String name = parser->get_node_name(); + if (name == "return") { - ERR_FAIL_COND_V(!parser->has_attribute("type"),ERR_FILE_CORRUPT); - method.return_type=parser->get_attribute_value("type"); - } else if (name=="argument") { + ERR_FAIL_COND_V(!parser->has_attribute("type"), ERR_FILE_CORRUPT); + method.return_type = parser->get_attribute_value("type"); + } else if (name == "argument") { DocData::ArgumentDoc argument; - ERR_FAIL_COND_V(!parser->has_attribute("name"),ERR_FILE_CORRUPT); - argument.name=parser->get_attribute_value("name"); - ERR_FAIL_COND_V(!parser->has_attribute("type"),ERR_FILE_CORRUPT); - argument.type=parser->get_attribute_value("type"); + ERR_FAIL_COND_V(!parser->has_attribute("name"), ERR_FILE_CORRUPT); + argument.name = parser->get_attribute_value("name"); + ERR_FAIL_COND_V(!parser->has_attribute("type"), ERR_FILE_CORRUPT); + argument.type = parser->get_attribute_value("type"); method.arguments.push_back(argument); - } else if (name=="description") { + } else if (name == "description") { parser->read(); - if (parser->get_node_type()==XMLParser::NODE_TEXT) - method.description=parser->get_node_data().strip_edges(); + if (parser->get_node_type() == XMLParser::NODE_TEXT) + method.description = parser->get_node_data().strip_edges(); } - } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name()==element) + } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name() == element) break; } methods.push_back(method); } else { - ERR_EXPLAIN("Invalid tag in doc file: "+parser->get_node_name()); + ERR_EXPLAIN("Invalid tag in doc file: " + parser->get_node_name()); ERR_FAIL_V(ERR_FILE_CORRUPT); } - } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name()==section) + } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name() == section) break; } return OK; } -Error DocData::load(const String& p_path) { +Error DocData::load(const String &p_path) { - Ref parser=memnew(XMLParser); + Ref parser = memnew(XMLParser); Error err = parser->open(p_path); if (err) return err; return _load(parser); - } Error DocData::_load(Ref parser) { - Error err=OK; + Error err = OK; - while((err=parser->read())==OK) { + while ((err = parser->read()) == OK) { if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { if (parser->get_node_name() == "doc") { break; } else if (!parser->is_empty()) - parser->skip_section();// unknown section, likely headers + parser->skip_section(); // unknown section, likely headers } } if (parser->has_attribute("version")) - version=parser->get_attribute_value("version"); - + version = parser->get_attribute_value("version"); - while((err=parser->read())==OK) { + while ((err = parser->read()) == OK) { - - if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name()=="doc") + if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name() == "doc") break; //end of if (parser->get_node_type() != XMLParser::NODE_ELEMENT) continue; //no idea what this may be, but skipping anyway - ERR_FAIL_COND_V( parser->get_node_name()!="class", ERR_FILE_CORRUPT ); + ERR_FAIL_COND_V(parser->get_node_name() != "class", ERR_FILE_CORRUPT); - ERR_FAIL_COND_V( !parser->has_attribute("name"), ERR_FILE_CORRUPT); + ERR_FAIL_COND_V(!parser->has_attribute("name"), ERR_FILE_CORRUPT); String name = parser->get_attribute_value("name"); - class_list[name]=ClassDoc(); - ClassDoc& c = class_list[name]; + class_list[name] = ClassDoc(); + ClassDoc &c = class_list[name]; -// print_line("class: "+name); - c.name=name; + // print_line("class: "+name); + c.name = name; if (parser->has_attribute("inherits")) c.inherits = parser->get_attribute_value("inherits"); if (parser->has_attribute("category")) c.category = parser->get_attribute_value("category"); - while(parser->read()==OK) { + while (parser->read() == OK) { - if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { + if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { String name = parser->get_node_name(); - if (name=="brief_description") { + if (name == "brief_description") { parser->read(); - if (parser->get_node_type()==XMLParser::NODE_TEXT) - c.brief_description=parser->get_node_data().strip_edges(); + if (parser->get_node_type() == XMLParser::NODE_TEXT) + c.brief_description = parser->get_node_data().strip_edges(); - } else if (name=="description") { + } else if (name == "description") { parser->read(); - if (parser->get_node_type()==XMLParser::NODE_TEXT) - c.description=parser->get_node_data().strip_edges(); - } else if (name=="methods") { + if (parser->get_node_type() == XMLParser::NODE_TEXT) + c.description = parser->get_node_data().strip_edges(); + } else if (name == "methods") { - Error err = _parse_methods(parser,c.methods); - ERR_FAIL_COND_V(err,err); + Error err = _parse_methods(parser, c.methods); + ERR_FAIL_COND_V(err, err); - } else if (name=="signals") { + } else if (name == "signals") { - Error err = _parse_methods(parser,c.signals); - ERR_FAIL_COND_V(err,err); - } else if (name=="members") { + Error err = _parse_methods(parser, c.signals); + ERR_FAIL_COND_V(err, err); + } else if (name == "members") { - while(parser->read()==OK) { + while (parser->read() == OK) { - if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { + if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { String name = parser->get_node_name(); - if (name=="member") { + if (name == "member") { PropertyDoc prop; - ERR_FAIL_COND_V(!parser->has_attribute("name"),ERR_FILE_CORRUPT); - prop.name=parser->get_attribute_value("name"); - ERR_FAIL_COND_V(!parser->has_attribute("type"),ERR_FILE_CORRUPT); - prop.type=parser->get_attribute_value("type"); + ERR_FAIL_COND_V(!parser->has_attribute("name"), ERR_FILE_CORRUPT); + prop.name = parser->get_attribute_value("name"); + ERR_FAIL_COND_V(!parser->has_attribute("type"), ERR_FILE_CORRUPT); + prop.type = parser->get_attribute_value("type"); parser->read(); - if (parser->get_node_type()==XMLParser::NODE_TEXT) - prop.description=parser->get_node_data().strip_edges(); + if (parser->get_node_type() == XMLParser::NODE_TEXT) + prop.description = parser->get_node_data().strip_edges(); c.properties.push_back(prop); } else { - ERR_EXPLAIN("Invalid tag in doc file: "+name); + ERR_EXPLAIN("Invalid tag in doc file: " + name); ERR_FAIL_V(ERR_FILE_CORRUPT); } - } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name()=="members") + } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name() == "members") break; //end of } - } else if (name=="theme_items") { + } else if (name == "theme_items") { - while(parser->read()==OK) { + while (parser->read() == OK) { - if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { + if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { String name = parser->get_node_name(); - if (name=="theme_item") { + if (name == "theme_item") { PropertyDoc prop; - ERR_FAIL_COND_V(!parser->has_attribute("name"),ERR_FILE_CORRUPT); - prop.name=parser->get_attribute_value("name"); - ERR_FAIL_COND_V(!parser->has_attribute("type"),ERR_FILE_CORRUPT); - prop.type=parser->get_attribute_value("type"); + ERR_FAIL_COND_V(!parser->has_attribute("name"), ERR_FILE_CORRUPT); + prop.name = parser->get_attribute_value("name"); + ERR_FAIL_COND_V(!parser->has_attribute("type"), ERR_FILE_CORRUPT); + prop.type = parser->get_attribute_value("type"); parser->read(); - if (parser->get_node_type()==XMLParser::NODE_TEXT) - prop.description=parser->get_node_data().strip_edges(); + if (parser->get_node_type() == XMLParser::NODE_TEXT) + prop.description = parser->get_node_data().strip_edges(); c.theme_properties.push_back(prop); } else { - ERR_EXPLAIN("Invalid tag in doc file: "+name); + ERR_EXPLAIN("Invalid tag in doc file: " + name); ERR_FAIL_V(ERR_FILE_CORRUPT); } - } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name()=="theme_items") + } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name() == "theme_items") break; //end of } - } else if (name=="constants") { + } else if (name == "constants") { - while(parser->read()==OK) { + while (parser->read() == OK) { - if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { + if (parser->get_node_type() == XMLParser::NODE_ELEMENT) { - String name=parser->get_node_name(); + String name = parser->get_node_name(); - if (name=="constant") { + if (name == "constant") { ConstantDoc constant; - ERR_FAIL_COND_V(!parser->has_attribute("name"),ERR_FILE_CORRUPT); - constant.name=parser->get_attribute_value("name"); - ERR_FAIL_COND_V(!parser->has_attribute("value"),ERR_FILE_CORRUPT); - constant.value=parser->get_attribute_value("value"); + ERR_FAIL_COND_V(!parser->has_attribute("name"), ERR_FILE_CORRUPT); + constant.name = parser->get_attribute_value("name"); + ERR_FAIL_COND_V(!parser->has_attribute("value"), ERR_FILE_CORRUPT); + constant.value = parser->get_attribute_value("value"); parser->read(); - if (parser->get_node_type()==XMLParser::NODE_TEXT) - constant.description=parser->get_node_data().strip_edges(); + if (parser->get_node_type() == XMLParser::NODE_TEXT) + constant.description = parser->get_node_data().strip_edges(); c.constants.push_back(constant); } else { - ERR_EXPLAIN("Invalid tag in doc file: "+name); + ERR_EXPLAIN("Invalid tag in doc file: " + name); ERR_FAIL_V(ERR_FILE_CORRUPT); } - } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name()=="constants") + } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name() == "constants") break; //end of } } else { - ERR_EXPLAIN("Invalid tag in doc file: "+name); + ERR_EXPLAIN("Invalid tag in doc file: " + name); ERR_FAIL_V(ERR_FILE_CORRUPT); } - - } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name()=="class") + } else if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END && parser->get_node_name() == "class") break; //end of } - - } return OK; } - -static void _write_string(FileAccess *f,int p_tablevel,const String& p_string) { +static void _write_string(FileAccess *f, int p_tablevel, const String &p_string) { String tab; - for(int i=0;istore_string(tab+p_string+"\n"); + for (int i = 0; i < p_tablevel; i++) + tab += "\t"; + f->store_string(tab + p_string + "\n"); } -Error DocData::save(const String& p_path) { +Error DocData::save(const String &p_path) { Error err; - FileAccess *f = FileAccess::open(p_path,FileAccess::WRITE,&err); + FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE, &err); if (err) { - ERR_EXPLAIN("Can't write doc file: "+p_path); + ERR_EXPLAIN("Can't write doc file: " + p_path); ERR_FAIL_V(err); - } - _write_string(f,0,""); - _write_string(f,0,""); - - for( Map::Element *E=class_list.front();E;E=E->next()) { - - ClassDoc &c=E->get(); - - String header=""); - if (c.brief_description!="") - _write_string(f,2,c.brief_description.xml_escape()); - _write_string(f,1,""); - _write_string(f,1,""); - if (c.description!="") - _write_string(f,2,c.description.xml_escape()); - _write_string(f,1,""); - _write_string(f,1,""); + _write_string(f, 0, ""); + _write_string(f, 0, ""); + + for (Map::Element *E = class_list.front(); E; E = E->next()) { + + ClassDoc &c = E->get(); + + String header = ""); + if (c.brief_description != "") + _write_string(f, 2, c.brief_description.xml_escape()); + _write_string(f, 1, ""); + _write_string(f, 1, ""); + if (c.description != "") + _write_string(f, 2, c.description.xml_escape()); + _write_string(f, 1, ""); + _write_string(f, 1, ""); c.methods.sort(); - for(int i=0;i"); + _write_string(f, 2, ""); - if (m.return_type!="") { + if (m.return_type != "") { - _write_string(f,3,""); - _write_string(f,3,""); + _write_string(f, 3, ""); + _write_string(f, 3, ""); } - for(int j=0;j"); + if (a.default_value != "") + _write_string(f, 3, ""); else - _write_string(f,3,""); - - _write_string(f,3,""); + _write_string(f, 3, ""); + _write_string(f, 3, ""); } - _write_string(f,3,""); - if (m.description!="") - _write_string(f,4,m.description.xml_escape()); - _write_string(f,3,""); - - _write_string(f,2,""); + _write_string(f, 3, ""); + if (m.description != "") + _write_string(f, 4, m.description.xml_escape()); + _write_string(f, 3, ""); + _write_string(f, 2, ""); } - _write_string(f,1,""); + _write_string(f, 1, ""); if (c.properties.size()) { - _write_string(f,1,""); + _write_string(f, 1, ""); c.properties.sort(); - for(int i=0;i"); - if (p.description!="") - _write_string(f,3,p.description.xml_escape()); - _write_string(f,2,""); + for (int i = 0; i < c.properties.size(); i++) { + PropertyDoc &p = c.properties[i]; + _write_string(f, 2, ""); + if (p.description != "") + _write_string(f, 3, p.description.xml_escape()); + _write_string(f, 2, ""); } - _write_string(f,1,""); + _write_string(f, 1, ""); } if (c.signals.size()) { c.signals.sort(); - _write_string(f,1,""); - for(int i=0;i"); + for (int i = 0; i < c.signals.size(); i++) { - MethodDoc &m=c.signals[i]; - _write_string(f,2,""); - for(int j=0;j"); + for (int j = 0; j < m.arguments.size(); j++) { ArgumentDoc &a = m.arguments[j]; - _write_string(f,3,""); - _write_string(f,3,""); - + _write_string(f, 3, ""); + _write_string(f, 3, ""); } - _write_string(f,3,""); - if (m.description!="") - _write_string(f,4,m.description.xml_escape()); - _write_string(f,3,""); + _write_string(f, 3, ""); + if (m.description != "") + _write_string(f, 4, m.description.xml_escape()); + _write_string(f, 3, ""); - _write_string(f,2,""); + _write_string(f, 2, ""); } - _write_string(f,1,""); + _write_string(f, 1, ""); } - _write_string(f,1,""); + _write_string(f, 1, ""); + for (int i = 0; i < c.constants.size(); i++) { - for(int i=0;i"); - if (k.description!="") - _write_string(f,3,k.description.xml_escape()); - _write_string(f,2,""); + ConstantDoc &k = c.constants[i]; + _write_string(f, 2, ""); + if (k.description != "") + _write_string(f, 3, k.description.xml_escape()); + _write_string(f, 2, ""); } - _write_string(f,1,""); + _write_string(f, 1, ""); if (c.theme_properties.size()) { c.theme_properties.sort(); - _write_string(f,1,""); - for(int i=0;i"); - _write_string(f,2,""); + _write_string(f, 1, ""); + for (int i = 0; i < c.theme_properties.size(); i++) { + PropertyDoc &p = c.theme_properties[i]; + _write_string(f, 2, ""); + _write_string(f, 2, ""); } - _write_string(f,1,""); + _write_string(f, 1, ""); } - _write_string(f,0,""); - + _write_string(f, 0, ""); } - _write_string(f,0,""); + _write_string(f, 0, ""); f->close(); memdelete(f); return OK; } - Error DocData::load_compressed(const uint8_t *p_data, int p_compressed_size, int p_uncompressed_size) { Vector data; data.resize(p_uncompressed_size); - Compression::decompress(data.ptr(),p_uncompressed_size,p_data,p_compressed_size,Compression::MODE_DEFLATE); + Compression::decompress(data.ptr(), p_uncompressed_size, p_data, p_compressed_size, Compression::MODE_DEFLATE); class_list.clear(); - Ref parser = memnew( XMLParser ); + Ref parser = memnew(XMLParser); Error err = parser->open_buffer(data); if (err) return err; @@ -1098,5 +1047,4 @@ Error DocData::load_compressed(const uint8_t *p_data, int p_compressed_size, int _load(parser); return OK; - } diff --git a/editor/doc/doc_data.h b/editor/doc/doc_data.h index 0dd06636f..ad830f36e 100644 --- a/editor/doc/doc_data.h +++ b/editor/doc/doc_data.h @@ -29,12 +29,11 @@ #ifndef DOC_DATA_H #define DOC_DATA_H - -#include "variant.h" -#include "map.h" #include "io/xml_parser.h" +#include "map.h" +#include "variant.h" -class DocData { +class DocData { public: struct ArgumentDoc { @@ -50,8 +49,8 @@ public: String qualifiers; String description; Vector arguments; - bool operator<(const MethodDoc& p_md) const { - return name constants; Vector properties; Vector theme_properties; - }; String version; - Map class_list; + Map class_list; Error _load(Ref parser); - public: - - void merge_from(const DocData& p_data); - void generate(bool p_basic_types=false); - Error load(const String& p_path); - Error save(const String& p_path); + void merge_from(const DocData &p_data); + void generate(bool p_basic_types = false); + Error load(const String &p_path); + Error save(const String &p_path); Error load_compressed(const uint8_t *p_data, int p_compressed_size, int p_uncompressed_size); - - }; #endif // DOC_DATA_H diff --git a/editor/doc/doc_dump.cpp b/editor/doc/doc_dump.cpp index 75601ca98..e6919778e 100644 --- a/editor/doc/doc_dump.cpp +++ b/editor/doc/doc_dump.cpp @@ -26,163 +26,156 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "version.h" #include "doc_dump.h" #include "os/file_access.h" #include "scene/main/node.h" +#include "version.h" - -static void _write_string(FileAccess *f,int p_tablevel,const String& p_string) { +static void _write_string(FileAccess *f, int p_tablevel, const String &p_string) { String tab; - for(int i=0;istore_string(tab+p_string+"\n"); + for (int i = 0; i < p_tablevel; i++) + tab += "\t"; + f->store_string(tab + p_string + "\n"); } struct _ConstantSort { String name; int value; - bool operator<(const _ConstantSort& p_c) const { + bool operator<(const _ConstantSort &p_c) const { - String left_a=name.find("_")==-1?name:name.substr(0,name.find("_")); - String left_b=p_c.name.find("_")==-1?p_c.name:p_c.name.substr(0,p_c.name.find("_")); - if(left_a==left_b) - return value","<"); - ret=ret.replace("'","'"); - ret=ret.replace("\"","""); - for (char i=1;i<32;i++) { + String ret = p_str; + ret = ret.replace("&", "&"); + ret = ret.replace("<", ">"); + ret = ret.replace(">", "<"); + ret = ret.replace("'", "'"); + ret = ret.replace("\"", """); + for (char i = 1; i < 32; i++) { - char chr[2]={i,0}; - ret=ret.replace(chr,"&#"+String::num(i)+";"); + char chr[2] = { i, 0 }; + ret = ret.replace(chr, "&#" + String::num(i) + ";"); } - ret=ret.utf8(); + ret = ret.utf8(); return ret; } -void DocDump::dump(const String& p_file) { - +void DocDump::dump(const String &p_file) { List class_list; ObjectTypeDB::get_type_list(&class_list); class_list.sort_custom(); + FileAccess *f = FileAccess::open(p_file, FileAccess::WRITE); - FileAccess *f = FileAccess::open(p_file,FileAccess::WRITE); - - _write_string(f,0,""); + _write_string(f, 0, ""); - _write_string(f,0,""); - while(class_list.size()) { + _write_string(f, 0, ""); + while (class_list.size()) { - String name=class_list.front()->get(); + String name = class_list.front()->get(); - String header=""); - _write_string(f,1,""); - _write_string(f,1,""); - _write_string(f,1,""); - _write_string(f,1,""); + String header = ""); + _write_string(f, 1, ""); + _write_string(f, 1, ""); + _write_string(f, 1, ""); + _write_string(f, 1, ""); List method_list; - ObjectTypeDB::get_method_list(name,&method_list,true); + ObjectTypeDB::get_method_list(name, &method_list, true); method_list.sort(); - - for(List::Element *E=method_list.front();E;E=E->next()) { - if (E->get().name=="" || E->get().name[0]=='_') + for (List::Element *E = method_list.front(); E; E = E->next()) { + if (E->get().name == "" || E->get().name[0] == '_') continue; //hiden - MethodBind *m = ObjectTypeDB::get_method(name,E->get().name); + MethodBind *m = ObjectTypeDB::get_method(name, E->get().name); String qualifiers; - if (E->get().flags&METHOD_FLAG_CONST) - qualifiers+="qualifiers=\"const\""; + if (E->get().flags & METHOD_FLAG_CONST) + qualifiers += "qualifiers=\"const\""; - _write_string(f,2,"get().name)+"\" "+qualifiers+" >"); + _write_string(f, 2, "get().name) + "\" " + qualifiers + " >"); - for(int i=-1;iget().arguments.size();i++) { + for (int i = -1; i < E->get().arguments.size(); i++) { PropertyInfo arginfo; - if (i==-1) { + if (i == -1) { - arginfo=E->get().return_val; - String type_name=(arginfo.hint==PROPERTY_HINT_RESOURCE_TYPE)?arginfo.hint_string:Variant::get_type_name(arginfo.type); + arginfo = E->get().return_val; + String type_name = (arginfo.hint == PROPERTY_HINT_RESOURCE_TYPE) ? arginfo.hint_string : Variant::get_type_name(arginfo.type); - if (arginfo.type==Variant::NIL) + if (arginfo.type == Variant::NIL) continue; - _write_string(f,3,""); + _write_string(f, 3, ""); } else { - - arginfo=E->get().arguments[i]; + arginfo = E->get().arguments[i]; String type_name; - if (arginfo.hint==PROPERTY_HINT_RESOURCE_TYPE) - type_name=arginfo.hint_string; - else if (arginfo.type==Variant::NIL) - type_name="var"; + if (arginfo.hint == PROPERTY_HINT_RESOURCE_TYPE) + type_name = arginfo.hint_string; + else if (arginfo.type == Variant::NIL) + type_name = "var"; else - type_name=Variant::get_type_name(arginfo.type); + type_name = Variant::get_type_name(arginfo.type); if (m && m->has_default_argument(i)) { - Variant default_arg=m->get_default_argument(i); - String default_arg_text=String(_escape_string(m->get_default_argument(i))); + Variant default_arg = m->get_default_argument(i); + String default_arg_text = String(_escape_string(m->get_default_argument(i))); - switch(default_arg.get_type()) { + switch (default_arg.get_type()) { case Variant::NIL: - default_arg_text="NULL"; + default_arg_text = "NULL"; break; // atomic types case Variant::BOOL: if (bool(default_arg)) - default_arg_text="true"; + default_arg_text = "true"; else - default_arg_text="false"; + default_arg_text = "false"; break; case Variant::INT: case Variant::REAL: //keep it break; - case Variant::STRING: // 15 - case Variant::NODE_PATH: // 15 - default_arg_text="\""+default_arg_text+"\""; + case Variant::STRING: // 15 + case Variant::NODE_PATH: // 15 + default_arg_text = "\"" + default_arg_text + "\""; break; case Variant::TRANSFORM: - if (default_arg.operator Transform()==Transform()) { - default_arg_text=""; + if (default_arg.operator Transform() == Transform()) { + default_arg_text = ""; } - default_arg_text=Variant::get_type_name(default_arg.get_type())+"("+default_arg_text+")"; + default_arg_text = Variant::get_type_name(default_arg.get_type()) + "(" + default_arg_text + ")"; break; - case Variant::VECTOR2: // 5 + case Variant::VECTOR2: // 5 case Variant::RECT2: case Variant::VECTOR3: case Variant::PLANE: @@ -193,89 +186,90 @@ void DocDump::dump(const String& p_file) { case Variant::RAW_ARRAY: case Variant::INT_ARRAY: case Variant::REAL_ARRAY: - case Variant::STRING_ARRAY: //25 + case Variant::STRING_ARRAY: //25 case Variant::VECTOR3_ARRAY: case Variant::COLOR_ARRAY: - default_arg_text=Variant::get_type_name(default_arg.get_type())+"("+default_arg_text+")"; + default_arg_text = Variant::get_type_name(default_arg.get_type()) + "(" + default_arg_text + ")"; break; case Variant::OBJECT: case Variant::INPUT_EVENT: - case Variant::DICTIONARY: // 20 + case Variant::DICTIONARY: // 20 case Variant::ARRAY: case Variant::_RID: case Variant::IMAGE: - //case Variant::RESOURCE: + //case Variant::RESOURCE: - default_arg_text=Variant::get_type_name(default_arg.get_type())+"()"; + default_arg_text = Variant::get_type_name(default_arg.get_type()) + "()"; break; default: {} - } - - - - _write_string(f,3,""); + _write_string(f, 3, ""); } else - _write_string(f,3,""); + _write_string(f, 3, ""); } - String hint; - switch(arginfo.hint) { - case PROPERTY_HINT_DIR: hint="A directory."; break; - case PROPERTY_HINT_RANGE: hint="Range - min: "+arginfo.hint_string.get_slice(",",0)+" max: "+arginfo.hint_string.get_slice(",",1)+" step: "+arginfo.hint_string.get_slice(",",2); break; - case PROPERTY_HINT_ENUM: hint="Values: "; for(int j=0;j0) hint+=", "; hint+=arginfo.hint_string.get_slice(",",j)+"="+itos(j); } break; - case PROPERTY_HINT_LENGTH: hint="Length: "+arginfo.hint_string; break; - case PROPERTY_HINT_FLAGS: hint="Values: "; for(int j=0;j0) hint+=", "; hint+=arginfo.hint_string.get_slice(",",j)+"="+itos(1< 0) hint += ", "; + hint += arginfo.hint_string.get_slice(",", j) + "=" + itos(j); + } + break; + case PROPERTY_HINT_LENGTH: hint = "Length: " + arginfo.hint_string; break; + case PROPERTY_HINT_FLAGS: + hint = "Values: "; + for (int j = 0; j < arginfo.hint_string.get_slice_count(","); j++) { + if (j > 0) hint += ", "; + hint += arginfo.hint_string.get_slice(",", j) + "=" + itos(1 << j); + } + break; + case PROPERTY_HINT_FILE: hint = "A file:"; break; default: {} - //case PROPERTY_HINT_RESOURCE_TYPE: hint="Type: "+arginfo.hint_string; break; + //case PROPERTY_HINT_RESOURCE_TYPE: hint="Type: "+arginfo.hint_string; break; }; - if (hint!="") - _write_string(f,4,hint); - - _write_string(f,3,(i==-1)?"":""); - + if (hint != "") + _write_string(f, 4, hint); + _write_string(f, 3, (i == -1) ? "" : ""); } - _write_string(f,3,""); - _write_string(f,3,""); - - _write_string(f,2,""); + _write_string(f, 3, ""); + _write_string(f, 3, ""); + _write_string(f, 2, ""); } - - _write_string(f,1,""); + _write_string(f, 1, ""); List signal_list; - ObjectTypeDB::get_signal_list(name,&signal_list,true); + ObjectTypeDB::get_signal_list(name, &signal_list, true); if (signal_list.size()) { - _write_string(f,1,""); - for(List::Element *EV=signal_list.front();EV;EV=EV->next()) { + _write_string(f, 1, ""); + for (List::Element *EV = signal_list.front(); EV; EV = EV->next()) { - _write_string(f,2,"get().name+"\">"); - for(int i=0;iget().arguments.size();i++) { - PropertyInfo arginfo=EV->get().arguments[i]; - _write_string(f,3,""); - _write_string(f,3,""); + _write_string(f, 2, "get().name + "\">"); + for (int i = 0; i < EV->get().arguments.size(); i++) { + PropertyInfo arginfo = EV->get().arguments[i]; + _write_string(f, 3, ""); + _write_string(f, 3, ""); } - _write_string(f,3,""); - _write_string(f,3,""); + _write_string(f, 3, ""); + _write_string(f, 3, ""); - _write_string(f,2,""); + _write_string(f, 2, ""); } - _write_string(f,1,""); + _write_string(f, 1, ""); } - - _write_string(f,1,""); - + _write_string(f, 1, ""); List constant_list; ObjectTypeDB::get_integer_constant_list(name, &constant_list, true); @@ -284,29 +278,28 @@ void DocDump::dump(const String& p_file) { List<_ConstantSort> constant_sort; - for(List::Element *E=constant_list.front();E;E=E->next()) { + for (List::Element *E = constant_list.front(); E; E = E->next()) { _ConstantSort cs; - cs.name=E->get(); - cs.value=ObjectTypeDB::get_integer_constant(name, E->get()); + cs.name = E->get(); + cs.value = ObjectTypeDB::get_integer_constant(name, E->get()); constant_sort.push_back(cs); } constant_sort.sort(); - for(List<_ConstantSort>::Element *E=constant_sort.front();E;E=E->next()) { + for (List<_ConstantSort>::Element *E = constant_sort.front(); E; E = E->next()) { - _write_string(f,2,"get().name+"\" value=\""+itos(E->get().value)+"\">"); - _write_string(f,2,""); + _write_string(f, 2, "get().name + "\" value=\"" + itos(E->get().value) + "\">"); + _write_string(f, 2, ""); } - _write_string(f,1,""); - _write_string(f,0,""); + _write_string(f, 1, ""); + _write_string(f, 0, ""); class_list.erase(name); } - _write_string(f,0,""); + _write_string(f, 0, ""); f->close(); memdelete(f); - } diff --git a/editor/doc/doc_dump.h b/editor/doc/doc_dump.h index 4577af078..8e3788e78 100644 --- a/editor/doc/doc_dump.h +++ b/editor/doc/doc_dump.h @@ -33,9 +33,7 @@ class DocDump { public: - - static void dump(const String& p_file); - + static void dump(const String &p_file); }; #endif // DOC_DUMP_H -- cgit v1.2.3-70-g09d2