Skip to content

Allow trailing comma in assert #1121

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

Merged
hsutter merged 1 commit into from
Jun 20, 2024
Merged

Allow trailing comma in assert #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions regression-tests/pure2-trailing-comma-assert.cpp2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
main: () = {
assert(true, "some_potentially_long_string",);
}
Empty file added regression-tests/test-results/apple-clang-14-c++2b/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/apple-clang-14-c++2b/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/apple-clang-15-c++2b/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/apple-clang-15-c++2b/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/clang-12-c++20/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/clang-12-c++20/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
Empty file added ...ession-tests/test-results/clang-15-c++20-libcpp/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/clang-15-c++20-libcpp/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/clang-15-c++20/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/clang-15-c++20/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/clang-18-c++20/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/clang-18-c++20/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/gcc-10-c++20/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/gcc-10-c++20/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/gcc-13-c++2b/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/gcc-13-c++2b/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/gcc-14-c++2b/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/gcc-14-c++2b/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/msvc-2022-c++20/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/msvc-2022-c++20/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/msvc-2022-c++latest/pure2-trailing-comma-assert.cpp.execution
View file
Open in desktop
Empty file.
Empty file added regression-tests/test-results/msvc-2022-c++latest/pure2-trailing-comma-assert.cpp.output
View file
Open in desktop
Empty file.
24 changes: 24 additions & 0 deletions regression-tests/test-results/pure2-trailing-comma-assert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

#define CPP2_IMPORT_STD Yes

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


#include "cpp2util.h"

#line 1 "pure2-trailing-comma-assert.cpp2"


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

#line 1 "pure2-trailing-comma-assert.cpp2"
auto main() -> int;

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

#line 1 "pure2-trailing-comma-assert.cpp2"
auto main() -> int{
#line 2 "pure2-trailing-comma-assert.cpp2"
if (cpp2::cpp2_default.is_active() && !(true) ) { cpp2::cpp2_default.report_violation(CPP2_CONTRACT_MSG("some_potentially_long_string")); }
}

2 changes: 2 additions & 0 deletions regression-tests/test-results/pure2-trailing-comma-assert.cpp2.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pure2-trailing-comma-assert.cpp2... ok (all Cpp2, passes safety checks)

Empty file added regression-tests/test-results/pure2-trailing-comma-assert.out
View file
Open in desktop
Empty file.
5 changes: 5 additions & 0 deletions source/parse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8006,6 +8006,11 @@ class parser
}
}

// Consume trailing comma
if (curr().type() == lexeme::Comma) {
next();
}

if (curr().type() != lexeme::RightParen) {
error("expected ')' at the end of the contract");
return {};
Expand Down