Introduce base class for branching and conditional directives

tamasvajk · tamasvajk · commit 2b7cc1575765 · 2021-02-04T08:42:38.000+01:00
diff --git a/csharp/ql/src/semmle/code/csharp/Preprocessor.qll b/csharp/ql/src/semmle/code/csharp/Preprocessor.qll
@@ -255,7 +255,7 @@ class EndRegionDirective extends PreprocessorDirective, @directive_endregion {
  * A branching preprocessor directive, such as `IfDirective`, `ElifDirective`, or
  * `ElseDirective`.
  */
-class BranchDirective extends PreprocessorDirective {
+class BranchDirective extends PreprocessorDirective, @branch_directive {
   /** Holds if the branch is taken by the preprocessor. */
   predicate branchTaken() { none() }
 }
@@ -264,7 +264,7 @@ class BranchDirective extends PreprocessorDirective {
  * A preprocessor directive with a branching condition, such as `IfDirective` or
  * `ElifDirective`.
  */
-class ConditionalDirective extends BranchDirective {
+class ConditionalDirective extends BranchDirective, @conditional_directive {
   /** Gets the condition. */
   Expr getCondition() { result = this.getChild(0) }
 
diff --git a/csharp/ql/src/semmlecode.csharp.dbscheme b/csharp/ql/src/semmlecode.csharp.dbscheme
@@ -335,6 +335,9 @@ using_directive_location(
   | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
   | @directive_elif | @directive_else | @directive_endif;
 
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
 directive_ifs(
   unique int id: @directive_if,
   int branchTaken: int ref,     /* 0: false, 1: true */
