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
10d17308
Commit
10d17308
authored
30 years ago
by
ram
Browse files
Options
Downloads
Patches
Plain Diff
Fixed last tweak to block compilation to actually work in the normal case.
parent
9c8c80dc
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
compiler/main.lisp
+17
-7
17 additions, 7 deletions
compiler/main.lisp
with
17 additions
and
7 deletions
compiler/main.lisp
+
17
−
7
View file @
10d17308
...
...
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;;
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/main.lisp,v 1.10
4
1994/0
8/21 15:19
:1
9
ram Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/main.lisp,v 1.10
5
1994/0
9/30 01:42
:1
3
ram Exp $"
)
;;;
;;; **********************************************************************
;;;
...
...
@@ -83,11 +83,18 @@
;;; :Block-Compile and :Entry-Points arguments that COMPILE-FILE was called
;;; with. Subsequent START-BLOCK or END-BLOCK declarations alter the values.
;;;
;;; *Block-Compile-Argument* holds the original value of the :block-compile
;;; argument, which overrides any internal declarations.
;;;
(
defvar
*block-compile*
)
(
declaim
(
type
(
member
nil
t
:specified
)
*block-compile*
))
(
defvar
*block-compile-argument*
)
(
declaim
(
type
(
member
nil
t
:specified
)
*block-compile*
*block-compile-argument*
))
(
defvar
*entry-points*
)
(
declaim
(
list
*entry-points*
))
;;;
;;; When block compiling, used by PROCESS-FORM to accumulate top-level lambdas
;;; resulting from compiling subforms. (In reverse order.)
;;;
...
...
@@ -1045,12 +1052,13 @@
;;;
;;; If a special block compilation delimiter, then start or end the block as
;;; appropriate. Otherwise, just convert-and-maybe-compile the form. If
;;; *BLOCK-COMPILE* is NIL, then we ignore block declarations.
;;; :block-compile was T or NIL, then we ignore any start/end block
;;; declarations.
;;;
(
defun
process-proclaim
(
form
path
)
(
if
(
and
(
eql
(
length
form
)
2
)
(
constantp
(
cadr
form
)))
(
let
((
spec
(
eval
(
cadr
form
))))
(
if
(
and
(
consp
spec
)
(
eq
*block-compile*
:specified
))
(
if
(
and
(
consp
spec
)
(
eq
*block-compile
-argument
*
:specified
))
(
case
(
first
spec
)
(
start-block
(
finish-block-compilation
)
...
...
@@ -1477,7 +1485,8 @@
(
defun
sub-compile-file
(
info
&optional
d-s-info
)
(
declare
(
type
source-info
info
))
(
with-ir1-namespace
(
let*
((
start-errors
*compiler-error-count*
)
(
let*
((
*block-compile*
*block-compile-argument*
)
(
start-errors
*compiler-error-count*
)
(
start-warnings
*compiler-warning-count*
)
(
start-notes
*compiler-note-count*
)
(
*package*
*package*
)
...
...
@@ -1564,7 +1573,8 @@
((
:verbose
*compile-verbose*
)
*compile-verbose*
)
((
:print
*compile-print*
)
*compile-print*
)
((
:progress
*compile-progress*
)
*compile-progress*
)
((
:block-compile
*block-compile*
)
*block-compile-default*
)
((
:block-compile
*block-compile-argument*
)
*block-compile-default*
)
((
:entry-points
*entry-points*
)
nil
)
((
:byte-compile
*byte-compile*
)
*byte-compile-default*
)
source-info
...
...
@@ -1652,7 +1662,7 @@
((
:verbose
*compile-verbose*
)
*compile-verbose*
)
((
:print
*compile-print*
)
*compile-print*
)
((
:progress
*compile-progress*
)
*compile-progress*
)
((
:block-compile
*block-compile*
)
((
:block-compile
*block-compile
-argument
*
)
*block-compile-default*
)
((
:entry-points
*entry-points*
)
nil
)
((
:byte-compile
*byte-compile*
)
...
...
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