From 0469bd2820f8c7c82f28c777be0905ac2c4adb5c Mon Sep 17 00:00:00 2001
From: Larry Masinter <lmm@acm.org>
Date: Thu, 14 Aug 2025 20:01:59 -0700
Subject: [PATCH] change RING to HRING to avoid record name conflicdt (#2258)

---
 lispusers/HANOI      |  36 +++++++++++++++++++-----------------
 lispusers/HANOI.LCOM | Bin 7040 -> 6981 bytes
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/lispusers/HANOI b/lispusers/HANOI
index 99143961..00a5f1b1 100644
--- a/lispusers/HANOI
+++ b/lispusers/HANOI
@@ -1,23 +1,23 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "21-Aug-2022 18:08:56" {DSK}<home>larry>medley>lispusers>HANOI.;2
 22228  
+
(FILECREATED "14-Aug-2025 19:01:29" {DSK}<home>larry>il>medley>lispusers>HANOI.;8
 22477  
+
+      :EDIT-BY "lmm"
 
       :CHANGES-TO (VARS HANOICOMS)
+                  (FNS HANOIDEMO WHANOI)
+                  (RECORDS HRING)
 
-      :PREVIOUS-DATE "25-Feb-86 19:07:01" {DSK}<home>larry>medley>lispusers>HANOI.;1)
+      :PREVIOUS-DATE "14-Aug-2025 19:00:08" {DSK}<home>larry>il>medley>lispusers>HANOI.;7)
 
 
-(* ; "
-Copyright (c) 1982-1986 by Xerox Corporation.
-")
-
 (PRETTYCOMPRINT HANOICOMS)
 
 (RPAQQ HANOICOMS

        ((FNS DISPLAYPEGSANDRINGS DOHANOI FINDOTHER HANOI HANOIDEMO MOVEDIS MOVERING RINGSHADE 
              SETUPRINGBITMAPS TRACK WHANOI XHANOI)
         (VARS (HANOIWINDOW))
-        (DECLARE%: DONTCOPY (RECORDS PEG RING)
+        (DECLARE%: DONTCOPY (RECORDS PEG HRING)
                (CONSTANTS XRINGSHADE ORINGSHADE XPEGSHADE)
                (CONSTANTS PEGMIN HANOIMARGIN (MAXVERTSPEED 30)
                       (MAXHORIZSPEED 44))
@@ -64,8 +64,10 @@ Copyright (c) 1982-1986 by Xerox Corporation.
     (WHANOI
 NRINGS WINDOW FONT ONCE])
 
 (HANOIDEMO

-  [LAMBDA NIL                                                (* lmm "17-Feb-86 14:58")

+  [LAMBDA NIL
                                                (* ; "Edited 14-Aug-2025 19:00 by lmm")

+                                                             (* lmm "17-Feb-86 14:58")

     (PROG (HANOI.MOUSE.SPEED)
+          (DECLARE
 (SPECVARS HANOI.MOUSE.SPEED))
           (WHANOI
 7
                  [COND
                     ((TYPENAMEP HANOIWINDOW 'WINDOW)
@@ -259,7 +261,8 @@ Copyright (c) 1982-1986 by Xerox Corporation.
                                      2])
 
 (WHANOI

-  [LAMBDA (RINGS W FONT ONCE)                                (* lmm " 3-Dec-85 12:51")

+  [LAMBDA (RINGS W FONT ONCE)
                                (* ; "Edited 14-Aug-2025 18:54 by lmm")

+                                                             (* lmm " 3-Dec-85 12:51")

                                                              (* runs hanoi in a region of a 
 
                                                             displaystream)

     (PROG ([REGION (DSPCLIPPINGREGION NIL (SETQ W (COND
@@ -331,7 +334,7 @@ Copyright (c) 1982-1986 by Xerox Corporation.
                                                                 WIDTH _ PEGWIDTH
                                                                 HEIGHT _ (ITIMES RINGHEIGHT
                                                                                 (ADD1 NRINGS)))
-                                             RINGS _ (LIST (create
 RING
+                                             RINGS _ (LIST (create
 HRING
                                                                   RINGREGION _ BASE
                                                                   RINGNUMBER _ 'BASE]
           [PROG [(SOURCEPEG (PEGN 1))
@@ -344,7 +347,7 @@ Copyright (c) 1982-1986 by Xerox Corporation.
                    from
 (IPLUS HANOIMARGIN (ITIMES RINGLARGEST (SUB1 1))) by
 RINGDELTA as
 I
                    from
 0 to
 (SUB1 NRINGS) as
 LABEL in
 RINGLABELS
                    do
 (push
 (fetch
 RINGS of
 SOURCEPEG)
-                            (create
 RING
+                            (create
 HRING
                                    RINGREGION _ (create
 REGION
                                                        LEFT _ RINGLEFT
                                                        BOTTOM _ RINGBOTTOM
@@ -385,7 +388,7 @@ Copyright (c) 1982-1986 by Xerox Corporation.
 
 (RECORD PEG
 (PEGREGION RINGS))
 
-(RECORD RING
 (RINGREGION RINGNUMBER RINGLABEL))
+(RECORD HRING
 (RINGREGION RINGNUMBER RINGLABEL))
 )
 
 (DECLARE%: EVAL@COMPILE 
@@ -435,10 +438,9 @@ Copyright (c) 1982-1986 by Xerox Corporation.
                                                  (HANOI (UNPACK "Interlisp.org")
                                                         W
                                                         '(TIMESROMAND 36])
-(PUTPROPS HANOI COPYRIGHT ("Xerox Corporation" 1982 1983 1984 1985 1986))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (920 20991 (DISPLAYPEGSANDRINGS 930 . 1875) (DOHANOI 1877 . 2288) (FINDOTHER 2290 . 2512
-) (HANOI 2514 . 2657) (HANOIDEMO 2659 . 3254) (MOVEDIS 3256 . 8151) (MOVERING 8153 . 8808) (RINGSHADE 
-8810 . 9049) (SETUPRINGBITMAPS 9051 . 12799) (TRACK 12801 . 13291) (WHANOI 13293 . 20670) (XHANOI 
-20672 . 20989)))))
+  (FILEMAP (NIL (969 21313 (DISPLAYPEGSANDRINGS 979 . 1924) (DOHANOI 1926 . 2337) (FINDOTHER 2339 . 2561
+) (HANOI 2563 . 2706) (HANOIDEMO 2708 . 3465) (MOVEDIS 3467 . 8362) (MOVERING 8364 . 9019) (RINGSHADE 
+9021 . 9260) (SETUPRINGBITMAPS 9262 . 13010) (TRACK 13012 . 13502) (WHANOI 13504 . 20992) (XHANOI 
+20994 . 21311)))))
 STOP
diff --git a/lispusers/HANOI.LCOM b/lispusers/HANOI.LCOM
index 108adda30761c6dff04662c890ad768bd10949cc..8977fb129d54a1dbb515880925b36f04c6fea6ea 100644
GIT binary patch
delta 544
zcmZ{gPfG$p7>6+`%!6KnvMw(pgnL+-o!xD931M|dT~cS+U6rDXpp>KqW`~HdQ@0>l
z=u33;BZSbg58$bL-=Q)8lu(!9H^29pmxsC6M*B~-O-T`r>r;_nqJostv80pK;5@d{
zY7ZWx{iFaPB*{Mr!Me;T4FSrsl5G{KnBzwSLF)pLVcRbJ#uJGIf=0d9Y``CDBozsv
z_~d=op@v6I4lU{IPJIyEn(pD<!P#Y}nQqs+-JA4G4+v2-4RmT+o|riT)b4ap2=r{h
zDCemwdJN)K!*PM%nZ=D=0phvx>~7K$gWC6q*AC4x$K)f&D(3~zZHHDZR&hm>t4+RP
zNlnLC-@?iN)B>9Svi%k)_*c=7;VAI1-nYC=(E~N5LS`0aWgeB}qE(0jC%I$lFdO6~
znG-UR=aHy*K@g1RwX~mFM0wHj#V++Kwlf?DpV$0enE9jdp8pwE{8)tfy$IWw+Gq+4
Q-y^R<zq&JCEnCIV7pG#91^@s6

delta 545
zcmX?V)?hv%T*Syw*ReER*T}%gNWsv;%D}?P)O=#L^2CV}^+uWsTuMd;Nb-hOh9*EI
zN(xEI`MCu->M07Dc?wEyp*}te$m;a;^pq4*5=&B36tL(wG*Hsy(s1+iadi%IbqsNJ
z0V=|Dgqf0{LbXe<cdboEer~E=PGV6}<-`e+QAP?zKwzO@<?P|;=k6M;8{)5^5#|^a
z%%uPn@b`4~_YKxmunGur4fFI54c2u5+5oh`RM#yvN!P+m!O+smz}(8fPzjsqjE0-H
zGIy|PcsqH9IQfJqm|B`DIKer_CJ2s+1xRLcESCfyOy1bY7$j8BB_RzHGBmS9XfZT4
z0CG03;abMZ=sh`5AOJ`%5Ksq_#{^7)<S(#@r(ggtOuISA!p(~W4|7NW{Sy)r3G`e*
zkf&b=!mE>cm`+T-%JgV*iqu^{jeyXQfFS>XV2HeevwuKjkf*yxh=PVvL~2ofg@SW_
mQ9*uDVo7Fxo)R!9EP!!tX<-Z^OhAMwh%nRC<nr_M;Q{~<vXdGB