Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
cmucl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Carl Shapiro
cmucl
Commits
5686e055
Commit
5686e055
authored
22 years ago
by
pmai
Browse files
Options
Downloads
Patches
Plain Diff
Applied patch by Raymond Toy to make pathname-host ANSI compliant.
parent
34ee4813
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
code/pathname.lisp
+8
-9
8 additions, 9 deletions
code/pathname.lisp
compiler/fndb.lisp
+2
-2
2 additions, 2 deletions
compiler/fndb.lisp
with
10 additions
and
11 deletions
code/pathname.lisp
+
8
−
9
View file @
5686e055
...
...
@@ -4,7 +4,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.
59
200
2/11/14 13:24:33 toy
Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pathname.lisp,v 1.
60
200
3/03/21 21:36:34 pmai
Exp $"
)
;;;
;;; **********************************************************************
;;;
...
...
@@ -642,7 +642,7 @@ a host-structure or string."
(
with-pathname
(
defaults
defaults
)
defaults
)))
(
default-host
(
if
defaults
(
%pathname-host
defaults
)
(
pathname-host
*default-pathname-defaults*
)))
(
%
pathname-host
*default-pathname-defaults*
)))
;; toy@rtp.ericsson.se: CLHS says make-pathname can take a
;; string (as a logical-host) for the host part. We map that
;; string into the corresponding logical host structure.
...
...
@@ -687,7 +687,7 @@ a host-structure or string."
(
flet
((
check-component-validity
(
name
name-or-type
)
(
when
(
stringp
name
)
(
let
((
unix-directory-separator
#\/
))
(
when
(
eq
host
(
pathname-host
*default-pathname-defaults*
))
(
when
(
eq
host
(
%
pathname-host
*default-pathname-defaults*
))
(
when
(
find
unix-directory-separator
name
)
(
warn
"Silly argument for a unix ~A: ~S"
name-or-type
name
)))))))
...
...
@@ -721,10 +721,9 @@ a host-structure or string."
"Accessor for the pathname's host."
(
declare
(
type
path-designator
pathname
)
(
type
(
member
:local
:common
)
case
)
(
values
host
)
(
values
(
or
string
null
)
)
(
ignore
case
))
(
with-pathname
(
pathname
pathname
)
(
%pathname-host
pathname
)))
(
host-namestring
pathname
))
;;; PATHNAME-DEVICE -- Interface
;;;
...
...
@@ -827,7 +826,7 @@ a host-structure or string."
(
host
(
if
(
and
host
(
stringp
host
))
(
find-logical-host
host
)
host
))
(
default-host
(
pathname-host
defaults
))
(
default-host
(
%
pathname-host
defaults
))
(
parse-host
(
or
host
(
extract-logical-host-prefix
namestr
start
end
)
default-host
)))
...
...
@@ -1441,7 +1440,7 @@ a host-structure or string."
The expansion for a search-list can be set with SETF."
(
with-pathname
(
pathname
pathname
)
(
let
((
search-list
(
extract-search-list
pathname
t
))
(
host
(
pathname-host
pathname
)))
(
host
(
%
pathname-host
pathname
)))
(
if
(
search-list-defined
search-list
)
(
mapcar
#'
(
lambda
(
directory
)
(
make-pathname
:host
host
...
...
@@ -1867,7 +1866,7 @@ a host-structure or string."
;; DEF-DIR is :absolute, as handled above. so return
;; the original directory.
path-dir
))))
(
make-pathname
:host
(
pathname-host
pathname
)
(
make-pathname
:host
(
%
pathname-host
pathname
)
:directory
enough-dir
:name
(
pathname-name
pathname
)
:type
(
pathname-type
pathname
)
...
...
This diff is collapsed.
Click to expand it.
compiler/fndb.lisp
+
2
−
2
View file @
5686e055
...
...
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/fndb.lisp,v 1.10
7
2003/0
2
/2
8 16:36:14 emarsden
Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/fndb.lisp,v 1.10
8
2003/0
3
/2
1 21:36:35 pmai
Exp $"
)
;;;
;;; **********************************************************************
;;;
...
...
@@ -975,7 +975,7 @@
(
defknown
pathnamep
(
t
)
boolean
(
movable
flushable
))
(
defknown
pathname-host
(
pathnamelike
&key
(
:case
(
member
:local
:common
)))
pathname-host
(
flushable
))
(
or
simple-string
null
)
(
flushable
))
(
defknown
pathname-device
(
pathnamelike
&key
(
:case
(
member
:local
:common
)))
pathname-device
(
flushable
))
(
defknown
pathname-directory
(
pathnamelike
&key
(
:case
(
member
:local
:common
)))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment