Fix places where rename of record LINE to XXLINE was incomplete (#1212)
This commit is contained in:
Larry Masinter
GitHub
parent
b493d98aeb
commit
3cca8c4940
183
sources/XXGEOM
183
sources/XXGEOM
@ -1,36 +1,30 @@
|
||||
(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
|
||||
(FILECREATED "13-Jun-2021 14:39:29"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XXGEOM.;2 49841
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
|
||||
changes to%: (VARS XXGEOMCOMS)
|
||||
(RECORDS XXLINE)
|
||||
(FNS MAKELINE LINE.LESSP)
|
||||
(MACROS \GETLINEORIGY \GETLINEDIFFY)
|
||||
(FILECREATED "14-May-2023 15:47:43" {DSK}<home>larry>il>medley>sources>XXGEOM.;5 48712
|
||||
|
||||
previous date%: "19-Jan-93 11:30:54"
|
||||
{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XXGEOM.;1)
|
||||
:EDIT-BY "lmm"
|
||||
|
||||
:CHANGES-TO (MACROS GETLINEORIG)
|
||||
|
||||
:PREVIOUS-DATE "13-Jun-2021 14:39:29" {DSK}<home>larry>il>medley>sources>XXGEOM.;4)
|
||||
|
||||
(* ; "
|
||||
Copyright (c) 1985-1987, 1990, 1993, 2021 by Venue & Xerox Corporation.
|
||||
")
|
||||
|
||||
(PRETTYCOMPRINT XXGEOMCOMS)
|
||||
|
||||
(RPAQQ XXGEOMCOMS
|
||||
(
|
||||
|
||||
(* ;;; "Integer Geometry Library")
|
||||
(* ;;; "Integer Geometry Library")
|
||||
|
||||
|
||||
|
||||
(* ;;; "Scalar methods")
|
||||
(* ;;; "Scalar methods")
|
||||
|
||||
(DECLARE%: EVAL@COMPILE DONTCOPY (MACROS \SGN))
|
||||
(FNS \IRND)
|
||||
|
||||
|
||||
(* ;;; "XYpt object and methods")
|
||||
(* ;;; "XYpt object and methods")
|
||||
|
||||
(RECORDS XYPT)
|
||||
(DECLARE%: EVAL@COMPILE DONTCOPY (MACROS XYPT.X XYPT.Y))
|
||||
@ -39,7 +33,7 @@ Copyright (c) 1985-1987, 1990, 1993, 2021 by Venue & Xerox Corporation.
|
||||
MMLTLIST IMLTLIST XYPT.LESSP PATH.LESSP CONVEXP)
|
||||
|
||||
|
||||
(* ;;; "Line object and methods")
|
||||
(* ;;; "Line object and methods")
|
||||
|
||||
(RECORDS XXLINE)
|
||||
(DECLARE%: EVAL@COMPILE DONTCOPY (MACROS GETLINEDIFF GETLINEORIG \GETLINEDIFF \GETLINEORIGY
|
||||
@ -48,24 +42,24 @@ Copyright (c) 1985-1987, 1990, 1993, 2021 by Venue & Xerox Corporation.
|
||||
(FNS LINEY MIDDX INITX TERMX SCANX XPROD)
|
||||
|
||||
|
||||
(* ;;; "line segment methods")
|
||||
(* ;;; "line segment methods")
|
||||
|
||||
(FNS XYSECTLSEG)
|
||||
|
||||
|
||||
(* ;;; "Bresenham line object and methods")
|
||||
(* ;;; "Bresenham line object and methods")
|
||||
|
||||
(RECORDS BRES)
|
||||
(FNS MAKEBRES)
|
||||
(DECLARE%: EVAL@COMPILE DONTCOPY (MACROS BRESSTEP))
|
||||
|
||||
|
||||
(* ;;; "Debugging control panel")
|
||||
(* ;;; "Debugging control panel")
|
||||
|
||||
(DECLARE%: EVAL@COMPILE DONTCOPY (VARS \GEOM.PANEL))
|
||||
|
||||
|
||||
(* ;;; "Trapezoidal decomposition")
|
||||
(* ;;; "Trapezoidal decomposition")
|
||||
|
||||
(FNS TRAPLOOP TRAPMAKE)
|
||||
(VARS TRAP.DEBUG)
|
||||
@ -84,11 +78,11 @@ Copyright (c) 1985-1987, 1990, 1993, 2021 by Venue & Xerox Corporation.
|
||||
(DECLARE%: EVAL@COMPILE
|
||||
|
||||
(PUTPROPS \SGN DMACRO ((VAL)
|
||||
(if (IGREATERP VAL 0)
|
||||
then 1
|
||||
elseif (ILESSP VAL 0)
|
||||
then -1
|
||||
else 0)))
|
||||
(if (IGREATERP VAL 0)
|
||||
then 1
|
||||
elseif (ILESSP VAL 0)
|
||||
then -1
|
||||
else 0)))
|
||||
)
|
||||
)
|
||||
(DEFINEQ
|
||||
@ -119,26 +113,26 @@ Copyright (c) 1985-1987, 1990, 1993, 2021 by Venue & Xerox Corporation.
|
||||
(DECLARE%: EVAL@COMPILE
|
||||
|
||||
(PUTPROPS XYPT.X DMACRO ((PT)
|
||||
(CAR PT)))
|
||||
(CAR PT)))
|
||||
|
||||
(PUTPROPS XYPT.Y DMACRO ((PT)
|
||||
(CDR PT)))
|
||||
(CDR PT)))
|
||||
)
|
||||
)
|
||||
(DECLARE%: EVAL@COMPILE DONTCOPY
|
||||
(DECLARE%: EVAL@COMPILE
|
||||
|
||||
(PUTPROPS HEADPT DMACRO ((PATH)
|
||||
(CAR PATH)))
|
||||
(CAR PATH)))
|
||||
|
||||
(PUTPROPS NEXTPT DMACRO ((PATH)
|
||||
(CADR PATH)))
|
||||
(CADR PATH)))
|
||||
|
||||
(PUTPROPS HEADPTY DMACRO ((PATH)
|
||||
(CDAR PATH)))
|
||||
(CDAR PATH)))
|
||||
|
||||
(PUTPROPS NEXTPTY DMACRO ((PATH)
|
||||
(CDADR PATH)))
|
||||
(CDADR PATH)))
|
||||
)
|
||||
)
|
||||
(DEFINEQ
|
||||
@ -587,35 +581,30 @@ Copyright (c) 1985-1987, 1990, 1993, 2021 by Venue & Xerox Corporation.
|
||||
|
||||
(PUTPROPS GETLINEDIFF DMACRO [(SELF DX DY)
|
||||
|
||||
(* ;; "External method, get dx, dy from line")
|
||||
(* ;; "External method, get dx, dy from line")
|
||||
|
||||
(WITH LINE SELF (SETQ DX (ffetch (XYPT X) of DIFF))
|
||||
(SETQ DY (ffetch (XYPT Y) OF DIFF])
|
||||
(WITH XXLINE SELF (SETQ DX (ffetch (XYPT X) of DIFF))
|
||||
(SETQ DY (ffetch (XYPT Y) OF DIFF])
|
||||
|
||||
(PUTPROPS GETLINEORIG DMACRO [(SELF OX OY)
|
||||
|
||||
(* ;; "External method, get dx, dy from line")
|
||||
(* ;; "External method, get dx, dy from line")
|
||||
|
||||
(WITH LINE SELF (SETQ OX (ffetch (XYPT X) of ORIG))
|
||||
(SETQ OY (ffetch (XYPT Y) OF ORIG])
|
||||
(WITH XXLINE SELF (SETQ OX (ffetch (XYPT X) of ORIG))
|
||||
(SETQ OY (ffetch (XYPT Y) OF ORIG])
|
||||
|
||||
(PUTPROPS \GETLINEDIFF DMACRO [(SELF DX DY) (* edited " 1-Jan-00 00:00")
|
||||
(PUTPROPS \GETLINEDIFF DMACRO [(SELF DX DY) (* edited " 1-Jan-00 00:00")
|
||||
|
||||
(* ;; "Degenerate private method, get dx, dy from line")
|
||||
(* ;; "Degenerate private method, get dx, dy from line")
|
||||
|
||||
(WITH LINE SELF (SETQ DX (FFETCH (XYPT X) OF
|
||||
DIFF))
|
||||
(SETQ DY (FFETCH (XYPT T) OF DIFF])
|
||||
(WITH XXLINE SELF (SETQ DX (FFETCH (XYPT X) OF DIFF))
|
||||
(SETQ DY (FFETCH (XYPT T) OF DIFF])
|
||||
|
||||
(PUTPROPS \GETLINEORIGY DMACRO [(SELF YPTR)
|
||||
(SETQ YPTR (FFETCH (XYPT Y) of (FFETCH
|
||||
(XXLINE ORIG)
|
||||
of SELF])
|
||||
(SETQ YPTR (FFETCH (XYPT Y) of (FFETCH (XXLINE ORIG) of SELF])
|
||||
|
||||
(PUTPROPS \GETLINEDIFFY DMACRO [(SELF YPTR)
|
||||
(SETQ YPTR (FFETCH (XYPT Y) of (FFETCH
|
||||
(XXLINE DIFF)
|
||||
of SELF])
|
||||
(SETQ YPTR (FFETCH (XYPT Y) of (FFETCH (XXLINE DIFF) of SELF])
|
||||
)
|
||||
)
|
||||
(DEFINEQ
|
||||
@ -990,54 +979,53 @@ Copyright (c) 1985-1987, 1990, 1993, 2021 by Venue & Xerox Corporation.
|
||||
|
||||
(PUTPROPS BRESSTEP DMACRO ((SELF SCANY INITX TERMX)
|
||||
|
||||
(* * Assume that this Y is exactly incremented by one from the last call, so
|
||||
DDA can be used. Then passed parameter scany is not used.)
|
||||
(* * Assume that this Y is exactly incremented by one from the last call, so DDA
|
||||
can be used. Then passed parameter scany is not used.)
|
||||
|
||||
(* * (WITH BRES SELF (*) (SETQ INITX X)
|
||||
(IF (EQ MAJOR (QUOTE X)) THEN (while (ILESSP P 0) do
|
||||
(SETQ X (IPLUS X IX)) (SETQ P (IPLUS P IPX)))
|
||||
(IF (ILEQ INITX X) THEN (SETQ TERMX X) ELSE
|
||||
(SETQ TERMX INITX) (SETQ INITX X)) (SETQ X
|
||||
(IPLUS X IX)) (SETQ P (IPLUS P IPY)) ELSE
|
||||
(SETQ TERMX X) (if (ILESSP P 0) then (SETQ P
|
||||
(IPLUS P IPY)) else (SETQ P (IPLUS P IPX))
|
||||
(SETQ X (IPLUS X IX))))))
|
||||
(* * (WITH BRES SELF (*) (SETQ INITX X) (IF
|
||||
(EQ MAJOR (QUOTE X)) THEN (while (ILESSP P 0) do
|
||||
(SETQ X (IPLUS X IX)) (SETQ P (IPLUS P IPX)))
|
||||
(IF (ILEQ INITX X) THEN (SETQ TERMX X) ELSE
|
||||
(SETQ TERMX INITX) (SETQ INITX X)) (SETQ X
|
||||
(IPLUS X IX)) (SETQ P (IPLUS P IPY)) ELSE
|
||||
(SETQ TERMX X) (if (ILESSP P 0) then (SETQ P
|
||||
(IPLUS P IPY)) else (SETQ P (IPLUS P IPX))
|
||||
(SETQ X (IPLUS X IX))))))
|
||||
|
||||
(LET (X0 DX D DDX DDY)
|
||||
(LET (X0 DX D DDX DDY)
|
||||
|
||||
(* * (WITH BRES SELF (*) (SETQ X0 X) (SETQ DX IX)
|
||||
(SETQ D P) (SETQ DDX IPX) (SETQ DDY IPY)))
|
||||
(* * (WITH BRES SELF (*) (SETQ X0 X) (SETQ DX IX)
|
||||
(SETQ D P) (SETQ DDX IPX) (SETQ DDY IPY)))
|
||||
|
||||
(SETQ D (FFETCH (BRES P) OF SELF))
|
||||
(SETQ X0 (FFETCH (BRES X) OF SELF))
|
||||
(SETQ DX (FFETCH (BRES IX) OF SELF))
|
||||
(SETQ DDX (FFETCH (BRES IPX) OF SELF))
|
||||
(SETQ DDY (FFETCH (BRES IPY) OF SELF))
|
||||
(SETQ D (FFETCH (BRES P) OF SELF))
|
||||
(SETQ X0 (FFETCH (BRES X) OF SELF))
|
||||
(SETQ DX (FFETCH (BRES IX) OF SELF))
|
||||
(SETQ DDX (FFETCH (BRES IPX) OF SELF))
|
||||
(SETQ DDY (FFETCH (BRES IPY) OF SELF))
|
||||
|
||||
(* * Above faster than WITH form * *)
|
||||
(* * Above faster than WITH form * *)
|
||||
|
||||
(SETQ INITX X0)
|
||||
[IF (EQ (FFETCH (BRES MAJOR) OF SELF)
|
||||
'X)
|
||||
THEN (while (ILESSP D 0)
|
||||
do (SETQ X0 (IPLUS X0 DX))
|
||||
(SETQ D (IPLUS D DDX)))
|
||||
(IF (ILEQ INITX X0)
|
||||
THEN (SETQ TERMX X0)
|
||||
ELSE (SETQ TERMX INITX)
|
||||
(SETQ INITX X0))
|
||||
(SETQ X0 (IPLUS X0 DX))
|
||||
(SETQ D (IPLUS D DDY))
|
||||
ELSE (SETQ TERMX X0)
|
||||
(if (ILESSP D 0)
|
||||
then (SETQ D (IPLUS D DDY))
|
||||
else (SETQ D (IPLUS D DDX))
|
||||
(SETQ X0 (IPLUS X0 DX]
|
||||
(SETQ INITX X0)
|
||||
[IF (EQ (FFETCH (BRES MAJOR) OF SELF)
|
||||
'X)
|
||||
THEN (while (ILESSP D 0) do (SETQ X0 (IPLUS X0 DX))
|
||||
(SETQ D (IPLUS D DDX)))
|
||||
(IF (ILEQ INITX X0)
|
||||
THEN (SETQ TERMX X0)
|
||||
ELSE (SETQ TERMX INITX)
|
||||
(SETQ INITX X0))
|
||||
(SETQ X0 (IPLUS X0 DX))
|
||||
(SETQ D (IPLUS D DDY))
|
||||
ELSE (SETQ TERMX X0)
|
||||
(if (ILESSP D 0)
|
||||
then (SETQ D (IPLUS D DDY))
|
||||
else (SETQ D (IPLUS D DDX))
|
||||
(SETQ X0 (IPLUS X0 DX]
|
||||
|
||||
(* * (WITH BRES SELF (*) (SETQ X X0) (SETQ P D)))
|
||||
(* * (WITH BRES SELF (*) (SETQ X X0) (SETQ P D)))
|
||||
|
||||
(FREPLACE (BRES X) OF SELF with X0)
|
||||
(FREPLACE (BRES P) OF SELF with D))))
|
||||
(FREPLACE (BRES X) OF SELF with X0)
|
||||
(FREPLACE (BRES P) OF SELF with D))))
|
||||
)
|
||||
)
|
||||
|
||||
@ -1223,15 +1211,14 @@ Copyright (c) 1985-1987, 1990, 1993, 2021 by Venue & Xerox Corporation.
|
||||
(PRINTOUT MYWIN "CONVEX: " (CONVEXP RLIST)
|
||||
T])
|
||||
)
|
||||
(PUTPROPS XXGEOM COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1990 1993 2021))
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (2461 2894 (\IRND 2471 . 2892)) (3638 23250 (MAKEXYPT 3648 . 3879) (IRNDLIST 3881 . 4485
|
||||
) (NORMLOOP 4487 . 6115) (SLITLOOP 6117 . 7816) (PREPLOOP 7818 . 8483) (YMAPLIST 8485 . 10046) (
|
||||
IMAPLIST 10048 . 13607) (UNIQLIST 13609 . 14230) (MERGLIST 14232 . 16879) (MMLTLIST 16881 . 17694) (
|
||||
IMLTLIST 17696 . 18579) (XYPT.LESSP 18581 . 18950) (PATH.LESSP 18952 . 20278) (CONVEXP 20280 . 23248))
|
||||
(25235 30477 (MAKELINE 25245 . 25928) (MSECT 25930 . 26399) (XSECT 26401 . 26957) (YSECT 26959 .
|
||||
27517) (XYSECT 27519 . 28260) (KNOTLINE 28262 . 29186) (KNOTLOOP 29188 . 30064) (LINE.LESSP 30066 .
|
||||
30475)) (30478 34052 (LINEY 30488 . 30942) (MIDDX 30944 . 31447) (INITX 31449 . 32130) (TERMX 32132 .
|
||||
32762) (SCANX 32764 . 33548) (XPROD 33550 . 34050)) (34092 35556 (XYSECTLSEG 34102 . 35554)) (36000
|
||||
38555 (MAKEBRES 36010 . 38553)) (42116 48478 (TRAPLOOP 42126 . 44868) (TRAPMAKE 44870 . 48476)))))
|
||||
(FILEMAP (NIL (2192 2625 (\IRND 2202 . 2623)) (3321 22933 (MAKEXYPT 3331 . 3562) (IRNDLIST 3564 . 4168
|
||||
) (NORMLOOP 4170 . 5798) (SLITLOOP 5800 . 7499) (PREPLOOP 7501 . 8166) (YMAPLIST 8168 . 9729) (
|
||||
IMAPLIST 9731 . 13290) (UNIQLIST 13292 . 13913) (MERGLIST 13915 . 16562) (MMLTLIST 16564 . 17377) (
|
||||
IMLTLIST 17379 . 18262) (XYPT.LESSP 18264 . 18633) (PATH.LESSP 18635 . 19961) (CONVEXP 19963 . 22931))
|
||||
(24428 29670 (MAKELINE 24438 . 25121) (MSECT 25123 . 25592) (XSECT 25594 . 26150) (YSECT 26152 .
|
||||
26710) (XYSECT 26712 . 27453) (KNOTLINE 27455 . 28379) (KNOTLOOP 28381 . 29257) (LINE.LESSP 29259 .
|
||||
29668)) (29671 33245 (LINEY 29681 . 30135) (MIDDX 30137 . 30640) (INITX 30642 . 31323) (TERMX 31325 .
|
||||
31955) (SCANX 31957 . 32741) (XPROD 32743 . 33243)) (33285 34749 (XYSECTLSEG 33295 . 34747)) (35193
|
||||
37748 (MAKEBRES 35203 . 37746)) (41075 47437 (TRAPLOOP 41085 . 43827) (TRAPMAKE 43829 . 47435)))))
|
||||
STOP
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user