Skip to content

Commit 00c80cf

Browse files
ohler55ohler55
committed
WIP
1 parent f3e2017 commit 00c80cf

13 files changed

Lines changed: 80 additions & 25 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2727
lisp code by adding `#!/usr/bin/env slipr` as the first line in a
2828
.lisp file.
2929
- Added cover.lisp that displays coverage data from a save coverage file in the lisp directory.
30+
- Added `gi:string-append` function.
3031

3132
### Fixed
3233
- The CompileList function now correctly handles package prefixes.

‎docs/notes.md‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,11 @@
66

77
- add provenance
88

9-
- string-append
10-
- tests
11-
- update changelog
12-
13-
- (add (subseq quux 0 2) 'd)
14-
- modifies quux - should it?
15-
169
- coverage app
1710
- handle multiple line provenance info
11+
- variations on 3 lines
12+
13+
- remove covx.lisp and testx.lisp after testing
1814

1915
- later could be interactive
2016
- functions for terminal support?

‎lisp/cov1.lisp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
(("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test1.lisp" "1285c49d8e0d4cf4e5a8720a0a31d5de513ddc265bd7737c3a54695923f52c7d")
2+
("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test1.lisp" 1 1 1 13 1)
3+
("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test1.lisp" 1 6 1 12 1))

‎lisp/cov2.lisp‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
;;;; Sample coverage file
2-
3-
(("/Users/ohler/go/src/github.com/ohler55/slip/test/testdata/cov-test.lisp" "00c69412bf934617158b59331dbca964db71d7aec8e2f28bb553e48d21239ec6"
4-
"/Users/ohler/go/src/github.com/ohler55/slip/test/testdata/cov-test2.lisp" "55458ffb66e84d015f9e034214cbdada1a8f4d6024a1c8904d1306100f92db69")
5-
("/Users/ohler/go/src/github.com/ohler55/slip/test/testdata/cov-test2.lisp" 1 1 1 14 1)
6-
("/Users/ohler/go/src/github.com/ohler55/slip/test/testdata/cov-test.lisp" 1 1 2 11 1)
7-
("/Users/ohler/go/src/github.com/ohler55/slip/test/testdata/cov-test.lisp" 2 4 2 10 0))
1+
(("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test2.lisp" "9dfbd465e749723a7365f41897db9bc98a735605a58e97d8a66814c888cf4e7f")
2+
("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test2.lisp" 1 1 2 11 1)
3+
("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test2.lisp" 2 4 2 10 1))

‎lisp/cov3.lisp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(("/Users/ohler/.slip/config.lisp" "3a9036a097d027e28c13f170a0bd6cdc158aea9abec7c64ef59e1001e5e8efeb"
2-
"/Users/ohler/go/src/github.com/ohler55/slip/lisp/test3.lisp" "7db6c3cc11321d2c5d792a4ba22e4fa64ec9ddd8fb680b3b98a4631037e150fb")
3-
("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test3.lisp" 3 1 3 13 1)
4-
("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test3.lisp" 3 6 3 12 1))
1+
(("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test3.lisp" "30f5b4c0d003984da1a6cd69442e0502e751b556979eb708dc14356544ee85f1")
2+
("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test3.lisp" 2 1 4 11 1)
3+
("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test3.lisp" 3 4 4 10 1)
4+
("/Users/ohler/go/src/github.com/ohler55/slip/lisp/test3.lisp" 3 7 3 13 1))

‎lisp/cover.lisp‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,20 @@ usage: ~A <coverage-file> [<filepath>...]
7878

7979
(cond ((= firstLine lastLine) ;; same line
8080
(let* ((index (locate-segment line c0 c1))
81-
(seg (nth index line)))
81+
(seg (nth index line))
82+
(seg0 (car seg)))
83+
(when (< seg0 0) (setq seg0 0))
8284
(setf (nth firstLine lines)
8385
(append (subseq line 0 index)
84-
(list (list (car seg) c0 (caddr seg)) (list c0 c1 cov) (list c1 (cadr seg) (caddr seg)))
85-
(subseq line (1+ index))))
86-
))
87-
86+
(list (list seg0 c0 (caddr seg))
87+
(list c0 c1 cov)
88+
(list c1 (cadr seg) (caddr seg)))
89+
(subseq line (1+ index))))))
8890
(t
8991
(format t "*** different lines~%")
92+
;; TBD first and last lines become (x -1 coverage) and (0 y coverage)
93+
;; locate segment for each
94+
;; inbetween lines become (0 -1 coverage)
9095
))
9196
))
9297
;; Compact lines. Remove (-1 0 nil) any with a end of zero at start if

‎lisp/test-5x.lisp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
(+ 2
3+
3
4+
(* 3 4)
5+
5)

‎lisp/test1.lisp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
;;;; some comment
2+
(+ 1 (- 2 3))

‎lisp/test2.lisp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
(+ 1
3+
(- 3 2))

‎lisp/test3.lisp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
;;;; a one line test
1+
;;;; three line test
22

3-
(+ 2 (- 5 3))
3+
(+ 2
4+
(- (* 3 4)
5+
5 3))

0 commit comments

Comments
 (0)