C#/C++/Java: Prettier PartialAccessPath.toString

jbj · jbj · commit cdede8744f01 · 2019-09-02T14:05:50.000+02:00
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -2081,7 +2081,7 @@ private module FlowExploration {
 
   private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {
     override string toString() {
-      exists(DataFlowType t | this = TPartialNil(t) | result = ppReprType(t))
+      exists(DataFlowType t | this = TPartialNil(t) | result = concat(ppReprType(t)))
     }
 
     override AccessPathFront getFront() {
@@ -2092,7 +2092,9 @@ private module FlowExploration {
   private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {
     override string toString() {
       exists(Content f, int len | this = TPartialCons(f, len) |
-        result = f.toString() + ", ... (" + len.toString() + ")"
+        if len = 1
+        then result = f.toString()
+        else result = f.toString() + ", ... (" + len.toString() + ")"
       )
     }
 
diff --git a/java/ql/test/library-tests/dataflow/partial/test.expected b/java/ql/test/library-tests/dataflow/partial/test.expected

Original file line number	Diff line number	Diff line change
`@@ -2081,7 +2081,7 @@ private module FlowExploration {`
`2081`	`2081`
`2082`	`2082`	`private class PartialAccessPathNil extends PartialAccessPath, TPartialNil {`
`2083`	`2083`	`override string toString() {`
`2084`		`- exists(DataFlowType t \| this = TPartialNil(t) \| result = ppReprType(t))`
	`2084`	`+ exists(DataFlowType t \| this = TPartialNil(t) \| result = concat(ppReprType(t)))`
`2085`	`2085`	`}`
`2086`	`2086`
`2087`	`2087`	`override AccessPathFront getFront() {`
`@@ -2092,7 +2092,9 @@ private module FlowExploration {`
`2092`	`2092`	`private class PartialAccessPathCons extends PartialAccessPath, TPartialCons {`
`2093`	`2093`	`override string toString() {`
`2094`	`2094`	`exists(Content f, int len \| this = TPartialCons(f, len) \|`
`2095`		`- result = f.toString() + ", ... (" + len.toString() + ")"`
	`2095`	`+ if len = 1`
	`2096`	`+ then result = f.toString()`
	`2097`	`+ else result = f.toString() + ", ... (" + len.toString() + ")"`
`2096`	`2098`	`)`
`2097`	`2099`	`}`
`2098`	`2100`