Skip to content

EQUALALL tests equivalence of bitmaps and big bitmaps #1302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masinter merged 5 commits into from
Oct 24, 2023
Merged

EQUALALL tests equivalence of bitmaps and big bitmaps #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4977d67
EQUALALL tests equivalence of bitmaps and big bitmaps
rmkaplan Jul 31, 2023
33a4f77
Oops, off by one
rmkaplan Jul 31, 2023
bb0b2cf
Merge branch 'master' into EQUAL-predicate-for-BITMAPS
rmkaplan Aug 14, 2023
a1ce049
Merge branch 'master' into EQUAL-predicate-for-BITMAPS
rmkaplan Sep 17, 2023
072cd7a
Merge branch 'master' into EQUAL-predicate-for-BITMAPS
masinter Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 32 additions & 20 deletions library/BIGBITMAPS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)

(FILECREATED " 9-Jul-2022 09:41:26" 
|{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>BIGBITMAPS.;12| 108851
(FILECREATED "31-Jul-2023 13:39:50" |{WMEDLEY}<library>BIGBITMAPS.;13| 109376

:EDIT-BY |rmk|

:CHANGES-TO (VARS BIGBITMAPSCOMS)
(FNS \\GENERIC.DSPCREATE.DESTINATION.BITMAP?.BIGBM \\GENERIC.DSPCREATE.BIGBM
\\DSPCREATE.BIGBM)
(MACROS |\\SFInvert|)
(FNS BIGBITMAPEQUAL)

:PREVIOUS-DATE "26-Oct-2021 14:51:38"
|{DSK}<users>kaplan>local>medley3.5>working-medley>library>BIGBITMAPS.;6|)
:PREVIOUS-DATE " 9-Jul-2022 09:41:26" |{WMEDLEY}<library>BIGBITMAPS.;12|)


; Copyright (c) 1991, 1993-1994 by Venue.
Copy link
Member

@masinter masinter Oct 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please load SYSEDIT when editing system files. It among other things resets the COPYRIGHTFLG.

Expand All @@ -24,8 +22,8 @@
(MACROS |GetNewFragment|)
(MACROS |\\SFInvert|))
(INITRECORDS BIGBM)
(FNS BIGBITMAPP BITBLT.BIGBM BITMAPCREATE.BIGBM BITMAPCREATE BITMAPCOPY BLTSHADE.BIGBM BITBLT
\\ORG.BITBLT \\BLTSHADE.DISPLAY \\RESHOWBORDER1)
(FNS BIGBITMAPP BITBLT.BIGBM BITMAPCREATE.BIGBM BITMAPCREATE BITMAPCOPY BIGBITMAPEQUAL
BLTSHADE.BIGBM BITBLT \\ORG.BITBLT \\BLTSHADE.DISPLAY \\RESHOWBORDER1)
(FNS \\DRAWCIRCLE.BIGBM \\FILLCIRCLE.BIGBM \\DRAWELLIPSE.BIGBM \\DRAWCURVE.BIGBM
\\DRAWLINE.BIGBM.DASH \\DRAWLINE.BIGBM.NODASH)
(FNS \\GENERIC.DSPCREATE.DESTINATION.BITMAP?.BIGBM)
Expand Down Expand Up @@ -353,6 +351,20 @@
0 0 NIL NIL 'INPUT 'REPLACE 0)
(RETURN NEWBITMAP))))

(BIGBITMAPEQUAL
(LAMBDA (BM1 BM2) (* \; "Edited 31-Jul-2023 13:08 by rmk")

(* |;;| "Fields may not be SMALLP")

(AND (|type?| BIGBM |of| BM1)
(|type?| BIGBM |of| BM2)
(IEQP (|ffetch| (BIGBM BIGBMWIDTH) |of| BM1)
(|ffetch| (BIGBM BIGBMWIDTH) |of| BM2))
(IEQP (|ffetch| (BIGBM BIGBMHEIGHT) |of| BM1)
(|ffetch| (BIGBM BIGBMHEIGHT) |of| BM2))
(|for| B1 |in| (|ffetch| (BIGBM BIGBMLIST) |of| BM1) |as| B2
|in| (|ffetch| (BIGBM BIGBMLIST) |of| BM2) |always| (EQUALBITMAPP B1 B2)))))

