clang-plugin: Handle additional Expr types in the assertion extracter

1 files changed, 20 insertions, 0 deletions

diff --git a/clang-plugin/assertion-extracter.cpp b/clang-plugin/assertion-extracter.cpp
index 6cac6c9..2866849 100644
--- a/clang-plugin/assertion-extracter.cpp
+++ b/clang-plugin/assertion-extracter.cpp
@@ -369,6 +369,14 @@ AssertionExtracter::is_assertion_stmt (Stmt& stmt, const ASTContext& context)
 			                context.getLogicalOperationType (),
 			                SourceLocation ());
 	}
+	case Stmt::StmtClass::IntegerLiteralClass: {
+		/* Handle an integer literal. This doesn’t modify program state,
+		 * and evaluates directly to a boolean.
+		 * Transformations:
+		 *     0 ↦ FALSE
+		 *     I ↦ TRUE */
+		return dyn_cast<Expr> (&stmt);
+	}
 	case Stmt::StmtClass::ParenExprClass: {
 		/* Handle a parenthesised expression.
 		 * Transformations:
@@ -675,6 +683,7 @@ _assertion_is_gobject_type_check (Expr& assertion_expr,
 	case Expr::IntegerLiteralClass:
 	case Expr::BinaryOperatorClass:
 	case Expr::UnaryOperatorClass:
+	case Expr::ConditionalOperatorClass:
 	case Expr::CallExprClass:
 	case Expr::ImplicitCastExprClass: {
 		/* These can’t be type checks. */
@@ -766,6 +775,17 @@ _assertion_is_explicit_nonnull_check (Expr& assertion_expr,
 		 */
 		return 0;
 	}
+	case Expr::ConditionalOperatorClass: {
+		/* A conditional operator. For the moment, assume this isn’t a
+		 * non-null check.
+		 *
+		 * FIXME: In the future, define a proper program transformation
+		 * to check for non-null checks, since we could have expressions
+		 * like:
+		 *     (x == NULL) ? TRUE : FALSE
+		 */
+		return 0;
+	}
 	case Expr::CStyleCastExprClass:
 	case Expr::ImplicitCastExprClass: {
 		/* A (explicit or implicit) cast. This can either be: