Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
asdf
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
Container Registry
Model registry
Operate
Environments
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
Jan Moringen
asdf
Commits
f2caf8a2
Commit
f2caf8a2
authored
10 years ago
by
Francois-Rene Rideau
Browse files
Options
Downloads
Patches
Plain Diff
Replace a trivial if-let by or.
parent
c713e0a0
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
find-system.lisp
+34
-35
34 additions, 35 deletions
find-system.lisp
with
34 additions
and
35 deletions
find-system.lisp
+
34
−
35
View file @
f2caf8a2
...
@@ -386,38 +386,37 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded.
...
@@ -386,38 +386,37 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded.
(
let
((
primary-name
(
primary-system-name
name
)))
(
let
((
primary-name
(
primary-system-name
name
)))
(
unless
(
equal
name
primary-name
)
(
unless
(
equal
name
primary-name
)
(
find-system
primary-name
nil
)))
(
find-system
primary-name
nil
)))
(
if-let
(
x
(
and
*immutable-systems*
(
gethash
name
*immutable-systems*
)
(
or
(
and
*immutable-systems*
(
gethash
name
*immutable-systems*
)
(
cdr
(
system-registered-p
name
))))
(
cdr
(
system-registered-p
name
)))
x
(
multiple-value-bind
(
foundp
found-system
pathname
previous
previous-time
)
(
multiple-value-bind
(
foundp
found-system
pathname
previous
previous-time
)
(
locate-system
name
)
(
locate-system
name
)
(
assert
(
eq
foundp
(
and
(
or
found-system
pathname
previous
)
t
)))
(
assert
(
eq
foundp
(
and
(
or
found-system
pathname
previous
)
t
)))
(
let
((
previous-pathname
(
and
previous
(
system-source-file
previous
)))
(
let
((
previous-pathname
(
and
previous
(
system-source-file
previous
)))
(
system
(
or
previous
found-system
)))
(
system
(
or
previous
found-system
)))
(
when
(
and
found-system
(
not
previous
))
(
when
(
and
found-system
(
not
previous
))
(
register-system
found-system
))
(
register-system
found-system
))
(
when
(
and
system
pathname
)
(
when
(
and
system
pathname
)
(
setf
(
system-source-file
system
)
pathname
))
(
setf
(
system-source-file
system
)
pathname
))
(
when
(
and
pathname
(
when
(
and
pathname
(
let
((
stamp
(
get-file-stamp
pathname
)))
(
let
((
stamp
(
get-file-stamp
pathname
)))
(
and
stamp
(
and
stamp
(
not
(
and
previous
(
not
(
and
previous
(
or
(
pathname-equal
pathname
previous-pathname
)
(
or
(
pathname-equal
pathname
previous-pathname
)
(
and
pathname
previous-pathname
(
and
pathname
previous-pathname
(
pathname-equal
(
pathname-equal
(
physicalize-pathname
pathname
)
(
physicalize-pathname
pathname
)
(
physicalize-pathname
previous-pathname
))))
(
physicalize-pathname
previous-pathname
))))
(
stamp<=
stamp
previous-time
))))))
(
stamp<=
stamp
previous-time
))))))
;; only load when it's a pathname that is different or has newer content, and not an old asdf
;; only load when it's a pathname that is different or has newer content, and not an old asdf
(
load-asd
pathname
:name
name
)))
(
load-asd
pathname
:name
name
)))
(
let
((
in-memory
(
system-registered-p
name
)))
; try again after loading from disk if needed
(
let
((
in-memory
(
system-registered-p
name
)))
; try again after loading from disk if needed
(
cond
(
cond
(
in-memory
(
in-memory
(
when
pathname
(
when
pathname
(
setf
(
car
in-memory
)
(
get-file-stamp
pathname
)))
(
setf
(
car
in-memory
)
(
get-file-stamp
pathname
)))
(
cdr
in-memory
))
(
cdr
in-memory
))
(
error-p
(
error-p
(
error
'missing-component
:requires
name
))
(
error
'missing-component
:requires
name
))
(
t
;; not found: don't keep negative cache, see lp#1335323
(
t
;; not found: don't keep negative cache, see lp#1335323
(
unset-asdf-cache-entry
`
(
locate-system
,
name
))
(
unset-asdf-cache-entry
`
(
locate-system
,
name
))
(
return-from
find-system
nil
)))))))))
(
return-from
find-system
nil
)))))))))
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