(BLTSHADE.BIGBM
(LAMBDA (TEXTURE DESTINATION DESTLEFT DESTBOTTOM WIDTH HEIGHT OPERATION CLIPPINGREGION)
(* \; "Edited 17-Oct-89 19:01 by takeshi")
Expand Down Expand Up @@ -1699,15 +1711,15 @@
)
(PUTPROPS BIGBITMAPS COPYRIGHT ("Venue" 1991 1993 1994))
(DECLARE\: DONTCOPY
(FILEMAP (NIL (3546 48244 (BIGBITMAPP 3556 . 3702) (BITBLT.BIGBM 3704 . 14527) (BITMAPCREATE.BIGBM
14529 . 15871) (BITMAPCREATE 15873 . 17475) (BITMAPCOPY 17477 . 18012) (BLTSHADE.BIGBM 18014 . 21150)
(BITBLT 21152 . 22800) (\\ORG.BITBLT 22802 . 34371) (\\BLTSHADE.DISPLAY 34373 . 43611) (
\\RESHOWBORDER1 43613 . 48242)) (48245 71523 (\\DRAWCIRCLE.BIGBM 48255 . 51618) (\\FILLCIRCLE.BIGBM
51620 . 55666) (\\DRAWELLIPSE.BIGBM 55668 . 60188) (\\DRAWCURVE.BIGBM 60190 . 64040) (
\\DRAWLINE.BIGBM.DASH 64042 . 68401) (\\DRAWLINE.BIGBM.NODASH 68403 . 71521)) (71524 71893 (
\\GENERIC.DSPCREATE.DESTINATION.BITMAP?.BIGBM 71534 . 71891)) (72025 85168 (DSPDESTINATION 72035 .
75933) (|\\SFFixY| 75935 . 81657) (|\\SFFixDestination| 81659 . 82842) (|\\SFFixClippingRegion| 82844
. 85166)) (85169 93255 (\\SW2BM 85179 . 90203) (BITMAPHEIGHT 90205 . 90703) (BITMAPWIDTH 90705 .
91197) (|\\SFFixFont| 91199 . 92171) (BITSPERPIXEL 92173 . 93253)) (93256 108609 (COLORIZEBITMAP 93266
. 96076) (\\BWTOCOLORBLT 96078 . 102671) (UNCOLORIZEBITMAP 102673 . 108607)))))
(FILEMAP (NIL (3364 48769 (BIGBITMAPP 3374 . 3520) (BITBLT.BIGBM 3522 . 14345) (BITMAPCREATE.BIGBM
14347 . 15689) (BITMAPCREATE 15691 . 17293) (BITMAPCOPY 17295 . 17830) (BIGBITMAPEQUAL 17832 . 18537)
(BLTSHADE.BIGBM 18539 . 21675) (BITBLT 21677 . 23325) (\\ORG.BITBLT 23327 . 34896) (\\BLTSHADE.DISPLAY
34898 . 44136) (\\RESHOWBORDER1 44138 . 48767)) (48770 72048 (\\DRAWCIRCLE.BIGBM 48780 . 52143) (
\\FILLCIRCLE.BIGBM 52145 . 56191) (\\DRAWELLIPSE.BIGBM 56193 . 60713) (\\DRAWCURVE.BIGBM 60715 . 64565
) (\\DRAWLINE.BIGBM.DASH 64567 . 68926) (\\DRAWLINE.BIGBM.NODASH 68928 . 72046)) (72049 72418 (
\\GENERIC.DSPCREATE.DESTINATION.BITMAP?.BIGBM 72059 . 72416)) (72550 85693 (DSPDESTINATION 72560 .
76458) (|\\SFFixY| 76460 . 82182) (|\\SFFixDestination| 82184 . 83367) (|\\SFFixClippingRegion| 83369
. 85691)) (85694 93780 (\\SW2BM 85704 . 90728) (BITMAPHEIGHT 90730 . 91228) (BITMAPWIDTH 91230 .
91722) (|\\SFFixFont| 91724 . 92696) (BITSPERPIXEL 92698 . 93778)) (93781 109134 (COLORIZEBITMAP 93791
. 96601) (\\BWTOCOLORBLT 96603 . 103196) (UNCOLORIZEBITMAP 103198 . 109132)))))
STOP
Binary file modified library/BIGBITMAPS.LCOM
View file
Open in desktop
Binary file not shown.
54 changes: 27 additions & 27 deletions sources/HPRINT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

