[Solidity] Tuple Support #1647
[Solidity] Tuple Support #1647
Conversation
| // e.g. "sol:@C@BASE@tuple#14" | ||
| std::string label = std::to_string(struct_def["id"].get<int>()); | ||
| name = "tuple#" + label; | ||
| id = "sol:@C@" + current_contractName + "@" + name; |
There was a problem hiding this comment.
maybe add an assertion assert(!current_contractName.empty());
|
|
||
| //Components consist of our variables used in our tuple | ||
| nlohmann::json ast_nodes; | ||
| ast_nodes = struct_def["components"]; |
There was a problem hiding this comment.
maybe check assert(struct_def.contains("components"));
| // } | ||
|
|
||
| for (nlohmann::json::iterator itr = ast_nodes.begin(); itr != ast_nodes.end(); | ||
| ++itr) |
There was a problem hiding this comment.
I feel like you should use get_expr() to parse each component. See CallExprClass => structConstructorCall:
// popluate components
for (unsigned int i = 0; i < inits.operands().size() && i < args.size();
i++)
{
exprt init;
if (get_expr(args.at(i), members.at(i)["typeDescriptions"], init))
return true;
const struct_union_typet::componentt *c =
&to_struct_type(t).components().at(i);
typet elem_type = c->type();
solidity_gen_typecast(ns, init, elem_type);
inits.operands().at(i) = init;
}There was a problem hiding this comment.
I think this is more suited towards RHS, since its calling a previous initialized struct and populating the values. But this is definitely useful for my current implementation, which is LHS. Thank you for the help!
| @@ -2602,7 +2830,7 @@ bool solidity_convertert::get_func_decl_ref( | |||
| exprt &new_expr) | |||
| { | |||
| // Function to configure new_expr that has a +ve referenced id, referring to a function declaration | |||
| // This allow to get func symbol before we add it to the symbol table | |||
| // This allow to get func syfmbol before we add it to the symbol table | |||
| return output; | ||
| } | ||
|
|
||
| std::vector<nlohmann::json> solidity_convertert::make_struct_elementary_types( |
There was a problem hiding this comment.
I think you can obtain the type info in the typeDescriptions node in each component, right?
You can do something like:
if (get_expr(args.at(i), members.at(i)["typeDescriptions"], init))
return true;There was a problem hiding this comment.
I have yet to delete this function in case I may use it in the future for an unknown reason. I will delete it shortly
| std::string label = std::to_string(expr["id"].get<int>()); | ||
| std::string name, id; | ||
| name = "tuple#" + label; | ||
| id = "sol:@C@" + current_contractName + "@" + name; |
| // e.g. (uint age, uint money) = (....); | ||
| if(context.find_symbol(id) != nullptr) | ||
| { | ||
| std::cout << "Could not find symbol" << std::endl; |
There was a problem hiding this comment.
Maybe just log_error
| @@ -40,7 +41,7 @@ solidity_convertert::solidity_convertert( | |||
|
|
|||
| bool solidity_convertert::convert() | |||
| { | |||
| // This function consists of two parts: | |||
| // This function consists of two output: | |||
There was a problem hiding this comment.
I think we keep the word "parts"
|
Overall, it looks good. Just some small comments:
contract Base
{
uint x;
bool y;
constructor() { (x,y) = (1,true); }
}
contract Derived is Base
{
function test() public
{
assert(y == true);
}
} |
|
Changed as suggested. Thanks for the advice, @lucasccordeiro ! |
|
Thanks for submitting this PR, @JacobYiu and @ChenfengWei0. Great work! |
No description provided.