Merge pull request #5962 from erik-krogh/getAPrimaryQlClass

jbj · web-flow · commit eda25bb402ca · 2021-05-28T09:31:16.000+02:00
CPP/Java: Fix getAPrimaryQlClass implementations
diff --git a/cpp/ql/src/semmle/code/cpp/Specifier.qll b/cpp/ql/src/semmle/code/cpp/Specifier.qll
@@ -37,7 +37,7 @@ class FunctionSpecifier extends Specifier {
     this.hasName("explicit")
   }
 
-  override string getAPrimaryQlClass() { result = "FunctionSpecifier)" }
+  override string getAPrimaryQlClass() { result = "FunctionSpecifier" }
 }
 
 /**
diff --git a/java/ql/src/semmle/code/java/Statement.qll b/java/ql/src/semmle/code/java/Statement.qll
@@ -739,7 +739,7 @@ class LabeledStmt extends Stmt, @labeledstmt {
   /** This statement's Halstead ID (used to compute Halstead metrics). */
   override string getHalsteadID() { result = this.getLabel() + ":" }
 
-  override string getAPrimaryQlClass() { result = "LabelStmt" }
+  override string getAPrimaryQlClass() { result = "LabeledStmt" }
 }
 
 /** An `assert` statement. */

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class FunctionSpecifier extends Specifier {`
`37`	`37`	`this.hasName("explicit")`
`38`	`38`	`}`
`39`	`39`
`40`		`- override string getAPrimaryQlClass() { result = "FunctionSpecifier)" }`
	`40`	`+ override string getAPrimaryQlClass() { result = "FunctionSpecifier" }`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -739,7 +739,7 @@ class LabeledStmt extends Stmt, @labeledstmt {`
`739`	`739`	`/** This statement's Halstead ID (used to compute Halstead metrics). */`
`740`	`740`	`override string getHalsteadID() { result = this.getLabel() + ":" }`
`741`	`741`
`742`		`- override string getAPrimaryQlClass() { result = "LabelStmt" }`
	`742`	`+ override string getAPrimaryQlClass() { result = "LabeledStmt" }`
`743`	`743`	`}`
`744`	`744`
`745`	`745`	/** An `assert` statement. */