Skip to content

Commit 44b1f8a

Browse files
authored
hash p write pathname (#1612)
* #P"pathname" reads in as pathname * #P"pathname" used for printing pathnames * remake to remove extraneous reprint of CMLPATHNAMECOMS
1 parent d5cc219 commit 44b1f8a

File tree

4 files changed

+192
-132
lines changed

4 files changed

+192
-132
lines changed

sources/CMLPATHNAME

Lines changed: 62 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED " 1-May-2023 07:12:28" {DSK}<home>larry>il>medley>sources>CMLPATHNAME.;5 30540
3+
(FILECREATED " 9-Apr-2024 12:59:40" {DSK}<home>larry>il>medley>sources>CMLPATHNAME.;2 32347
44

55
:EDIT-BY "lmm"
66

7-
:CHANGES-TO (FNS PATHNAME)
8-
9-
:PREVIOUS-DATE "30-Apr-2023 14:00:37" {DSK}<home>larry>il>medley>sources>CMLPATHNAME.;4)
7+
:PREVIOUS-DATE "23-Mar-2024 22:31:11" {DSK}<home>larry>il>medley>sources>CMLPATHNAME.;1)
108

119

1210
(PRETTYCOMPRINT CMLPATHNAMECOMS)
@@ -40,8 +38,8 @@
4038
(DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
4139
(ADDVARS (NLAMA)
4240
(NLAML)
43-
(LAMA CL:ENOUGH-NAMESTRING CL:HOST-NAMESTRING FILE-NAME CL:MERGE-PATHNAMES
44-
PATHNAME %%PRINT-DIRECTORY-COMPONENT CL:MAKE-PATHNAME %%PRINT-PATHNAME])
41+
(LAMA CL:ENOUGH-NAMESTRING CL:MERGE-PATHNAMES CL:MAKE-PATHNAME %%PRINT-PATHNAME
42+
])
4543

4644

4745

@@ -84,8 +82,10 @@
8482
(DEFINEQ
8583

8684
(%%PRINT-PATHNAME
87-
(CL:LAMBDA (S STREAM D) (* hdj "19-Sep-86 15:49") (DECLARE (IGNORE D)) (CL:FORMAT STREAM "#.(~S ~S)" (QUOTE PATHNAME) (CL:NAMESTRING S)))
88-
)
85+
(CL:LAMBDA (S STREAM D) (* ; "Edited 23-Mar-2024 22:25 by lmm")
86+
(* hdj "19-Sep-86 15:49")
87+
(DECLARE (IGNORE D))
88+
(CL:FORMAT STREAM "#P~S" (CL:NAMESTRING S))))
8989

