When invoked with --calls, show call coverage

gcovr/coverage.py

@@ -80,13 +80,15 @@ class CallCoverage:
             Whether the call was performed.
     """
 
-    __slots__ = "covered"
+    __slots__ = "covered", "callno"
 
     def __init__(
         self,
+        callno: int,
         covered: bool,
     ) -> None:
         self.covered = covered
+        self.callno = callno
 
     @property
     def is_covered(self) -> bool:

gcovr/gcov_parser.py

@@ -516,8 +516,8 @@ def _gather_coverage_from_line(
         if context.flags & ParserFlags.PARSE_CALLS:
             insert_call_coverage(
                 line_cov,
-                callno,
                 CallCoverage(
+                    callno=callno,
                     covered=(returned > 0),
                 ),
             )

gcovr/merging.py

@@ -309,12 +309,11 @@ def merge_branch(
 
 def insert_call_coverage(
     target: LineCoverage,
-    call_id: int,
     call: CallCoverage,
     options: MergeOptions = DEFAULT_MERGE_OPTIONS,
 ) -> CallCoverage:
     """Insert BranchCoverage into LineCoverage."""
-    return _insert_coverage_item(target.calls, call_id, call, merge_call, options)
+    return _insert_coverage_item(target.calls, call.callno, call, merge_call, options)
 
 
 def merge_call(
@@ -328,6 +327,7 @@ def merge_call(
     Do not use 'left' or 'right' objects afterwards!
     """
     left.covered |= right.covered
+    left.callno = right.callno
     return left
 
 

gcovr/writer/json.py

@@ -54,7 +54,7 @@
 logger = logging.getLogger("gcovr")
 
 
-JSON_FORMAT_VERSION = "0.3"
+JSON_FORMAT_VERSION = "0.4"
 JSON_SUMMARY_FORMAT_VERSION = "0.5"
 PRETTY_JSON_INDENT = 4
 
@@ -275,7 +275,8 @@ def _json_from_calls(calls: Dict[int, CallCoverage]) -> list:
 
 def _json_from_call(call: CallCoverage) -> dict:
     return {
-            "covered": call.covered
+            "covered": call.covered,
+            "callno": call.callno
     }
 
 
@@ -313,8 +314,8 @@ def _line_from_json(json_line: dict) -> LineCoverage:
     insert_decision_coverage(line, _decision_from_json(json_line.get("gcovr/decision")))
 
     if "gcovr/calls" in json_line:
-        for callno, json_call in enumerate(json_line["gcovr/calls"]):
-            insert_call_coverage(line, callno, _call_from_json(json_call))
+        for json_call in json_line["gcovr/calls"]:
+            insert_call_coverage(line, _call_from_json(json_call))
 
     return line
 
@@ -329,7 +330,8 @@ def _branch_from_json(json_branch: dict) -> BranchCoverage:
 
 def _call_from_json(json_call: dict) -> CallCoverage:
     return CallCoverage(
-        covered=json_call["covered"]
+        covered=json_call["covered"],
+        callno=json_call["callno"]
     )