hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Java/C++/C#: Tweak AccessPathNil::toString()

Browse Source 
Move the type annotation outside the brackets, to avoid prefixes such as
`[ : T]`.
This commit is contained in:
Tom Hvitved
2019-10-03 18:19:14 +02:00
parent 48dee29620
commit 9b58d799cb
19 changed files with 171 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }

18
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
View File

@@ -1261,7 +1261,7 @@ abstract private class AccessPath extends TAccessPath {
private class AccessPathNil extends AccessPath, TNil { private class AccessPathNil extends AccessPath, TNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -1277,7 +1277,7 @@ private class AccessPathConsNil extends AccessPathCons, TConsNil {
override string toString() { override string toString() {
exists(Content f, DataFlowType t | this = TConsNil(f, t) | exists(Content f, DataFlowType t | this = TConsNil(f, t) |
// The `concat` becomes "" if `ppReprType` has no result. // The `concat` becomes "" if `ppReprType` has no result.
result = f.toString() + concat(" : " + ppReprType(t)) result = "[" + f.toString() + "]" + concat(" : " + ppReprType(t))
) )
} }
@@ -1294,8 +1294,8 @@ private class AccessPathConsCons extends AccessPathCons, TConsCons {
override string toString() { override string toString() {
exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) | exists(Content f1, Content f2, int len | this = TConsCons(f1, f2, len) |
if len = 2 if len = 2
then result = f1.toString() + ", " + f2.toString() then result = "[" + f1.toString() + ", " + f2.toString() + "]"
else result = f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")" else result = "[" + f1.toString() + ", " + f2.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -1626,7 +1626,7 @@ abstract class PathNode extends TPathNode {
this instanceof PathNodeSink and result = "" this instanceof PathNodeSink and result = ""
or or
exists(string s | s = this.(PathNodeMid).getAp().toString() | exists(string s | s = this.(PathNodeMid).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }
@@ -2071,7 +2071,7 @@ private module FlowExploration {
private class PartialAccessPathNil extends PartialAccessPath, TPartialNil { private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
override string toString() { override string toString() {
exists(DataFlowType t | this = TPartialNil(t) | result = concat(" : " + ppReprType(t))) exists(DataFlowType t | this = TPartialNil(t) | result = concat(": " + ppReprType(t)))
} }
override AccessPathFront getFront() { override AccessPathFront getFront() {
@@ -2083,8 +2083,8 @@ private module FlowExploration {
override string toString() { override string toString() {
exists(Content f, int len | this = TPartialCons(f, len) | exists(Content f, int len | this = TPartialCons(f, len) |
if len = 1 if len = 1
then result = f.toString() then result = "[" + f.toString() + "]"
else result = f.toString() + ", ... (" + len.toString() + ")" else result = "[" + f.toString() + ", ... (" + len.toString() + ")]"
) )
} }
@@ -2161,7 +2161,7 @@ private module FlowExploration {
private string ppAp() { private string ppAp() {
exists(string s | s = this.(PartialPathNodePriv).getAp().toString() | exists(string s | s = this.(PartialPathNodePriv).getAp().toString() |
if s = "" then result = "" else result = " [" + s + "]" if s = "" then result = "" else result = " " + s
) )
} }