diff --git a/src/kernel_services/ast_queries/cil.ml b/src/kernel_services/ast_queries/cil.ml index c8bfefe2bacdf4642dce5f9e57e6e74c9c769e83..6448005f8a5aeb68f557acfd7bb5ef6507445678 100644 --- a/src/kernel_services/ast_queries/cil.ml +++ b/src/kernel_services/ast_queries/cil.ml @@ -6197,9 +6197,9 @@ let mkBinOp ~loc op e1 e2 = (Mult|Div) -> doArithmetic () | (Mod|BAnd|BOr|BXor) -> doIntegralArithmetic () | LAnd | LOr -> - check_scalar "logical operator" e1 t1; - check_scalar "logical operator" e2 t2; - constFoldBinOp ~loc machdep op e1 e2 intType + check_scalar "logical operator" e1 t1; + check_scalar "logical operator" e2 t2; + constFoldBinOp ~loc machdep op e1 e2 intType | (Shiftlt|Shiftrt) -> (* ISO 6.5.7. Only integral promotions. The result * has the same type as the left hand side *) if msvcMode () then diff --git a/src/kernel_services/ast_queries/cil.mli b/src/kernel_services/ast_queries/cil.mli index b0dcdc46c5e094119cf1acc9068916856b1e888b..64a5b55a779e982ac5e1cd44d0269eaff07d47c4 100644 --- a/src/kernel_services/ast_queries/cil.mli +++ b/src/kernel_services/ast_queries/cil.mli @@ -548,13 +548,13 @@ val isArithmeticType: typ -> bool (** True if the argument is a scalar type (i.e. integral, enum, floating point or pointer - @since Frama-C+dev - *) + @since Frama-C+dev +*) val isScalarType: typ -> bool (** alias of isScalarType. @deprecated Frama-C+dev use isScalarType instead - *) +*) val isArithmeticOrPointerType: typ -> bool (** True if the argument is a logic arithmetic type (i.e. integer, enum or