C++: Rename crement operations

MathiasVP · MathiasVP · commit 46421efcefb6 · 2019-12-23T10:41:14.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/exprs/ArithmeticOperation.qll b/cpp/ql/src/semmle/code/cpp/exprs/ArithmeticOperation.qll
@@ -58,7 +58,7 @@ class ConjugationExpr extends UnaryArithmeticOperation, @conjugation {
  * Note that this does not include calls to user-defined `operator++`
  * or `operator--`.
  */
- class CrementOperation extends UnaryArithmeticOperation, @crement_op_expr {
+ class CrementOperation extends UnaryArithmeticOperation, @crement_expr {
   override predicate mayBeImpure() { any() }
 
   override predicate mayBeGloballyImpure() {
@@ -75,28 +75,28 @@ class ConjugationExpr extends UnaryArithmeticOperation, @conjugation {
  *
  * Note that this does not include calls to user-defined `operator++`.
  */
- class IncrementOperation extends CrementOperation, @incr_oper_expr { }
+ class IncrementOperation extends CrementOperation, @increment_expr { }
 
 /**
  * A C/C++ `--` expression (either prefix or postfix).
  *
  * Note that this does not include calls to user-defined `operator--`.
  */
- class DecrementOperation extends CrementOperation, @decr_oper_expr { }
+ class DecrementOperation extends CrementOperation, @decrement_expr { }
 
 /**
  * A C/C++ `++` or `--` prefix expression.
  *
  * Note that this does not include calls to user-defined operators.
  */
-class PrefixCrementOperation extends CrementOperation, @prefix_crement_oper_expr { }
+class PrefixCrementOperation extends CrementOperation, @prefix_crement_expr { }
 
 /**
  * A C/C++ `++` or `--` postfix expression.
  *
  * Note that this does not include calls to user-defined operators.
  */
-class PostfixCrementOperation extends CrementOperation, @postfix_crement_oper_expr { }
+class PostfixCrementOperation extends CrementOperation, @postfix_crement_expr { }
 
 /**
  * A C/C++ prefix increment expression, as in `++x`.
diff --git a/cpp/ql/src/semmlecode.cpp.dbscheme b/cpp/ql/src/semmlecode.cpp.dbscheme
@@ -1191,17 +1191,17 @@ funbind(
                     | @delete_array_expr;
 
 
-@prefix_crement_oper_expr = @preincrexpr | @predecrexpr
+@prefix_crement_expr = @preincrexpr | @predecrexpr
 
-@postfix_crement_oper_expr = @postincrexpr | @postdecrexpr
+@postfix_crement_expr = @postincrexpr | @postdecrexpr
 
-@incr_oper_expr = @preincrexpr | @postincrexpr
+@increment_expr = @preincrexpr | @postincrexpr
 
-@decr_oper_expr = @predecrexpr | @postdecrexpr
+@decrement_expr = @predecrexpr | @postdecrexpr
 
-@crement_op_expr = @incr_oper_expr | @decr_oper_expr
+@crement_expr = @increment_expr | @decrement_expr
 
-@un_arith_op_expr = @arithnegexpr | @unaryplusexpr | @conjugation | @realpartexpr | @imagpartexpr | @crement_op_expr
+@un_arith_op_expr = @arithnegexpr | @unaryplusexpr | @conjugation | @realpartexpr | @imagpartexpr | @crement_expr
 
 @un_bitwise_op_expr = @complementexpr
 
