C++: Update summary queries.

cpp/ql/src/Summary/Files.ql

@@ -1,11 +0,0 @@
-/**
- * @id cpp/summary/files
- * @name Total source files
- * @description The total number of source files.
- * @kind metric
- * @tags summary
- */
-
-import cpp
-
-select count(File f | f.fromSource())

cpp/ql/src/Summary/Lines.ql

@@ -1,11 +0,0 @@
-/**
- * @id cpp/summary/lines
- * @name Total lines of text
- * @description The total number of lines of text across all source files.
- * @kind metric
- * @tags summary
- */
-
-import cpp
-
-select sum(File f | f.fromSource() | f.getMetrics().getNumberOfLines())

cpp/ql/src/Summary/LinesOfCode.ql

@@ -1,11 +1,11 @@
 /**
  * @id cpp/summary/lines-of-code
- * @name Total lines of code
- * @description The total number of lines of code across all source files.
+ * @name Total lines of C/C++ code
+ * @description The total number of lines of C/C++ code across all files, including system headers and libraries.
  * @kind metric
  * @tags summary
  */
 
 import cpp
 
-select sum(File f | f.fromSource() | f.getMetrics().getNumberOfLinesOfCode())
+select sum(File f | f.fromSource() | f.getMetrics().getNumberOfLines())

cpp/ql/src/Summary/LinesOfCodePerFile.ql

@@ -1,7 +1,7 @@
 /**
  * @id cpp/summary/lines-of-code-per-file
- * @name Lines of code per source file
- * @description The number of lines of code for each source file.
+ * @name Lines of C/C++ code per source file
+ * @description The number of lines of C/C++ code for each file in the database, including system headers and libraries.
  * @kind metric
  * @tags summary
  */
@@ -10,4 +10,4 @@ import cpp
 
 from File f
 where f.fromSource()
-select f, f.getMetrics().getNumberOfLinesOfCode()
+select f, f.getMetrics().getNumberOfLines()

cpp/ql/src/Summary/LinesOfUserCode.ql

@@ -0,0 +1,11 @@
+/**
+ * @id cpp/summary/lines-of-user-code
+ * @name Total lines of C/C++ source code
+ * @description The total number of lines of C/C++ code across all files, excluding system headers and libraries.
+ * @kind metric
+ * @tags summary
+ */
+
+import cpp
+
+select sum(File f | exists(f.getRelativePath()) | f.getMetrics().getNumberOfLines())

cpp/ql/src/Summary/LinesOfUserCodePerFile.ql

@@ -0,0 +1,13 @@
+/**
+ * @id cpp/summary/lines-of-user-code-per-file
+ * @name Lines of C/C++ code per source file
+ * @description The number of lines of C/C++ code for each file in the source directory.
+ * @kind metric
+ * @tags summary
+ */
+
+import cpp
+
+from File f
+where exists(f.getRelativePath())
+select f, f.getMetrics().getNumberOfLines()

cpp/ql/src/Summary/LinesPerFile.ql

@@ -1,13 +0,0 @@
-/**
- * @id cpp/summary/lines-per-file
- * @name Lines of text per source file
- * @description The number of lines of text for each source file.
- * @kind metric
- * @tags summary
- */
-
-import cpp
-
-from File f
-where f.fromSource()
-select f, f.getMetrics().getNumberOfLines()

cpp/ql/test/query-tests/Summary/Files.expected

@@ -1 +0,0 @@
-| 3 |

cpp/ql/test/query-tests/Summary/Files.qlref

@@ -1 +0,0 @@
-Summary/Files.ql

cpp/ql/test/query-tests/Summary/Lines.qlref

@@ -1 +0,0 @@
-Summary/Lines.ql

cpp/ql/test/query-tests/Summary/LinesOfCode.expected

@@ -1 +1 @@
-| 93 |
+| 122 |

cpp/ql/test/query-tests/Summary/LinesOfCode.qlref

@@ -1 +1 @@
-Summary/LinesOfCode.ql
+Summary/LinesOfCode.ql

cpp/ql/test/query-tests/Summary/LinesOfCodePerFile.expected

@@ -1,3 +1,3 @@
 | empty-file.cpp:0:0:0:0 | empty-file.cpp | 0 |
-| large-file.cpp:0:0:0:0 | large-file.cpp | 90 |
+| large-file.cpp:0:0:0:0 | large-file.cpp | 119 |
 | short-file.cpp:0:0:0:0 | short-file.cpp | 3 |

cpp/ql/test/query-tests/Summary/LinesOfCodePerFile.qlref

@@ -1 +1 @@
-Summary/LinesOfCodePerFile.ql
+Summary/LinesOfCodePerFile.ql

cpp/ql/test/query-tests/Summary/LinesOfUserCode.qlref

@@ -0,0 +1 @@
+Summary/LinesOfUserCode.ql

cpp/ql/test/query-tests/Summary/LinesOfUserCodePerFile.qlref

@@ -0,0 +1 @@
+Summary/LinesOfUserCodePerFile.ql

cpp/ql/test/query-tests/Summary/LinesPerFile.qlref

@@ -1 +0,0 @@
-Summary/LinesPerFile.ql