From dce0d87f005bf6e112e9e5f72d1b6017fa0898bf Mon Sep 17 00:00:00 2001 From: pw <pw> Date: Thu, 25 Feb 1999 13:03:13 +0000 Subject: [PATCH] This set of changes removes nearly all references to the dylan language. It is a benign revision as no structures are redefined. At some later point the definitions in compiler/objdef could be removed, perhaps in sync with some other type change. --- code/byte-interp.lisp | 26 +--------------------- code/load.lisp | 25 +-------------------- code/pred.lisp | 3 +-- code/print.lisp | 8 +------ compiler/byte-comp.lisp | 22 ++++-------------- compiler/debug.lisp | 4 +--- compiler/dump.lisp | 12 ++-------- compiler/eval.lisp | 20 ++--------------- compiler/generic/core.lisp | 18 ++------------- compiler/generic/vm-fndb.lisp | 4 ++-- compiler/ir1opt.lisp | 16 ++++++------- compiler/ir1tran.lisp | 42 +---------------------------------- compiler/ir2tran.lisp | 38 +++---------------------------- compiler/ltn.lisp | 4 ++-- compiler/macros.lisp | 10 +-------- compiler/main.lisp | 35 ++++++----------------------- compiler/node.lisp | 28 +---------------------- 17 files changed, 39 insertions(+), 276 deletions(-) diff --git a/code/byte-interp.lisp b/code/byte-interp.lisp index 382b77585..9e1a994b0 100644 --- a/code/byte-interp.lisp +++ b/code/byte-interp.lisp @@ -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/code/byte-interp.lisp,v 1.32 1997/01/18 14:31:13 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/byte-interp.lisp,v 1.33 1999/02/25 13:02:57 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -884,30 +884,6 @@ (byte-interpret component new-pc fp))) -;;; Used to ref and set dylan variables. -;;; -(define-xop dylan-var-ref (component old-pc pc fp) - (declare (type code-component component) - (ignore old-pc) - (type pc pc) - (type stack-pointer fp)) - (let ((value (pop-eval-stack))) - (declare (optimize (inhibit-warnings 3))) - (push-eval-stack (dylan::value-datum value))) - (byte-interpret component pc fp)) -;;; -(define-xop dylan-var-set (component old-pc pc fp) - (declare (type code-component component) - (ignore old-pc) - (type pc pc) - (type stack-pointer fp)) - (multiple-value-pop-eval-stack - (new value) - (declare (optimize (inhibit-warnings 3))) - (setf (dylan::value-datum value) new)) - (byte-interpret component pc fp)) - - ;;;; Type checking: diff --git a/code/load.lisp b/code/load.lisp index 43f588ced..8484270ed 100644 --- a/code/load.lisp +++ b/code/load.lisp @@ -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/code/load.lisp,v 1.73 1998/07/24 17:17:54 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/load.lisp,v 1.74 1999/02/25 13:02:58 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1297,29 +1297,6 @@ res)) -;;;; Dylan support. - -(clone-fop (fop-dylan-symbol-save 100) - (fop-small-dylan-symbol-save 101) - (let* ((arg (clone-arg)) - (res (make-string arg))) - (declare (optimize (inhibit-warnings 3))) - (read-n-bytes *fasl-file* res 0 arg) - (push-table (dylan::string->symbol res)))) - -(clone-fop (fop-dylan-keyword-save 102) - (fop-small-dylan-keyword-save 103) - (let* ((arg (clone-arg)) - (res (make-string arg))) - (declare (optimize (inhibit-warnings 3))) - (read-n-bytes *fasl-file* res 0 arg) - (push-table (dylan::string->keyword res)))) - -(define-fop (fop-dylan-varinfo-value 104) - (let ((module-name (pop-stack)) - (name (pop-stack))) - (declare (optimize (inhibit-warnings 3))) - (dylan::lookup-varinfo-value name (dylan::find-module module-name) t))) ;;;; Linkage fixups. diff --git a/code/pred.lisp b/code/pred.lisp index e079fcefc..49da03486 100644 --- a/code/pred.lisp +++ b/code/pred.lisp @@ -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/code/pred.lisp,v 1.49 1998/07/24 17:17:54 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pred.lisp,v 1.50 1999/02/25 13:02:58 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -104,7 +104,6 @@ simple-array-complex-single-float-p simple-array-complex-double-float-p #+long-float simple-array-complex-long-float-p - dylan::dylan-function-p ))) (macrolet diff --git a/code/print.lisp b/code/print.lisp index 843d7869b..66fe810f3 100644 --- a/code/print.lisp +++ b/code/print.lisp @@ -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/code/print.lisp,v 1.73 1998/06/30 10:58:54 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/print.lisp,v 1.74 1999/02/25 13:02:58 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1100,10 +1100,6 @@ (*print-length* nil)) (print-unreadable-object (array stream :type t :identity t)))) - -(declaim (ftype function dylan::%print-dylan-instance - dylan::dylan-instance-p)) - ;;; Instance Printing. If it's a structure, call the structure printer. ;;; Otherwise, call PCL if it's loaded. If not, print unreadably. @@ -1736,8 +1732,6 @@ (t (write-string "Closure Over " stream) (output-function-object (%closure-function function) stream)))) - (#.vm:dylan-function-header-type - (write-string "Dylan Function" stream)) (t (write-string "Unknown Function" stream))))) diff --git a/compiler/byte-comp.lisp b/compiler/byte-comp.lisp index 6f191407b..22d919c5f 100644 --- a/compiler/byte-comp.lisp +++ b/compiler/byte-comp.lisp @@ -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/byte-comp.lisp,v 1.26 1998/01/20 16:10:44 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/byte-comp.lisp,v 1.27 1999/02/25 13:03:00 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -219,9 +219,7 @@ return-from tagbody go - unwind-protect - dylan-var-ref - dylan-var-set)) + unwind-protect)) (defun xop-index-or-lose (name) (or (position name *xop-names* :test #'eq) @@ -1339,13 +1337,7 @@ (output-do-inline-function segment 'symbol-value)) (:global-function (output-push-fdefinition segment (global-var-name leaf)) - (output-do-xop segment 'fdefn-function-or-lose)))) - (dylan-var - (output-push-load-time-constant - segment :dylan-varinfo-value - (cons (dylan-var-name leaf) - (dylan-var-module-name leaf))) - (output-do-xop segment 'dylan-var-ref))) + (output-do-xop segment 'fdefn-function-or-lose))))) (checked-canonicalize-values segment cont 1)))))) (undefined-value)) @@ -1367,13 +1359,7 @@ (output-push-constant segment (global-var-name leaf)) (output-do-inline-function segment 'setf-symbol-value)))) (lambda-var - (output-set-lambda-var segment leaf (node-environment set))) - (dylan-var - (output-push-load-time-constant - segment :dylan-varinfo-value - (cons (dylan-var-name leaf) - (dylan-var-module-name leaf))) - (output-do-xop segment 'dylan-var-set))) + (output-set-lambda-var segment leaf (node-environment set)))) (unless (eql values 0) (checked-canonicalize-values segment cont 1))) (undefined-value)) diff --git a/compiler/debug.lisp b/compiler/debug.lisp index 88c33aea2..feff7ab9e 100644 --- a/compiler/debug.lisp +++ b/compiler/debug.lisp @@ -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/debug.lisp,v 1.26 1994/10/31 04:27:28 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/debug.lisp,v 1.27 1999/02/25 13:03:02 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1006,8 +1006,6 @@ (constant (format stream "'~S" (constant-value leaf))) (global-var (format stream "~S {~A}" (leaf-name leaf) (global-var-kind leaf))) - (dylan-var - (format stream "~A ~A" (leaf-name leaf) (dylan-var-module-name leaf))) (clambda (format stream "lambda ~S ~S" (leaf-name leaf) (mapcar #'leaf-name (lambda-vars leaf)))) diff --git a/compiler/dump.lisp b/compiler/dump.lisp index 7ec69e054..66ba8eaf6 100644 --- a/compiler/dump.lisp +++ b/compiler/dump.lisp @@ -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/dump.lisp,v 1.71 1998/07/24 17:22:26 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/dump.lisp,v 1.72 1999/02/25 13:03:03 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -498,11 +498,7 @@ (dump-push (cdr entry) file)) (:fdefinition (dump-object (cdr entry) file) - (dump-fop 'lisp::fop-fdefinition file)) - (:dylan-varinfo-value - (dump-object (cadr entry) file) - (dump-object (cddr entry) file) - (dump-fop 'lisp::fop-dylan-varinfo-value file)))) + (dump-fop 'lisp::fop-fdefinition file)))) (null (dump-fop 'lisp::fop-misc-trap file))))) @@ -725,10 +721,6 @@ (:fdefinition (dump-object (cdr entry) file) (dump-fop 'lisp::fop-fdefinition file)) - (:dylan-varinfo-value - (dump-object (cadr entry) file) - (dump-object (cddr entry) file) - (dump-fop 'lisp::fop-dylan-varinfo-value file)) (:type-predicate (dump-object 'load-type-predicate file) (let ((*unparse-function-type-simplify* t)) diff --git a/compiler/eval.lisp b/compiler/eval.lisp index f3e92bb70..75a50f871 100644 --- a/compiler/eval.lisp +++ b/compiler/eval.lisp @@ -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/eval.lisp,v 1.31 1997/02/08 21:44:28 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/eval.lisp,v 1.32 1999/02/25 13:03:04 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -912,15 +912,7 @@ (c::lambda-var (set-leaf-value-lambda-var node var frame-ptr closure value)) (c::global-var - (setf (symbol-value (c::global-var-name var)) value)) - (c::dylan-var - (locally - (declare (optimize (ext:inhibit-warnings 3))) - (setf (dylan::value-datum - (dylan::lookup-variable-value (c::dylan-var-name var) - (c::dylan-var-module-name var) - t)) - value)))))) + (setf (symbol-value (c::global-var-name var)) value))))) ;;; SET-LEAF-VALUE-LAMBDA-VAR -- Internal Interface. ;;; @@ -951,7 +943,6 @@ ;;; types: ;;; constant -- It knows its own value. ;;; global-var -- It's either a value or function reference. Get it right. -;;; dylan-var -- Global dylan variable. Just ask dylan. ;;; local-var -- This may on the stack or in the current closure, the ;;; environment for the lambda INTERNAL-APPLY is currently ;;; executing. If the leaf's home environment is the same @@ -987,13 +978,6 @@ (symbol-function name) (fdefinition name))) (symbol-value (c::global-var-name leaf))))) - (c::dylan-var - (locally - (declare (optimize (ext:inhibit-warnings 3))) - (dylan::value-datum - (dylan::lookup-variable-value (c::dylan-var-name leaf) - (c::dylan-var-module-name leaf) - t)))) (c::lambda-var (leaf-value-lambda-var node leaf frame-ptr closure)) (c::functional diff --git a/compiler/generic/core.lisp b/compiler/generic/core.lisp index 2a21a483d..0ab0fba1f 100644 --- a/compiler/generic/core.lisp +++ b/compiler/generic/core.lisp @@ -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/generic/core.lisp,v 1.38 1998/05/04 01:27:17 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/core.lisp,v 1.39 1999/02/25 13:03:12 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -198,14 +198,7 @@ (cdr const) object)) (:fdefinition (setf (code-header-ref code-obj index) - (lisp::fdefinition-object (cdr const) t))) - (:dylan-varinfo-value - (setf (code-header-ref code-obj index) - (locally - (declare (optimize (inhibit-warnings 3))) - (dylan::lookup-variable-value (cadr const) - (cddr const) - t))))))))))) + (lisp::fdefinition-object (cdr const) t)))))))))) (undefined-value)) @@ -259,13 +252,6 @@ (:fdefinition (setf (code-header-ref code-obj code-obj-index) (lisp::fdefinition-object (cdr const) t))) - (:dylan-varinfo-value - (setf (code-header-ref code-obj code-obj-index) - (locally - (declare (optimize (inhibit-warnings 3))) - (dylan::lookup-variable-value (cadr const) - (cddr const) - t)))) (:type-predicate (let ((*unparse-function-type-simplify* t)) (setf (code-header-ref code-obj code-obj-index) diff --git a/compiler/generic/vm-fndb.lisp b/compiler/generic/vm-fndb.lisp index a773d26ad..5c02197b0 100644 --- a/compiler/generic/vm-fndb.lisp +++ b/compiler/generic/vm-fndb.lisp @@ -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/generic/vm-fndb.lisp,v 1.61 1998/07/24 17:22:32 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/vm-fndb.lisp,v 1.62 1999/02/25 13:03:13 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -63,7 +63,7 @@ #+long-float simple-array-complex-long-float-p system-area-pointer-p realp unsigned-byte-32-p signed-byte-32-p weak-pointer-p scavenger-hook-p code-component-p lra-p - funcallable-instance-p dylan::dylan-function-p) + funcallable-instance-p) (t) boolean (movable foldable flushable)) diff --git a/compiler/ir1opt.lisp b/compiler/ir1opt.lisp index 6ea6145ee..27fa7186b 100644 --- a/compiler/ir1opt.lisp +++ b/compiler/ir1opt.lisp @@ -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/ir1opt.lisp,v 1.66 1998/02/24 09:58:18 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir1opt.lisp,v 1.67 1999/02/25 13:03:05 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -884,14 +884,12 @@ nil)) (t (let* ((name (leaf-name leaf)) - (info (if (dylan-function-var-p leaf) - (dylan-function-var-function-info leaf) - (info function info - (if (slot-accessor-p leaf) - (if (consp name) - '%slot-setter - '%slot-accessor) - name))))) + (info (info function info + (if (slot-accessor-p leaf) + (if (consp name) + '%slot-setter + '%slot-accessor) + name)))) (if info (values leaf (setf (basic-combination-kind call) info)) (values leaf nil))))))) diff --git a/compiler/ir1tran.lisp b/compiler/ir1tran.lisp index 19590123c..8b0fdea6c 100644 --- a/compiler/ir1tran.lisp +++ b/compiler/ir1tran.lisp @@ -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/ir1tran.lisp,v 1.111 1998/05/15 03:26:59 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir1tran.lisp,v 1.112 1999/02/25 13:03:06 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -3595,43 +3595,3 @@ (when *compile-print* (compiler-mumble "Converted ~S.~%" name)))))) - - -;;;; Some support for Dylan module-variables - - -(def-ir1-translator dylan::%var - ((name module-name &optional type (where-from :assumed)) - start cont) - (reference-leaf - start cont - (make-dylan-var - :name name - :module-name module-name - :type (or type *universal-type*) - :where-from where-from))) - -(def-ir1-translator dylan::%set-var - ((value name module-name - &optional type (where-from :assumed)) - start cont) - (set-variable - start cont - (make-dylan-var - :name name - :module-name module-name - :type (or type *universal-type*) - :where-from where-from) - value)) - -(def-ir1-translator dylan::%func ((name module-name &optional type info) - start cont) - (reference-leaf - start cont - (make-dylan-function-var - :kind :global-function - :name (list :dylan-function name module-name) - :type (or type (specifier-type 'function)) - :where-from :assumed - :function-info info))) - diff --git a/compiler/ir2tran.lisp b/compiler/ir2tran.lisp index 7fcf09526..b6fbaf953 100644 --- a/compiler/ir2tran.lisp +++ b/compiler/ir2tran.lisp @@ -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/ir2tran.lisp,v 1.66 1998/03/04 14:53:24 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir2tran.lisp,v 1.67 1999/02/25 13:03:07 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -174,21 +174,7 @@ (let ((fdefn-tn (make-load-time-constant-tn :fdefinition name))) (if unsafe (vop fdefn-function node block fdefn-tn res) - (vop safe-fdefn-function node block fdefn-tn res))))))) - (dylan-var - (let* ((arg (standard-argument-location 0)) - (res (standard-argument-location 0)) - (value (make-load-time-constant-tn - :dylan-varinfo-value - (cons name (dylan-var-module-name leaf)))) - (fun (make-load-time-constant-tn :fdefinition - 'dylan::value-datum)) - (fp (make-stack-pointer-tn))) - (emit-move node block value arg) - (vop allocate-full-call-frame node block 1 fp) - (vop* call-named node block (fp fun arg nil) (res nil) (list arg) - 1 1) - (move-continuation-result node block (list res) (node-cont node))))) + (vop safe-fdefn-function node block fdefn-tn res)))))))) (move-continuation-result node block locs cont)) (undefined-value)) @@ -264,25 +250,7 @@ (ecase (global-var-kind leaf) ((:special :global) (assert (symbolp (leaf-name leaf))) - (vop set node block (emit-constant (leaf-name leaf)) val)))) - (dylan-var - (let* ((val-arg (standard-argument-location 0)) - (value-arg (standard-argument-location 1)) - (res (standard-argument-location 0)) - (value (make-load-time-constant-tn - :dylan-varinfo-value - (cons (dylan-var-name leaf) - (dylan-var-module-name leaf)))) - (fun (make-load-time-constant-tn :fdefinition - '(setf dylan::value-datum))) - (fp (make-stack-pointer-tn))) - (emit-move node block val val-arg) - (emit-move node block value value-arg) - (vop allocate-full-call-frame node block 2 fp) - (vop* call-named node block (fp fun val-arg value-arg nil) (res nil) - (list val-arg value-arg) - 2 1) - (move-continuation-result node block (list res) (node-cont node))))) + (vop set node block (emit-constant (leaf-name leaf)) val))))) (when locs (emit-move node block val (first locs)) diff --git a/compiler/ltn.lisp b/compiler/ltn.lisp index bd1eb1ca1..254e35146 100644 --- a/compiler/ltn.lisp +++ b/compiler/ltn.lisp @@ -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/ltn.lisp,v 1.39 1997/07/13 20:02:49 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ltn.lisp,v 1.40 1999/02/25 13:03:09 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -101,7 +101,7 @@ (etypecase leaf (lambda-var (if (null (lambda-var-sets leaf)) leaf nil)) (constant (if (legal-immediate-constant-p leaf) leaf nil)) - ((or functional global-var dylan-var) nil)))))) + ((or functional global-var) nil)))))) ;;; Annotate-1-Value-Continuation -- Internal diff --git a/compiler/macros.lisp b/compiler/macros.lisp index 61250fc1f..4a4563cf5 100644 --- a/compiler/macros.lisp +++ b/compiler/macros.lisp @@ -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/macros.lisp,v 1.41 1994/10/31 04:27:28 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/macros.lisp,v 1.42 1999/02/25 13:03:09 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -25,16 +25,8 @@ (proclaim '(special *wild-type* *universal-type* *compiler-error-context*)) -(declaim (ftype function (setf dylan::value-datum) dylan::find-module - dylan::lookup-varinfo-value - dylan::parse-and-convert dylan::value-datum)) - ;;;; Deftypes: -;;; -;;; Should be standard: -(deftype boolean () '(member t nil)) - ;;; ;;; Inlinep is used to determine how a function is called. The values have ;;; these meanings: diff --git a/compiler/main.lisp b/compiler/main.lisp index ce5793bf7..1d5c65790 100644 --- a/compiler/main.lisp +++ b/compiler/main.lisp @@ -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/main.lisp,v 1.110 1997/02/15 15:32:49 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/main.lisp,v 1.111 1999/02/25 13:03:10 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -664,7 +664,7 @@ (positions (make-array 10 :fill-pointer 0 :adjustable t) :type (vector t)) ;; ;; Language to use. Normally Lisp, but sometimes Dylan. - (language :lisp :type (member :lisp :dylan))) + (language :lisp :type (member :lisp #+nil :dylan))) ;;; The Source-Info structure provides a handle on all the source information ;;; for an entire compilation. @@ -700,11 +700,7 @@ (make-file-info :name (truename x) :untruename x :write-date (file-write-date x) - :language - (if (string-equal (pathname-type x) - "dylan") - :dylan - :lisp))) + :language :lisp)) files))) (make-source-info :files file-info @@ -729,7 +725,7 @@ ;;; Return a SOURCE-INFO which will read from Stream. ;;; (defun make-stream-source-info (stream language) - (declare (type (member :lisp :dylan) language)) + (declare (type (member :lisp #+nil :dylan) language)) (let ((files (list (make-file-info :name :stream :language language)))) (make-source-info :files files @@ -902,21 +898,7 @@ (clrhash *source-paths*) (find-source-paths form current-idx) (process-form form - `(original-source-start 0 ,current-idx))))))) - (:dylan - (setf *coalesce-constants* nil) - (let ((*error-output* *compiler-error-output*)) - (dylan::parse-and-convert - stream - #'(lambda (form start-position) - (let* ((forms (file-info-forms file)) - (current-idx (+ (fill-pointer forms) - (file-info-source-root file)))) - (vector-push-extend form forms) - (vector-push-extend start-position (file-info-positions file)) - (clrhash *source-paths*) - (process-form form - `(original-source-start 0 ,current-idx)))))))) + `(original-source-start 0 ,current-idx)))))))) (when (advance-source-file info) (process-sources info)))) @@ -1567,7 +1549,6 @@ (try-with-type x "LISP" t)) ((probe-file x) x) ((try-with-type x "lisp" nil)) - ((try-with-type x "dylan" nil)) ((try-with-type x "lisp" t))))) stuff)))) @@ -1603,10 +1584,8 @@ :Source-Info Some object to be placed in the DEBUG-SOURCE-INFO. :Byte-Compile {T, NIL, :MAYBE} - If true, then may compile to interpreted byte code. - :Language {:LISP, :DYLAN} - The source language to compile. Defaults to LISP." - (declare (type (member :lisp :dylan) language)) + If true, then may compile to interpreted byte code." + (declare (type (member :lisp #+nil :dylan) language)) (let ((info (make-stream-source-info stream language)) (*backend* *native-backend*)) (unwind-protect diff --git a/compiler/node.lisp b/compiler/node.lisp index 5926d519b..22c920695 100644 --- a/compiler/node.lisp +++ b/compiler/node.lisp @@ -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/node.lisp,v 1.34 1994/10/31 04:27:28 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/node.lisp,v 1.35 1999/02/25 13:03:11 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -750,32 +750,6 @@ inlinep (functional :test functional)) - -;;; The Dylan-Var structure is used to represent dylan module-variables. -;;; -(defstruct (dylan-var - (:include basic-var) - (:print-function %print-dylan-var)) - ;; - ;; The name of the module to extract this from. - (module-name (required-argument))) - -(defprinter dylan-var - name - module-name) - - - -;;; The Dylan-Function-Var is used to represent functional references to -;;; dylan module variables. The name is `(:dylan-function ,dname ,modname). -;;; -(defstruct (dylan-function-var - (:include global-var)) - ;; - ;; The function-info if this is a :function dylan-var. - (function-info nil :type (or null function-info))) - - ;;;; Function stuff: -- GitLab