Merge pull request #243 from jbj/CommentedOutCode-join-fix

adityasharad · web-flow · commit 1f9da2864700 · 2018-09-27T14:59:13.000+01:00
C++: Fix join order in CommentedOutCode
diff --git a/cpp/ql/src/Documentation/CommentedOutCode.qll b/cpp/ql/src/Documentation/CommentedOutCode.qll
@@ -119,7 +119,7 @@ class CommentBlock extends Comment {
      */
     predicate hasLocationInfo(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
         this.getLocation().hasLocationInfo(filepath, startline, startcolumn, _, _) and
-        this.lastComment().getLocation().hasLocationInfo(filepath, _, _, endline, endcolumn)
+        this.lastComment().getLocation().hasLocationInfo(_, _, _, endline, endcolumn)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class CommentBlock extends Comment {`
`119`	`119`	`*/`
`120`	`120`	`predicate hasLocationInfo(string filepath, int startline, int startcolumn, int endline, int endcolumn) {`
`121`	`121`	`this.getLocation().hasLocationInfo(filepath, startline, startcolumn, _, _) and`
`122`		`- this.lastComment().getLocation().hasLocationInfo(filepath, _, _, endline, endcolumn)`
	`122`	`+ this.lastComment().getLocation().hasLocationInfo(_, _, _, endline, endcolumn)`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`