hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-01 19:55:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Java: make some SMAP predicates private and add QLDoc

Browse Source
This commit is contained in:
yo-h
2020-11-24 21:35:30 -05:00
parent c077ca3fc9
commit 9bb949a8b1
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/ql/src/semmle/code/Location.qll
View File

@@ -6,7 +6,7 @@
import FileSystem
import semmle.code.java.Element
import semmle.code.SMAP
private import semmle.code.SMAP
/** Holds if element `e` has name `name`. */
predicate hasName(Element e, string name) {
@@ -72,7 +72,7 @@ class Top extends @top {
)
}
predicate hasLocationInfoAux(
private predicate hasLocationInfoAux(
string filepath, int startline, int startcolumn, int endline, int endcolumn
) {
exists(File f, Location l | fixedHasLocation(this, l, f) |

23
java/ql/src/semmle/code/SMAP.qll
View File

@@ -1,6 +1,14 @@
/**
* Provides classes and predicates for working with SMAP files (see JSR-045).
*/
import java
predicate smap(File inputFile, int inLine, File outputFile, int outLineStart, int outLineEnd) {
/**
* Holds if there exists a mapping between an SMAP input file and line
* and a corresponding SMAP output file and line range.
*/
private predicate smap(File inputFile, int inLine, File outputFile, int outLineStart, int outLineEnd) {
exists(
string defaultStratum, int inputFileNum, int inStart, int inCount, int outStart, int outIncr,
int n
@@ -15,13 +23,24 @@ predicate smap(File inputFile, int inLine, File outputFile, int outLineStart, in
)
}
predicate smap(File inputFile, int inLine, File outputFile, int outLine) {
/**
* Holds if there exists a mapping between an SMAP input file and line
* and a corresponding SMAP output file and line.
*/
private predicate smap(File inputFile, int inLine, File outputFile, int outLine) {
exists(int outLineStart, int outLineEnd |
smap(inputFile, inLine, outputFile, outLineStart, outLineEnd) and
outLine in [outLineStart .. outLineEnd]
)
}
/**
* Holds if an SMAP input location (with path, line and column information)
* has a corresponding SMAP output location (with path and line information).
*
* For example, an SMAP input location may be a location within a JSP file,
* which may have a corresponding SMAP output location in generated Java code.
*/
predicate hasSmapLocationInfo(
string inputPath, int isl, int isc, int iel, int iec, string outputPath, int osl, int oel
) {