Skip to content

Commit 20be8ad

Browse files
committed
Removed HIDE from *blacklisted-apply$-fns* in the source definition and in projects/apply-model-2/apply-prim.lisp. Fixed failure in making devel-check. Added missing entry in *acl2-broken-links-alist* for recently added reference to :doc consideration.
J has pointed out that removal of HIDE from *blacklisted-apply$-fns* may be useful for rewriting inside lambdas, where tameness of terms is relevant. Successfully completed the usual "everything" regression. But also, successfully completed "make devel-check" after modifying the macro IO?, to avoid a guard proof failure for the form (verify-termination warning1-cw) in books/system/bind-macro-args.lisp when using a #+acl2-devel build (see comments in source definition of (defconst *system-verify-guards-alist* ...) if interested).
1 parent c91ec0b commit 20be8ad

File tree

8 files changed

+29
-8
lines changed

8 files changed

+29
-8
lines changed

apply-prim.lisp

-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@
258258
; the ttag and untouchable restrictions already prevent warrants.
259259

260260
'(SYNP ; bad
261-
HIDE ; stupid
262261
WORMHOLE1 ; restricts arguments
263262
WORMHOLE-EVAL ; restricts arguments
264263
SYS-CALL ; bad -- requires trust tag

basis-a.lisp

+4-2
Original file line numberDiff line numberDiff line change
@@ -5655,10 +5655,12 @@
56555655
(equal vars '(summary ctx alist str))
56565656
'(lambda (whs)
56575657
(cond
5658-
((and (member-string-equal
5658+
((and summary
5659+
(member-string-equal
56595660
summary
56605661
*tracked-warning-summaries*)
5661-
(alistp (wormhole-data whs)))
5662+
(standard-string-alistp
5663+
(wormhole-data whs)))
56625664
(let ((expln (list ctx alist str))
56635665
(entry (or (assoc-string-equal
56645666
summary

books/projects/apply-model-2/apply-prim.lisp

+5-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
; the ttag and untouchable restrictions already prevent warrants.
107107

108108
'(SYNP ; bad
109-
HIDE ; stupid
110109
WORMHOLE1 ; restricts arguments
111110
WORMHOLE-EVAL ; restricts arguments
112111
SYS-CALL ; bad -- requires trust tag
@@ -517,6 +516,11 @@
517516
; (:executable-counterpart break$))))
518517
; :rule-classes ((:meta :trigger-fns (apply$-prim)))))
519518

519+
(local
520+
(defthm hide-is-identity
521+
(equal (hide x) x)
522+
:hints (("Goal" :expand ((hide x))))))
523+
520524
(defthm apply$-prim-meta-fn-correct
521525
(equal (apply$-prim-meta-fn-ev term alist)
522526
(apply$-prim-meta-fn-ev (meta-apply$-prim term)

books/projects/apply/base.lisp

+6
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,11 @@
458458
(apply$-lambda fn args)))
459459
:hints (("Goal" :use apply$-lambda-takes-arity-args)))
460460

461+
(local
462+
(defthm hide-is-identity
463+
(equal (hide x) x)
464+
:hints (("Goal" :expand ((hide x))))))
465+
461466
(defthm apply$-prim-takes-arity-args
462467
(implies (apply$-primp fn)
463468
(equal (apply$-prim fn args)
@@ -472,6 +477,7 @@
472477
cdr-cons
473478
hons-get
474479
(:executable-counterpart hons-assoc-equal)
480+
hide-is-identity
475481
)))
476482
:rule-classes nil)
477483

books/system/apply/apply-prim.lisp

+5
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,11 @@
277277
; :hints (("Goal" :in-theory (disable (:executable-counterpart break$))))
278278
; :rule-classes ((:meta :trigger-fns (apply$-prim)))))
279279

280+
(local
281+
(defthm hide-is-identity
282+
(equal (hide x) x)
283+
:hints (("Goal" :expand ((hide x))))))
284+
280285
(defthm apply$-prim-meta-fn-correct
281286
(equal (apply$-prim-meta-fn-ev term alist)
282287
(apply$-prim-meta-fn-ev (meta-apply$-prim term)

books/system/doc/acl2-doc.lisp

+4
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
(BUILD::CERT.PL "[books]/build/doc.lisp")
7474
(BUILD::CERT_PARAM "[books]/build/doc.lisp")
7575
(CGEN "[books]/acl2s/cgen/top.lisp")
76+
(CONSIDERATION "[books]/hints/consider-hint.lisp")
7677
(STD::DEFAGGREGATE "[books]/std/util/defaggregate.lisp")
7778
(DEFCONSTS "[books]/std/util/defconsts.lisp")
7879
(DEFDATA "[books]/acl2s/defdata/top.lisp")
@@ -86469,6 +86470,9 @@ it."
8646986470
; initialized with a constant. This seemed potentially important given the
8647086471
; item below about destructively modifying a quoted constant in *fncall-cache*.
8647186472

86473+
; Added comments and checks regarding *blacklisted-apply$-fns*, and removed
86474+
; HIDE from that list.
86475+
8647286476
:parents (release-notes)
8647386477
:short "ACL2 Version 8.4 (xxx, 20xx) Notes"
8647486478
:long "<p>NOTE! New users can ignore these release notes, because the @(see

doc.lisp

+2-1
Original file line numberDiff line numberDiff line change
@@ -14519,6 +14519,7 @@ Subtopics
1451914519
(build::cert.pl \"[books]/build/doc.lisp\")
1452014520
(build::cert_param \"[books]/build/doc.lisp\")
1452114521
(cgen \"[books]/acl2s/cgen/top.lisp\")
14522+
(consideration \"[books]/hints/consider-hint.lisp\")
1452214523
(std::defaggregate \"[books]/std/util/defaggregate.lisp\")
1452314524
(defconsts \"[books]/std/util/defconsts.lisp\")
1452414525
(defdata \"[books]/acl2s/defdata/top.lisp\")
@@ -43161,7 +43162,7 @@ Subtopics
4316143162
[custom-keyword-hints]) and even more general ``computed hints''
4316243163
for the advanced user (see [computed-hints]). Not documented in
4316343164
this topic are such hints implemented in books; for an example of
43164-
so-called :consider hints, see consideration.
43165+
so-called :consider hints, see [consideration].
4316543166

4316643167
Only the first hint applicable to a goal, as specified in the
4316743168
user-supplied list of :hints followed by the default hints (see

doc/acl2-code-size.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Source files (not including doc.lisp):
22
------------------------------------
33
CODE LINES:
4-
143984 lines, 6408577 characters
4+
143985 lines, 6408626 characters
55
COMMENT LINES:
66
80678 lines, 4864738 characters
77
BLANK LINES:
88
33802 lines, 33802 characters
99
TOTAL:
10-
258464 lines, 11307117 characters
10+
258465 lines, 11307166 characters
1111
------------------------------------
1212
Documentation (file books/system/doc/acl2-doc.lisp):
13-
131104 lines, 5792590 characters
13+
131108 lines, 5792745 characters
1414
------------------------------------

0 commit comments

Comments
 (0)