Skip to content

Commit

Permalink
tdtl: always recalc number of simple constructors.
Browse files Browse the repository at this point in the history
GitOrigin-RevId: dcc2c48f29d8a8f039bb53ec69c8b3076b153608
  • Loading branch information
levlam committed Oct 16, 2020
1 parent b03e0a8 commit 7b4afb7
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions tdtl/td/tl/tl_generate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -483,15 +483,13 @@ void write_tl(const tl_config &config, tl_outputer &out, const TL_writer &w) {
std::size_t types_n = config.get_type_count();
std::size_t functions_n = config.get_function_count();

bool found_complex = false;
for (std::size_t type = 0; type < types_n; type++) {
tl_type *t = config.get_type_by_num(type);
assert(t->constructors_num == t->constructors.size());
if (t->constructors_num == 0) { // built-in dummy types
if (t->name == "Type") {
assert(t->id == ID_VAR_TYPE);
t->flags |= FLAG_COMPLEX;
found_complex = true;
}
continue;
}
Expand Down Expand Up @@ -529,7 +527,6 @@ void write_tl(const tl_config &config, tl_outputer &out, const TL_writer &w) {
b.exist_var_num != -1) {
if (!w.is_built_in_complex_type(t->name)) {
t->flags |= FLAG_COMPLEX;
found_complex = true;
}
} else {
assert(b_arg_type == NODE_TYPE_TYPE);
Expand All @@ -549,14 +546,13 @@ void write_tl(const tl_config &config, tl_outputer &out, const TL_writer &w) {
if (main_type == NODE_TYPE_VAR_TYPE) {
if (!w.is_built_in_complex_type(t->name)) {
t->flags |= FLAG_COMPLEX;
found_complex = true;
}
}
}
}

while (found_complex) {
found_complex = false;
while (true) {
bool found_complex = false;
for (std::size_t type = 0; type < types_n; type++) {
tl_type *t = config.get_type_by_num(type);
if (t->constructors_num == 0 || w.is_built_in_complex_type(t->name)) { // built-in dummy or complex types
Expand All @@ -576,6 +572,9 @@ void write_tl(const tl_config &config, tl_outputer &out, const TL_writer &w) {
// std::fprintf(stderr, "Found complex %s\n", t->name.c_str());
}
}
if (!found_complex) {
break;
}
}

std::set<std::string> request_types;
Expand Down

0 comments on commit 7b4afb7

Please sign in to comment.