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

Helper function to convert tokens to passing_styles. #198

Merged
merged 2 commits into from
Jan 9, 2023
Merged

Helper function to convert tokens to passing_styles. #198

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0eac80
Helper function to convert tokens to passing_styles.
jbatez Jan 5, 2023
4956378
Merge branch 'main' of https://github.com/hsutter/cppfront
jbatez Jan 9, 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
94 changes: 34 additions & 60 deletions source/parse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,18 @@ struct expression_node
}
};

enum class passing_style { in=0, copy, inout, out, move, forward };
enum class passing_style { in=0, copy, inout, out, move, forward, invalid };
auto to_passing_style(token const& t) -> passing_style {
if (t.type() == lexeme::Identifier) {
if (t == "in" ) { return passing_style::in; }
if (t == "copy" ) { return passing_style::copy; }
if (t == "inout" ) { return passing_style::inout; }
if (t == "out" ) { return passing_style::out; }
if (t == "move" ) { return passing_style::move; }
if (t == "forward") { return passing_style::forward; }
}
return passing_style::invalid;
}
auto to_string_view(passing_style pass) -> std::string_view {
switch (pass) {
break;case passing_style::in : return "in";
Expand Down Expand Up @@ -1549,14 +1560,7 @@ class parser
return n;
}

if (curr().type() == lexeme::DecimalLiteral ||
curr().type() == lexeme::FloatLiteral ||
curr().type() == lexeme::StringLiteral ||
curr().type() == lexeme::CharacterLiteral ||
curr().type() == lexeme::BinaryLiteral ||
curr().type() == lexeme::HexadecimalLiteral
)
{
if (is_literal(curr().type())) {
n->expr = &curr();
next();
return n;
Expand Down Expand Up @@ -2047,16 +2051,11 @@ class parser
n->open_paren = open_paren;
n->inside_initializer = inside_initializer;

if (curr().type() == lexeme::Identifier && curr() == "out") {
pass = passing_style::out;
next();
}
else if (curr().type() == lexeme::Identifier && curr() == "move") {
pass = passing_style::move;
next();
}
else if (curr().type() == lexeme::Identifier && curr() == "forward") {
pass = passing_style::forward;
if (auto dir = to_passing_style(curr());
dir == passing_style::out || dir == passing_style::move || dir == passing_style::forward
)
{
pass = dir;
next();
}
auto x = expression();
Expand All @@ -2072,16 +2071,11 @@ class parser
while (curr().type() == lexeme::Comma) {
next();
pass = passing_style::in;
if (curr().type() == lexeme::Identifier && curr() == "out") {
pass = passing_style::out;
next();
}
else if (curr().type() == lexeme::Identifier && curr() == "move") {
pass = passing_style::move;
next();
}
else if (curr().type() == lexeme::Identifier && curr() == "forward") {
pass = passing_style::forward;
if (auto dir = to_passing_style(curr());
dir == passing_style::out || dir == passing_style::move || dir == passing_style::forward
)
{
pass = dir;
next();
}
auto expr = expression();
Expand Down Expand Up @@ -2959,51 +2953,31 @@ class parser
n->pass = returns ? passing_style::out : passing_style::in;
n->pos = curr().position();

if (curr().type() == lexeme::Identifier) {
if (curr() == "in") {
if (returns) {
if (auto dir = to_passing_style(curr()); dir != passing_style::invalid) {
if (returns) {
if (dir == passing_style::in) {
error("a return value cannot be 'in'");
return {};
}
n->pass = passing_style::in;
next();
}
else if (curr() == "copy") {
if (returns) {
if (dir == passing_style::copy) {
error("a return value cannot be 'copy'");
return {};
}
n->pass = passing_style::copy;
next();
}
else if (curr() == "inout") {
if (returns) {
if (dir == passing_style::inout) {
error("a return value cannot be 'inout'");
return {};
}
n->pass = passing_style::inout;
next();
}
else if (curr() == "out") {
if (!named) {
error("(temporary alpha limitation) an unnamed function cannot have an 'out' parameter");
return {};
}
n->pass = passing_style::out;
next();
}
else if (curr() == "move") {
if (returns) {
if (dir == passing_style::move) {
error("a return value cannot be 'move' (it is implicitly 'move'-out)");
return {};
}
n->pass = passing_style::move;
next();
}
else if (curr() == "forward") {
n->pass = passing_style::forward;
next();
if (!named && dir == passing_style::out) {
error("(temporary alpha limitation) an unnamed function cannot have an 'out' parameter");
return {};
}
n->pass = dir;
next();
}

if (curr().type() == lexeme::Identifier) {
Expand Down