From b2b112d703cb80cd4cb1d837ddab6b01479ec594 Mon Sep 17 00:00:00 2001 From: Bastiaan Olij Date: Sun, 7 Apr 2019 21:26:31 +1000 Subject: [PATCH] Sort data exported to the api.json file for GDNative (cherry picked from commit 0d2f3f4f50d3975a9dba3d9ab31782848d60cd9a) --- .../gdnative/nativescript/api_generator.cpp | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/modules/gdnative/nativescript/api_generator.cpp b/modules/gdnative/nativescript/api_generator.cpp index 4577c7327ab..e0cf990f838 100644 --- a/modules/gdnative/nativescript/api_generator.cpp +++ b/modules/gdnative/nativescript/api_generator.cpp @@ -138,6 +138,34 @@ static String get_type_name(const PropertyInfo &info) { return Variant::get_type_name(info.type); } +/* + * Some comparison helper functions we need + */ + +struct MethodInfoComparator { + StringName::AlphCompare compare; + bool operator()(const MethodInfo &p_a, const MethodInfo &p_b) const { + + return compare(p_a.name, p_b.name); + } +}; + +struct PropertyInfoComparator { + StringName::AlphCompare compare; + bool operator()(const PropertyInfo &p_a, const PropertyInfo &p_b) const { + + return compare(p_a.name, p_b.name); + } +}; + +struct ConstantAPIComparator { + NoCaseComparator compare; + bool operator()(const ConstantAPI &p_a, const ConstantAPI &p_b) const { + + return compare(p_a.constant_name, p_b.constant_name); + } +}; + /* * Reads the entire Godot API to a list */ @@ -147,6 +175,7 @@ List generate_c_api_classes() { List classes; ClassDB::get_class_list(&classes); + classes.sort_custom(); // Register global constants as a fake GlobalConstants singleton class { @@ -162,6 +191,7 @@ List generate_c_api_classes() { constant_api.constant_value = GlobalConstants::get_global_constant_value(i); global_constants_api.constants.push_back(constant_api); } + global_constants_api.constants.sort_custom(); api.push_back(global_constants_api); } @@ -193,6 +223,7 @@ List generate_c_api_classes() { { List constant; ClassDB::get_integer_constant_list(class_name, &constant, true); + constant.sort_custom(); for (List::Element *c = constant.front(); c != NULL; c = c->next()) { ConstantAPI constant_api; constant_api.constant_name = c->get(); @@ -206,6 +237,7 @@ List generate_c_api_classes() { { List signals_; ClassDB::get_signal_list(class_name, &signals_, true); + signals_.sort_custom(); for (int i = 0; i < signals_.size(); i++) { SignalAPI signal; @@ -245,6 +277,7 @@ List generate_c_api_classes() { { List properties; ClassDB::get_property_list(class_name, &properties, true); + properties.sort_custom(); for (List::Element *p = properties.front(); p != NULL; p = p->next()) { PropertyAPI property_api; @@ -272,6 +305,7 @@ List generate_c_api_classes() { { List methods; ClassDB::get_method_list(class_name, &methods, true); + methods.sort_custom(); for (List::Element *m = methods.front(); m != NULL; m = m->next()) { MethodAPI method_api;