From 7e077258c5799173b3a8d4289ea07e91934ae1c4 Mon Sep 17 00:00:00 2001 From: "Daniel J. Ramirez" Date: Tue, 3 May 2016 01:45:54 -0500 Subject: [PATCH] Fixed documentation generator for polymorphic functions (cherry picked from commit 57d0b784266f02c8f021d09f4f0bab911d894207) --- tools/doc/doc_data.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp index 3836fa710b6..0833001a2c0 100644 --- a/tools/doc/doc_data.cpp +++ b/tools/doc/doc_data.cpp @@ -61,6 +61,26 @@ void DocData::merge_from(const DocData& p_data) { continue; if (cf.methods[j].arguments.size()!=m.arguments.size()) continue; + // since polymorphic functions are allowed we need to check the type of + // the arguments so we make sure they are different. + int arg_count = cf.methods[j].arguments.size(); + bool arg_used[arg_count]; + 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) { + for (int l = 0; l < arg_count; ++l) + if (cf.methods[j].arguments[k].type == m.arguments[l].type && !arg_used[l]) { + arg_used[l] = true; + break; + } + } + bool not_the_same = false; + for (int l = 0; l < arg_count; ++l) + if (!arg_used[l]) // at least one of the arguments was different + not_the_same = true; + if (not_the_same) + continue; const MethodDoc &mf = cf.methods[j];