NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd78d452

committed

Improve Assert output

If an assertion expression contained a macro, the failed assertionmessage would print the expanded macro, which is usually unhelpful andconfusing. Restructure the Assert macros to not expand any macroswhen constructing the failure message.This also fixes that the existing output for Assert et al. showsthe *inverted* condition, which is also confusing and not howassertions usually work.Discussion:https://www.postgresql.org/message-id/flat/6c68efe3-117a-dcc1-73d4-18ba1ec532e2%402ndquadrant.com

1 parentf7db0ac commitd78d452Copy full SHA for d78d452

File tree

1 file changed

+20

-6

lines changed

src/include
- c.h

1 file changed

+20

-6

lines changed

`‎src/include/c.h`

Lines changed: 20 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ typedef NameData *Name;`
`755`	`755`	`#defineTrap(condition,errorType) \`
`756`	`756`	`do { \`
`757`	`757`	`if (condition) \`
`758`		`-ExceptionalCondition(CppAsString(condition), (errorType), \`
	`758`	`+ExceptionalCondition(#condition, (errorType), \`
`759`	`759`	`__FILE__, __LINE__); \`
`760`	`760`	`} while (0)`
`761`	`761`
`@@ -768,20 +768,34 @@ typedef NameData *Name;`
`768`	`768`	`*/`
`769`	`769`	`#defineTrapMacro(condition,errorType) \`
`770`	`770`	`((bool) (! (condition) \|\| \`
`771`		`- (ExceptionalCondition(CppAsString(condition), (errorType), \`
	`771`	`+ (ExceptionalCondition(#condition, (errorType), \`
`772`	`772`	`__FILE__, __LINE__), 0)))`
`773`	`773`
`774`	`774`	`#defineAssert(condition) \`
`775`		`-Trap(!(condition), "FailedAssertion")`
	`775`	`+do { \`
	`776`	`+if (!(condition)) \`
	`777`	`+ExceptionalCondition(#condition, "FailedAssertion", \`
	`778`	`+ __FILE__, __LINE__); \`
	`779`	`+} while (0)`
`776`	`780`
`777`	`781`	`#defineAssertMacro(condition) \`
`778`		`-((void) TrapMacro(!(condition), "FailedAssertion"))`
	`782`	`+((void) ((condition) \|\| \`
	`783`	`+ (ExceptionalCondition(#condition, "FailedAssertion", \`
	`784`	`+ __FILE__, __LINE__), 0)))`
`779`	`785`
`780`	`786`	`#defineAssertArg(condition) \`
`781`		`-Trap(!(condition), "BadArgument")`
	`787`	`+do { \`
	`788`	`+if (!(condition)) \`
	`789`	`+ExceptionalCondition(#condition, "BadArgument", \`
	`790`	`+ __FILE__, __LINE__); \`
	`791`	`+} while (0)`
`782`	`792`
`783`	`793`	`#defineAssertState(condition) \`
`784`		`-Trap(!(condition), "BadState")`
	`794`	`+do { \`
	`795`	`+if (!(condition)) \`
	`796`	`+ExceptionalCondition(#condition, "BadState", \`
	`797`	`+ __FILE__, __LINE__); \`
	`798`	`+} while (0)`
`785`	`799`
`786`	`800`	`/*`
`787`	`801`	* Check that `ptr' is `bndr' aligned.

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd78d452

File tree

1 file changed

1 file changed

`‎src/include/c.h`

0 commit comments