aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-07-28 11:39:22 +0200
committerLars Ingebrigtsen2019-07-28 11:39:22 +0200
commit3a556c0c60ffc224b22fa94a496a26ef9d0d43ee (patch)
tree599e0bd81d68ce3b402e6936d62ca0491462f5e7
parent77ee23d1ede9eece3eab4cc67d7f2e72d30a1117 (diff)
downloademacs-3a556c0c60ffc224b22fa94a496a26ef9d0d43ee.tar.gz
emacs-3a556c0c60ffc224b22fa94a496a26ef9d0d43ee.zip
Fix testcover.el usage of edebug.el symbols
* lisp/emacs-lisp/testcover.el (testcover-before) (testcover-after, testcover-mark) (testcover-analyze-coverage-edebug-after): Adjust usage of `unknown' to `edebug-unknown' in testcover.el in addition to edebug.el (bug#25471).
-rw-r--r--lisp/emacs-lisp/testcover.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 1b94aa80e5f..20851805f5c 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -246,7 +246,7 @@ BEFORE-INDEX is the form's index into the code-coverage vector."
246 (let ((before-entry (aref testcover-vector before-index))) 246 (let ((before-entry (aref testcover-vector before-index)))
247 (when (eq (car-safe before-entry) 'noreturn) 247 (when (eq (car-safe before-entry) 'noreturn)
248 (let* ((after-index (cdr before-entry))) 248 (let* ((after-index (cdr before-entry)))
249 (aset testcover-vector after-index 'ok-coverage))))) 249 (aset testcover-vector after-index 'edebug-ok-coverage)))))
250 250
251(defun testcover-after (_before-index after-index value) 251(defun testcover-after (_before-index after-index value)
252 "Update code coverage with the result of a form's evaluation. 252 "Update code coverage with the result of a form's evaluation.
@@ -254,10 +254,10 @@ AFTER-INDEX is the form's index into the code-coverage
254vector. Return VALUE." 254vector. Return VALUE."
255 (let ((old-result (aref testcover-vector after-index))) 255 (let ((old-result (aref testcover-vector after-index)))
256 (cond 256 (cond
257 ((eq 'unknown old-result) 257 ((eq 'edebug-unknown old-result)
258 (aset testcover-vector after-index (testcover--copy-object value))) 258 (aset testcover-vector after-index (testcover--copy-object value)))
259 ((eq 'maybe old-result) 259 ((eq 'maybe old-result)
260 (aset testcover-vector after-index 'ok-coverage)) 260 (aset testcover-vector after-index 'edebug-ok-coverage))
261 ((eq '1value old-result) 261 ((eq '1value old-result)
262 (aset testcover-vector after-index 262 (aset testcover-vector after-index
263 (cons old-result (testcover--copy-object value)))) 263 (cons old-result (testcover--copy-object value))))
@@ -271,7 +271,7 @@ vector. Return VALUE."
271 ((not (condition-case () 271 ((not (condition-case ()
272 (equal value old-result) 272 (equal value old-result)
273 (circular-list nil))) 273 (circular-list nil)))
274 (aset testcover-vector after-index 'ok-coverage)))) 274 (aset testcover-vector after-index 'edebug-ok-coverage))))
275 value) 275 value)
276 276
277;; Add these behaviors to Edebug. 277;; Add these behaviors to Edebug.
@@ -356,13 +356,13 @@ eliminated by adding more test cases."
356 (while (> len 0) 356 (while (> len 0)
357 (setq len (1- len) 357 (setq len (1- len)
358 data (aref coverage len)) 358 data (aref coverage len))
359 (when (and (not (eq data 'ok-coverage)) 359 (when (and (not (eq data 'edebug-ok-coverage))
360 (not (memq (car-safe data) 360 (not (memq (car-safe data)
361 '(1value maybe noreturn))) 361 '(1value maybe noreturn)))
362 (setq j (+ def-mark (aref points len)))) 362 (setq j (+ def-mark (aref points len))))
363 (setq ov (make-overlay (1- j) j)) 363 (setq ov (make-overlay (1- j) j))
364 (overlay-put ov 'face 364 (overlay-put ov 'face
365 (if (memq data '(unknown maybe 1value)) 365 (if (memq data '(edebug-unknown maybe 1value))
366 'testcover-nohits 366 'testcover-nohits
367 'testcover-1value)))) 367 'testcover-1value))))
368 (set-buffer-modified-p changed)))) 368 (set-buffer-modified-p changed))))
@@ -410,7 +410,7 @@ coverage tests. This function creates many overlays."
410;; identified and treated correctly. 410;; identified and treated correctly.
411;; 411;;
412;; The code coverage vector entries for the beginnings of forms will 412;; The code coverage vector entries for the beginnings of forms will
413;; be changed to `ok-coverage.', except for the beginnings of forms 413;; be changed to `edebug-ok-coverage.', except for the beginnings of forms
414;; which should never return, which will be changed to 414;; which should never return, which will be changed to
415;; (noreturn . AFTER-INDEX) so that testcover-before can set the entry 415;; (noreturn . AFTER-INDEX) so that testcover-before can set the entry
416;; for the end of the form just before it is executed. 416;; for the end of the form just before it is executed.
@@ -513,7 +513,7 @@ where BEFORE-FORM is bound to either (edebug-before BEFORE-ID) or
513form to be treated accordingly." 513form to be treated accordingly."
514 (let (val) 514 (let (val)
515 (unless (eql before-form 0) 515 (unless (eql before-form 0)
516 (aset testcover-vector before-id 'ok-coverage)) 516 (aset testcover-vector before-id 'edebug-ok-coverage))
517 517
518 (setq val (testcover-analyze-coverage-wrapped-form wrapped-form)) 518 (setq val (testcover-analyze-coverage-wrapped-form wrapped-form))
519 (when (or (eq wrapper '1value) val) 519 (when (or (eq wrapper '1value) val)