Merge pull request github#3942 from MathiasVP/remove-abstract-preprocessor

geoffw0 · web-flow · commit 6519629472bf · 2020-07-13T10:00:50.000+01:00
C++: Remove abstract classes from Preprocessor.qll
diff --git a/cpp/ql/src/semmle/code/cpp/Preprocessor.qll b/cpp/ql/src/semmle/code/cpp/Preprocessor.qll
@@ -33,11 +33,13 @@ class PreprocessorDirective extends Locatable, @preprocdirect {
   }
 }
 
+private class TPreprocessorBranchDirective = @ppd_branch or @ppd_else or @ppd_endif;
+
 /**
  * A C/C++ preprocessor branch related directive: `#if`, `#ifdef`,
  * `#ifndef`, `#elif`, `#else` or `#endif`.
  */
-abstract class PreprocessorBranchDirective extends PreprocessorDirective {
+class PreprocessorBranchDirective extends PreprocessorDirective, TPreprocessorBranchDirective {
   /**
    * Gets the `#if`, `#ifdef` or `#ifndef` directive which matches this
    * branching directive.

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,13 @@ class PreprocessorDirective extends Locatable, @preprocdirect {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
	`36`	`+private class TPreprocessorBranchDirective = @ppd_branch or @ppd_else or @ppd_endif;`
	`37`	`+`
`36`	`38`	`/**`
`37`	`39`	* A C/C++ preprocessor branch related directive: `#if`, `#ifdef`,
`38`	`40`	* `#ifndef`, `#elif`, `#else` or `#endif`.
`39`	`41`	`*/`
`40`		`-abstract class PreprocessorBranchDirective extends PreprocessorDirective {`
	`42`	`+class PreprocessorBranchDirective extends PreprocessorDirective, TPreprocessorBranchDirective {`
`41`	`43`	`/**`
`42`	`44`	* Gets the `#if`, `#ifdef` or `#ifndef` directive which matches this
`43`	`45`	`* branching directive.`