From bdb7be296f32c52cd0395f8a6d278fa2f460e3fa Mon Sep 17 00:00:00 2001 From: jjgarcia Date: Mon, 8 Dec 2003 11:01:11 +0000 Subject: [PATCH] DISASSEMBLE should not signal an error when a form cannot be disassembled, and it should always return NIL. --- src/cmp/cmpmain.lsp | 7 ++++--- src/cmp/cmptop.lsp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp index b7057256a..e49c9f8e1 100644 --- a/src/cmp/cmpmain.lsp +++ b/src/cmp/cmpmain.lsp @@ -559,7 +559,8 @@ Cannot compile ~a." (cond ((null thing)) ((functionp thing) (unless (si::bc-disassemble thing) - (error "The function definition for ~S was lost." thing))) + (warn "The function definition for ~S was lost." thing) + (return-from disassemble nil))) ((and (consp thing) (eq (car thing) 'LAMBDA)) (setq disassembled-form `(defun gazonk ,@(cdr thing)))) (t (setq disassembled-form thing))) @@ -569,7 +570,7 @@ Cannot compile ~a." (format t "~&;;; The compiler was called recursively.~ ~%Cannot disassemble ~a." thing) (setq *error-p* t) - (return-from disassemble)) + (return-from disassemble nil)) (setq *error-p* nil *compiler-in-use* t) @@ -607,7 +608,7 @@ Cannot compile ~a." (put-sysprop 'DEFUN 'T3 t3fun) (setf (symbol-function 'T3LOCAL-FUN) t3local-fun) (when h-file (close *compiler-output2*))))) - (values) + nil ) (defun compiler-pass2 (c-pathname h-pathname data-pathname system-p init-name diff --git a/src/cmp/cmptop.lsp b/src/cmp/cmptop.lsp index be0e18e8c..30d2b2388 100644 --- a/src/cmp/cmptop.lsp +++ b/src/cmp/cmptop.lsp @@ -146,7 +146,7 @@ (let ((num-objects (data-size))) (if (zerop num-objects) (progn - (wt-h "#define VM " num_objects 0) + (wt-h "#define VM " num-objects 0) (wt-h "#define VV NULL")) (progn (wt-h "#define VM " num-objects)