Skip to content
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

Jump to bottom

[php8] WIP: Enum implementation #730

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

[php8] WIP: Enum implementation #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a8de31
Initial implementation of match
mkornaukhov03 Jan 11, 2023
e1370a4
Add tests from previous attempt; fix corner cases
mkornaukhov03 Jan 12, 2023
4b74386
Complete task
mkornaukhov03 Jan 16, 2023
35154d3
Add new test; remove debug prints; add assertions
mkornaukhov03 Jan 16, 2023
cf27aba
Small fix
mkornaukhov03 Jan 16, 2023
7dc0742
Initial implementation of match
mkornaukhov03 Jan 11, 2023
9c6f089
Initial implementation
mkornaukhov03 Jan 21, 2023
e84971a
Add tests
mkornaukhov03 Jan 21, 2023
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
36 changes: 31 additions & 5 deletions compiler/code-gen/vertex-compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "compiler/code-gen/vertex-compiler.h"

#include "compiler/inferring/primitive-type.h"
#include <iterator>
#include <unordered_map>

Expand Down Expand Up @@ -1119,8 +1120,12 @@ void compile_switch_str(VertexAdaptor<op_switch> root, CodeGenerator &W) {
auto temp_var_strval_of_condition = root->condition_on_switch();
auto temp_var_matched_with_a_case = root->matched_with_one_case();

// because we checked types before in case of match
const auto *const convert_function = root->is_match ? "" : "f$strval";


W << BEGIN;
W << temp_var_strval_of_condition << " = f$strval (" << root->condition() << ");" << NL;
W << temp_var_strval_of_condition << " = " << convert_function << "(" << root->condition() << ");" << NL;
W << temp_var_matched_with_a_case << " = false;" << NL;

W << "switch (" << temp_var_strval_of_condition << ".hash()) " << BEGIN;
Expand Down Expand Up @@ -1163,7 +1168,9 @@ void compile_switch_str(VertexAdaptor<op_switch> root, CodeGenerator &W) {
}

void compile_switch_int(VertexAdaptor<op_switch> root, CodeGenerator &W) {
W << "switch (f$intval (" << root->condition() << "))" << BEGIN;
// because we checked types before in case of match
const auto *const convert_function = root->is_match ? "" : "f$intval";
W << "switch (" << convert_function << " (" << root->condition() << "))" << BEGIN;

W << "static_cast<void>(" << root->condition_on_switch() << ");" << NL;
W << "static_cast<void>(" << root->matched_with_one_case() << ");" << NL;
Expand All @@ -1178,7 +1185,8 @@ void compile_switch_int(VertexAdaptor<op_switch> root, CodeGenerator &W) {
if (val->type() == op_int_const) {
const std::string &str = val.as<op_int_const>()->str_val;
W << str;
kphp_error(used.insert(str).second, fmt_format("Switch: repeated cases found [{}]", str));
const std::string op = root->is_match ? "Match" : "Switch";
kphp_error(used.insert(str).second, fmt_format("{}: repeated cases found [{}]", op, str));
} else {
kphp_assert(VertexUtil::is_const_int(val));
W << val;
Expand All @@ -1200,6 +1208,7 @@ void compile_switch_var(VertexAdaptor<op_switch> root, CodeGenerator &W) {

auto temp_var_condition_on_switch = root->condition_on_switch();
auto temp_var_matched_with_a_case = root->matched_with_one_case();
const auto *const eq_function = root->is_match ? "equals" : "eq2";

W << "do " << BEGIN;
W << temp_var_condition_on_switch << " = " << root->condition() << ";" << NL;
Expand All @@ -1211,7 +1220,7 @@ void compile_switch_var(VertexAdaptor<op_switch> root, CodeGenerator &W) {
VertexAdaptor<op_seq> cmd;
if (auto cs = one_case.try_as<op_case>()) {
cmd = cs->cmd();
W << "if (" << temp_var_matched_with_a_case << " || eq2(" << temp_var_condition_on_switch << ", " << cs->expr() << ")) " << BEGIN;
W << "if (" << temp_var_matched_with_a_case << " || " << eq_function << "(" << temp_var_condition_on_switch << ", " << cs->expr() << ")) " << BEGIN;
W << temp_var_matched_with_a_case << " = true;" << NL;
} else {
if (!default_case_is_the_last) {
Expand Down Expand Up @@ -1250,12 +1259,29 @@ void compile_switch(VertexAdaptor<op_switch> root, CodeGenerator &W) {

for (auto one_case : root->cases()) {
if (one_case->type() == op_default) {
kphp_error_return(!has_default, "Switch: several `default` cases found");
const std::string op = root->is_match ? "Match" : "Switch";
kphp_error_return(!has_default, op + ": several `default` cases found");
has_default = true;
continue;
}
}

if (root->is_match) {
const auto *const cond_type = tinf::get_type(root->condition());
if (!cond_type) {
compile_switch_var(root, W);
return;
}

if (root->kind == SwitchKind::StringSwitch && cond_type->get_real_ptype() == tp_string) {
compile_switch_str(root, W);
} else if (root->kind == SwitchKind::IntSwitch && cond_type->get_real_ptype() == tp_int) {
compile_switch_int(root, W);
} else {
compile_switch_var(root, W);
}
return;
}
if (root->kind == SwitchKind::StringSwitch) {
compile_switch_str(root, W);
} else if (root->kind == SwitchKind::IntSwitch) {
Expand Down
2 changes: 2 additions & 0 deletions compiler/debug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ std::string debugTokenName(TokenType t) {
{tok_as, "tok_as"},
{tok_case, "tok_case"},
{tok_switch, "tok_switch"},
{tok_match, "tok_match"},
{tok_class, "tok_class"},
{tok_interface, "tok_interface"},
{tok_trait, "tok_trait"},
{tok_enum, "tok_enum"},
{tok_extends, "tok_extends"},
{tok_implements, "tok_implements"},
{tok_namespace, "tok_namespace"},
Expand Down
Loading