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.

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

Parse an expression to initialize an object, not any statement #765

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions regression-tests/pure2-object-init-expression.cpp2
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
v : std::any = 12;

main: () = {
// object initializer must be an expression, not a statement
// inspect only allows a result type when it is an expression
i: int = inspect v -> int {
is 12 = 12;
is _ = 0;
};
[[assert: i == 12]]

// inference
s := inspect v -> std::string {
is 5 = "five";
is int = "some other integer";
is _ = "not an integer";
};
[[assert: s == "some other integer"]]
}
38 changes: 38 additions & 0 deletions regression-tests/test-results/pure2-object-init-expression.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@


//=== Cpp2 type declarations ====================================================


#include "cpp2util.h"



//=== Cpp2 type definitions and function declarations ===========================

extern std::any v;

auto main() -> int;


//=== Cpp2 function definitions =================================================

std::any v {12};

auto main() -> int{
// object initializer must be an expression, not a statement
// inspect only allows a result type when it is an expression
int i {[&] () -> int { auto&& _expr = v;
if (cpp2::is(_expr, 12)) { if constexpr( requires{12;} ) if constexpr( std::is_convertible_v<CPP2_TYPEOF((12)),int> ) return 12; else return int{}; else return int{}; }
else return 0; }
()};
cpp2::Default.expects(std::move(i) == 12, "");

// inference
auto s {[&] () -> std::string { auto&& _expr = v;
if (cpp2::is(_expr, 5)) { if constexpr( requires{"five";} ) if constexpr( std::is_convertible_v<CPP2_TYPEOF(("five")),std::string> ) return "five"; else return std::string{}; else return std::string{}; }
else if (cpp2::is<int>(_expr)) { if constexpr( requires{"some other integer";} ) if constexpr( std::is_convertible_v<CPP2_TYPEOF(("some other integer")),std::string> ) return "some other integer"; else return std::string{}; else return std::string{}; }
else return "not an integer"; }
()};
cpp2::Default.expects(std::move(s) == "some other integer", "");
}

14 changes: 13 additions & 1 deletion source/parse.h
Original file line number Diff line number Diff line change
Expand Up @@ -8025,7 +8025,19 @@ class parser
}
}

if (!(n->initializer = statement(semicolon_required, n->equal_sign))) {
if (n->is_object()) {
// An object initializer must be an expression
auto es = expression_statement(semicolon_required);
if (es) {
n->initializer = std::make_unique<statement_node>();
n->initializer->statement = std::move(es);
} else {
error("ill-formed object initializer", true, {}, true);
next();
return {};
}
}
else if (!(n->initializer = statement(semicolon_required, n->equal_sign))) {
error(
"ill-formed initializer",
true, {}, true
Expand Down
17 changes: 6 additions & 11 deletions source/sema.h
Original file line number Diff line number Diff line change
Expand Up @@ -1018,18 +1018,13 @@ class sema
}

// An object initializer must be an expression
if (
n.is_object()
&& n.initializer
&& !n.initializer->is_expression()
assert(
!n.is_object()
|| (
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

parens don't add anything here.

!n.initializer
|| n.initializer->is_expression()
)
{
errors.emplace_back(
n.position(),
"an object initializer must be an expression"
);
return false;
}
);

// A namespace must be initialized with a compound expression
if (
Expand Down