diff options
| -rw-r--r-- | blackjack.lisp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/blackjack.lisp b/blackjack.lisp index 1cee403..033966d 100644 --- a/blackjack.lisp +++ b/blackjack.lisp @@ -49,12 +49,12 @@ (cond ((endp x) 0) (t (+ (car x) (sum (cdr x)))))) -(defun filter/facep (x) +(defun filter-facep (x) (declare (xargs :guard (true-listp x))) (cond ((endp x) nil) ((facep (car x)) - (cons (car x) (filter/facep (cdr x)))) - (t (filter/facep (cdr x))))) + (cons (car x) (filter-facep (cdr x)))) + (t (filter-facep (cdr x))))) (defun face-list-p (x) (declare (xargs :guard t)) @@ -70,7 +70,7 @@ (defun score-without-aces (rl) (declare (xargs :guard (rank-list-p rl))) (+ (sum (filter/natp rl)) - (face-list-to-score (filter/facep rl)))) + (face-list-to-score (filter-facep rl)))) (defthm natp/score-without-aces (implies (rank-list-p x) @@ -107,7 +107,7 @@ (defthm natp/score*-1 (implies (rank-list-p rl) (natp (+ (sum (filter/natp rl)) - (* 10 (len (filter/facep rl))))))) + (* 10 (len (filter-facep rl))))))) (defthm natp/score* (implies (rank-list-p rl) @@ -125,7 +125,7 @@ (defthm scorep/score-1 (implies (rank-list-p x) (natp (+ (sum (filter/natp x)) - (* 10 (len (filter/facep x))))))) + (* 10 (len (filter-facep x))))))) (defthm scorep/score (implies (rank-list-p x) |