(FILECREATED " 3-Aug-2022 21:31:57" {DSK}<home>larry>medley>sources>HPRINT.;3 58021
(FILECREATED "31-Jul-2023 13:33:10" {WMEDLEY}<sources>HPRINT.;5 57926

:CHANGES-TO (VARS HPRINTCOMS)
(FNS HPRINT)
:EDIT-BY rmk

:PREVIOUS-DATE "17-Oct-2021 13:54:11" {DSK}<home>larry>medley>sources>HPRINT.;1)
:CHANGES-TO (FNS EQUALALL)

:PREVIOUS-DATE " 3-Aug-2022 21:31:57" {WMEDLEY}<sources>HPRINT.;2)


(* ; "
Expand Down Expand Up @@ -901,8 +902,8 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2022 by Venue & Xerox Corporation
(DEFINEQ

(EQUALALL
[LAMBDA (X Y) (* ;
 "Edited 26-Apr-2021 14:34 by rmk:")
[LAMBDA (X Y) (* ; "Edited 31-Jul-2023 13:31 by rmk")
(* ; "Edited 26-Apr-2021 14:34 by rmk:")
(OR (EQ X Y)
(PROG ((TY (TYPENAME Y))
TEM)
Expand All @@ -925,7 +926,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2022 by Venue & Xerox Corporation
(ARRAYSIZE Y))
(for I from (ARRAYORIG X) as J to TEM
always (EQUALALL (ELT X I)
(ELT Y I])
(ELT Y I])
((ONED-ARRAY TWOD-ARRAY GENERAL-ARRAY)
(* ; "RMK: Added CL arrays")
[AND (EQUAL (CL:ARRAY-DIMENSIONS X)
Expand All @@ -939,14 +940,12 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2022 by Venue & Xerox Corporation
(EQP (CL:FILL-POINTER X)
(CL:FILL-POINTER Y)))
(NOT (CL:ARRAY-HAS-FILL-POINTER-P Y)))
(FOR I FROM 0 TO (SUB1 (CL:ARRAY-TOTAL-SIZE
X))
(FOR I FROM 0 TO (SUB1 (CL:ARRAY-TOTAL-SIZE X))
ALWAYS (EQUALALL (XCL:ROW-MAJOR-AREF X I)
(XCL:ROW-MAJOR-AREF Y I])
(XCL:ROW-MAJOR-AREF Y I])
(HARRAYP (EQUALHASH X Y))
(READTABLEP (for I from 0 to 127
always (EQUALALL (GETSYNTAX I X)
(GETSYNTAX I Y))))
(READTABLEP (for I from 0 to 127 always (EQUALALL (GETSYNTAX I X)
(GETSYNTAX I Y))))
(TERMTABLEP [AND (EQ (GETCONTROL X)
(GETCONTROL Y))
(EQ (GETRAISE X)
Expand All @@ -965,18 +964,19 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2022 by Venue & Xerox Corporation
Y]
(for I from 0 to 31
always (EQ (ECHOCONTROL I NIL X)
(ECHOCONTROL I NIL Y)))
(ECHOCONTROL I NIL Y)))
(EVERY ORIGDELETECONTROL
(FUNCTION (LAMBDA (Z)
(EQUAL (DELETECONTROL (CAR Z)
NIL X)
(DELETECONTROL (CAR Z)
NIL Y])
((BITMAP BIGBM)
(BITMAPEQUAL X Y))
(OR (EQP X Y)
(AND (SETQ TY (GETDESCRIPTORS TY))
(for FIELD in TY always (EQUALALL
(FETCHFIELD FIELD X)
(FETCHFIELD FIELD Y])
(for FIELD in TY always (EQUALALL (FETCHFIELD FIELD X)
(FETCHFIELD FIELD Y])

(EQUALHASH
[LAMBDA (AR1 AR2)
Expand Down Expand Up @@ -1118,14 +1118,14 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2022 by Venue & Xerox Corporation
(PUTPROPS HPRINT COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991
1993 1994 2022))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (3694 6232 (MAKEHVPRETTYCOMS 3704 . 4991) (READVARS 4993 . 5559) (HPRINT0 5561 . 6230))
(6234 6567 (READVARS-FROM-STRINGS 6234 . 6567)) (6569 6956 (READVARS-FROM-STREAM 6569 . 6956)) (6957
8885 (READVAR-FROM-STRING 6967 . 7373) (READVARS-FROM-STRING 7375 . 7611) (HPRINT-TO-STRING 7613 .
7819) (HPRINT-TO-STRINGS 7821 . 8883)) (9696 38289 (HPRINT 9706 . 11697) (HPRINT1 11699 . 23201) (
HPRINTEND 23203 . 24239) (RPTPRINT 24241 . 24479) (RPTEND 24481 . 24640) (RPTPUT 24642 . 25140) (
HPRINTSP 25142 . 25206) (HPERR 25208 . 25305) (HVFWDCDREAD 25307 . 25686) (HVBAKREAD 25688 . 33733) (
HVREADCHECKGETFN 33735 . 35134) (HVREADEND 35136 . 35488) (HVRPTREAD 35490 . 36016) (HVFWDREAD 36018
. 36872) (HREAD 36874 . 37196) (HPINITRDTBL 37198 . 38032) (HVREADERR 38034 . 38147) (HPRINSP 38149
. 38287)) (38290 47172 (COPYALL 38300 . 42203) (\COPYDATATYPE 42205 . 42894) (HCOPYALL 42896 . 43206)
(HCOPYALL1 43208 . 47170)) (47173 54520 (EQUALALL 47183 . 52841) (EQUALHASH 52843 . 54518)))))
(FILEMAP (NIL (3652 6190 (MAKEHVPRETTYCOMS 3662 . 4949) (READVARS 4951 . 5517) (HPRINT0 5519 . 6188))
(6192 6525 (READVARS-FROM-STRINGS 6192 . 6525)) (6527 6914 (READVARS-FROM-STREAM 6527 . 6914)) (6915
8843 (READVAR-FROM-STRING 6925 . 7331) (READVARS-FROM-STRING 7333 . 7569) (HPRINT-TO-STRING 7571 .
7777) (HPRINT-TO-STRINGS 7779 . 8841)) (9654 38247 (HPRINT 9664 . 11655) (HPRINT1 11657 . 23159) (
HPRINTEND 23161 . 24197) (RPTPRINT 24199 . 24437) (RPTEND 24439 . 24598) (RPTPUT 24600 . 25098) (
HPRINTSP 25100 . 25164) (HPERR 25166 . 25263) (HVFWDCDREAD 25265 . 25644) (HVBAKREAD 25646 . 33691) (
HVREADCHECKGETFN 33693 . 35092) (HVREADEND 35094 . 35446) (HVRPTREAD 35448 . 35974) (HVFWDREAD 35976
. 36830) (HREAD 36832 . 37154) (HPINITRDTBL 37156 . 37990) (HVREADERR 37992 . 38105) (HPRINSP 38107
. 38245)) (38248 47130 (COPYALL 38258 . 42161) (\COPYDATATYPE 42163 . 42852) (HCOPYALL 42854 . 43164)
(HCOPYALL1 43166 . 47128)) (47131 54425 (EQUALALL 47141 . 52746) (EQUALHASH 52748 . 54423)))))
STOP
Binary file modified sources/HPRINT.LCOM
View file
Open in desktop
Binary file not shown.
Loading