Skip to content

fix overload method generation #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix overload method generation #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions src/ast_method.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const int Method::FLAG_WITH_C_STRING = 0x0002;
const int Method::FLAG_AS_GLOBAL_REF = 0x0004;
const int Method::FLAG_AS_C_BUFFER = 0x0008;
const int Method::FLAG_SIMPLE_NAME = 0x0010;
MethodNameMap Method::s_method_name_id_map;


j4a::string Method::get_c_jni_sign()
{
Expand All @@ -51,6 +53,7 @@ j4a::string Method::get_c_jni_id_name()
{
std::ostringstream os;
os << "method_" << get_name();
_build_c_func_overload_statements(os, 0);
return os;
}

Expand Down Expand Up @@ -128,6 +131,8 @@ void Method::_build_c_func_name(std::ostream &oos, int flags)
os << "__";
os << get_name();

_build_c_func_overload_statements(os, flags);

if (flags & FLAG_WITH_C_STRING) {
os << "__withCString";
}
Expand Down Expand Up @@ -158,6 +163,53 @@ void Method::_build_c_func_name(std::ostream &oos, int flags)
oos << os.str();
}

void Method::_build_c_func_overload_statements(std::ostream &oos, int flags)
{
std::ostringstream os_name, os_sign, os_string;
os_name << get_this_class()->get_c_class_name();
os_name << "__";
os_name << get_name();

ArgumentList::iterator begin = get_argument_list()->begin();
ArgumentList::iterator end = get_argument_list()->end();
os_sign << get_name();
os_sign << "(";
for (NULL; begin != end; ++begin) {
os_sign << (*begin)->get_type()->get_c_sign_in_method();
if (std::distance(begin,end) != 1) {
os_sign << ", ";
}
}
os_sign << ")";

std::string id = "";
bool need_insert_new_map = false;
MethodNameMap::const_iterator name_map = s_method_name_id_map.find(os_name.str());
if (name_map != s_method_name_id_map.end()) {
MethodSignIdMap sign_id_map = name_map->second;
MethodSignIdMap::const_iterator sign_map_item = sign_id_map.find(os_sign.str());
if (sign_map_item != sign_id_map.end()) {
id = sign_map_item->second;
} else {
id = std::to_string(sign_id_map.size() + 1);
sign_id_map.insert(std::pair<std::string, std::string>(os_sign.str(), id));
}
} else {
id = "1";
need_insert_new_map = true;
}

if (need_insert_new_map) {
MethodSignIdMap sub_map;
sub_map.insert(std::pair<std::string, std::string>(os_sign.str(), id));
s_method_name_id_map.insert(std::pair<std::string, MethodSignIdMap>(os_name.str(), sub_map));
}

if (id != "" && id != "1") {
oos << "__" << id;
}
}

void Method::_build_c_func_decl_statement(std::ostream &os, int flags)
{
if (flags & FLAG_AS_C_BUFFER) {
Expand Down
6 changes: 6 additions & 0 deletions src/ast_method.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@

NS_AST_BEGIN

typedef std::map<std::string, std::string> MethodSignIdMap;
typedef std::map<std::string, MethodSignIdMap> MethodNameMap;

class Method: public Member
{
public:
Expand All @@ -52,6 +55,8 @@ class Method: public Member
static const int FLAG_AS_C_BUFFER;
static const int FLAG_SIMPLE_NAME;

static MethodNameMap s_method_name_id_map;

bool _has_string_arg();

void _build_class_id(std::ostream &os);
Expand All @@ -64,6 +69,7 @@ class Method: public Member
void _build_c_func_impl_void_type_statement(std::ostream &os, int flags);
void _build_c_func_impl_reference_type_statement(std::ostream &os, int flags);
void _build_c_func_impl_basic_type_statement(std::ostream &os, int flags);
void _build_c_func_overload_statements(std::ostream &os, int flags);

public:
virtual void build_c_func_decl(std::ostream &os) override;
Expand Down