9090
(CL:MAKE-PATHNAME
9191
(CL:LAMBDA (&KEY DEFAULTS (HOST NIL HOSTP)
@@ -500,21 +500,62 @@
500500

501501
(ADDTOVAR NLAML )
502502

503+
(ADDTOVAR LAMA CL:ENOUGH-NAMESTRING CL:MERGE-PATHNAMES CL:MAKE-PATHNAME %%PRINT-PATHNAME)
504+
)
505+
(PRETTYCOMPRINT CMLPATHNAMECOMS)
506+
507+
(RPAQQ CMLPATHNAMECOMS
508+
[
509+
(* ;; "Common Lisp pathname functions")
510+
511+
(PROP FILETYPE CMLPATHNAME)
512+
(COMS
513+
(* ;; "useful macros")
514+
515+
(FUNCTIONS %%WILD-NAME %%COMPONENT-STRING))
516+
(STRUCTURES PATHNAME DIRECTORY-COMPONENT)
517+
(FNS %%PRINT-PATHNAME CL:MAKE-PATHNAME %%PRINT-DIRECTORY-COMPONENT)
518+
(FUNCTIONS CL:PATHNAME-HOST CL:PATHNAME-DEVICE CL:PATHNAME-DIRECTORY CL:PATHNAME-NAME
519+
CL:PATHNAME-TYPE CL:PATHNAME-VERSION)
520+
(FNS PATHNAME CL:MERGE-PATHNAMES FILE-NAME CL:HOST-NAMESTRING CL:ENOUGH-NAMESTRING
521+
%%NUMERIC-STRING-P)
522+
(FUNCTIONS CL:NAMESTRING CL:PARSE-NAMESTRING CL:TRUENAME)
523+
(FUNCTIONS %%MAKE-PATHNAME)
524+
(FUNCTIONS %%PATHNAME-EQUAL %%DIRECTORY-COMPONENT-EQUAL)
525+
(FUNCTIONS %%INITIALIZE-DEFAULT-PATHNAME)
526+
(VARIABLES *DEFAULT-PATHNAME-DEFAULTS*)
527+
(COMS
528+
(* ;; "Interlisp-D compatibility")
529+
530+
(FUNCTIONS INTERLISP-NAMESTRING UNPACKPATHNAME.STRING))
531+
(FUNCTIONS CL:FILE-NAMESTRING CL:DIRECTORY-NAMESTRING)
532+
(DECLARE%: DONTEVAL@LOAD DOCOPY (P (%%INITIALIZE-DEFAULT-PATHNAME)))
533+
(DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
534+
(ADDVARS (NLAMA)
535+
(NLAML)
536+
(LAMA CL:ENOUGH-NAMESTRING CL:HOST-NAMESTRING FILE-NAME CL:MERGE-PATHNAMES
537+
PATHNAME %%PRINT-DIRECTORY-COMPONENT CL:MAKE-PATHNAME %%PRINT-PATHNAME])
538+
(DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
539+
540+
(ADDTOVAR NLAMA )
541+
542+
(ADDTOVAR NLAML )
543+
503544
(ADDTOVAR LAMA CL:ENOUGH-NAMESTRING CL:HOST-NAMESTRING FILE-NAME CL:MERGE-PATHNAMES PATHNAME
504545
%%PRINT-DIRECTORY-COMPONENT CL:MAKE-PATHNAME %%PRINT-PATHNAME)
505546
)
506547
(DECLARE%: DONTCOPY
507-
(FILEMAP (NIL (2012 2143 (%%WILD-NAME 2012 . 2143)) (2145 2224 (%%COMPONENT-STRING 2145 . 2224)) (2829
508-
8600 (%%PRINT-PATHNAME 2839 . 3000) (CL:MAKE-PATHNAME 3002 . 7752) (%%PRINT-DIRECTORY-COMPONENT 7754
509-
. 8598)) (8602 8795 (CL:PATHNAME-HOST 8602 . 8795)) (8797 8996 (CL:PATHNAME-DEVICE 8797 . 8996)) (
510-
8998 9206 (CL:PATHNAME-DIRECTORY 8998 . 9206)) (9208 9401 (CL:PATHNAME-NAME 9208 . 9401)) (9403 9596 (
511-
CL:PATHNAME-TYPE 9403 . 9596)) (9598 9800 (CL:PATHNAME-VERSION 9598 . 9800)) (9801 15390 (PATHNAME
512-
9811 . 10268) (CL:MERGE-PATHNAMES 10270 . 12356) (FILE-NAME 12358 . 12499) (CL:HOST-NAMESTRING 12501
513-
. 12690) (CL:ENOUGH-NAMESTRING 12692 . 15157) (%%NUMERIC-STRING-P 15159 . 15388)) (15392 19145 (
514-
CL:NAMESTRING 15392 . 19145)) (19147 22618 (CL:PARSE-NAMESTRING 19147 . 22618)) (22620 23623 (
515-
CL:TRUENAME 22620 . 23623)) (23625 23817 (%%MAKE-PATHNAME 23625 . 23817)) (23819 24456 (
516-
%%PATHNAME-EQUAL 23819 . 24456)) (24458 24915 (%%DIRECTORY-COMPONENT-EQUAL 24458 . 24915)) (24917
517-
25540 (%%INITIALIZE-DEFAULT-PATHNAME 24917 . 25540)) (25630 25797 (INTERLISP-NAMESTRING 25630 . 25797)
518-
) (25799 28692 (UNPACKPATHNAME.STRING 25799 . 28692)) (28694 29951 (CL:FILE-NAMESTRING 28694 . 29951))
519-
(29953 30151 (CL:DIRECTORY-NAMESTRING 29953 . 30151)))))
548+
(FILEMAP (NIL (1912 2043 (%%WILD-NAME 1912 . 2043)) (2045 2124 (%%COMPONENT-STRING 2045 . 2124)) (2729
549+
8653 (%%PRINT-PATHNAME 2739 . 3053) (CL:MAKE-PATHNAME 3055 . 7805) (%%PRINT-DIRECTORY-COMPONENT 7807
550+
. 8651)) (8655 8848 (CL:PATHNAME-HOST 8655 . 8848)) (8850 9049 (CL:PATHNAME-DEVICE 8850 . 9049)) (
551+
9051 9259 (CL:PATHNAME-DIRECTORY 9051 . 9259)) (9261 9454 (CL:PATHNAME-NAME 9261 . 9454)) (9456 9649 (
552+
CL:PATHNAME-TYPE 9456 . 9649)) (9651 9853 (CL:PATHNAME-VERSION 9651 . 9853)) (9854 15443 (PATHNAME
553+
9864 . 10321) (CL:MERGE-PATHNAMES 10323 . 12409) (FILE-NAME 12411 . 12552) (CL:HOST-NAMESTRING 12554
554+
. 12743) (CL:ENOUGH-NAMESTRING 12745 . 15210) (%%NUMERIC-STRING-P 15212 . 15441)) (15445 19198 (
555+
CL:NAMESTRING 15445 . 19198)) (19200 22671 (CL:PARSE-NAMESTRING 19200 . 22671)) (22673 23676 (
556+
CL:TRUENAME 22673 . 23676)) (23678 23870 (%%MAKE-PATHNAME 23678 . 23870)) (23872 24509 (
557+
%%PATHNAME-EQUAL 23872 . 24509)) (24511 24968 (%%DIRECTORY-COMPONENT-EQUAL 24511 . 24968)) (24970
558+
25593 (%%INITIALIZE-DEFAULT-PATHNAME 24970 . 25593)) (25683 25850 (INTERLISP-NAMESTRING 25683 . 25850)
559+
) (25852 28745 (UNPACKPATHNAME.STRING 25852 . 28745)) (28747 30004 (CL:FILE-NAMESTRING 28747 . 30004))
560+
(30006 30204 (CL:DIRECTORY-NAMESTRING 30006 . 30204)))))
520561
STOP

sources/CMLPATHNAME.LCOM

1.07 KB
Binary file not shown.

0 commit comments

Comments
 (0)